From 0719fca8eb6d9ed24a494c6519cf0760960faa8a Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 19:29:19 -0700 Subject: [PATCH 01/25] Add sidebar status and scrim style settings --- .../Keys/SidebarCatalogSection.swift | 12 + .../Values/SidebarScrollEdgeFadeStyle.swift | 13 + .../Values/SidebarWorkspaceStatusStyle.swift | 10 + .../UserDefaultsSettingsClientTests.swift | 10 + .../CuratedSettingEntry+Default.swift | 2 + .../Sections/SidebarSection.swift | 38 +++ .../SidebarScrollEdgeFadeStyle+Display.swift | 27 ++ .../SidebarWorkspaceStatusStyle+Display.swift | 23 ++ Resources/Localizable.xcstrings | 238 ++++++++++++++++++ Sources/CmuxSettingsJSONPathSupport.swift | 24 ++ Sources/ContentView.swift | 30 ++- .../ExtensionSidebarWorkspaceRowView.swift | 63 ++++- ...rdShortcutSettingsFileStore+Template.swift | 2 + .../KeyboardShortcutSettingsFileStore.swift | 11 + Sources/SettingsNavigation.swift | 4 + Sources/SettingsSearchAliases.swift | 2 + Sources/SidebarScrim.swift | 45 +++- cmuxTests/SidebarWidthPolicyTests.swift | 56 +++++ web/data/cmux.schema.json | 14 ++ web/messages/en.json | 2 + web/messages/ja.json | 2 + 21 files changed, 603 insertions(+), 25 deletions(-) create mode 100644 Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/SidebarScrollEdgeFadeStyle.swift create mode 100644 Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/SidebarWorkspaceStatusStyle.swift create mode 100644 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarScrollEdgeFadeStyle+Display.swift create mode 100644 Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/SidebarCatalogSection.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/SidebarCatalogSection.swift index 203d87b7c898..907617f3afe5 100644 --- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/SidebarCatalogSection.swift +++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/SidebarCatalogSection.swift @@ -21,6 +21,18 @@ public struct SidebarCatalogSection: SettingCatalogSection { userDefaultsKey: "sidebarShowWorkspaceDescription" ) + public let workspaceStatusStyle = DefaultsKey( + id: "sidebar.workspaceStatusStyle", + defaultValue: .sentence, + userDefaultsKey: "sidebarWorkspaceStatusStyle" + ) + + public let scrollEdgeFade = DefaultsKey( + 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 diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/SidebarScrollEdgeFadeStyle.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/SidebarScrollEdgeFadeStyle.swift new file mode 100644 index 000000000000..48245d016988 --- /dev/null +++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/SidebarScrollEdgeFadeStyle.swift @@ -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 +} diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/SidebarWorkspaceStatusStyle.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/SidebarWorkspaceStatusStyle.swift new file mode 100644 index 000000000000..f8067752c5c7 --- /dev/null +++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/SidebarWorkspaceStatusStyle.swift @@ -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 +} diff --git a/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/UserDefaultsSettingsClientTests.swift b/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/UserDefaultsSettingsClientTests.swift index c46b02939b2a..6558e5df03af 100644 --- a/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/UserDefaultsSettingsClientTests.swift +++ b/Packages/macOS/CmuxSettings/Tests/CmuxSettingsTests/UserDefaultsSettingsClientTests.swift @@ -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) @@ -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) diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift index 9f97fd0e74b6..4a6a15ed8c22 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift @@ -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"), diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift index 6c8bed07825e..84320faf367e 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift @@ -20,6 +20,8 @@ public struct SidebarSection: View { @State private var hideAll: DefaultsValueModel @State private var wrapTitles: DefaultsValueModel @State private var showDesc: DefaultsValueModel + @State private var workspaceStatusStyle: DefaultsValueModel + @State private var scrollEdgeFade: DefaultsValueModel @State private var branchVerticalLayout: DefaultsValueModel @State private var stackBranchDir: DefaultsValueModel @State private var pathLastOnly: DefaultsValueModel @@ -46,6 +48,8 @@ public struct SidebarSection: View { _hideAll = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.sidebar.hideAllDetails)) _wrapTitles = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.sidebar.wrapWorkspaceTitles)) _showDesc = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.sidebar.showWorkspaceDescription)) + _workspaceStatusStyle = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.sidebar.workspaceStatusStyle)) + _scrollEdgeFade = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.sidebar.scrollEdgeFade)) _branchVerticalLayout = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.sidebar.branchVerticalLayout)) _stackBranchDir = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.sidebar.stackBranchDirectory)) _pathLastOnly = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.sidebar.pathLastSegmentOnly)) @@ -79,6 +83,8 @@ public struct SidebarSection: View { hideAll, wrapTitles, showDesc, + workspaceStatusStyle, + scrollEdgeFade, branchVerticalLayout, stackBranchDir, pathLastOnly, @@ -225,6 +231,38 @@ public struct SidebarSection: View { } SettingsCardDivider() + SettingsCardRow( + configurationReview: .json("sidebar.workspaceStatusStyle"), + String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Workspace Status Style"), + subtitle: workspaceStatusStyle.current.rowDescription, + controlWidth: 150 + ) { + Picker("", selection: Binding(get: { workspaceStatusStyle.current }, set: { workspaceStatusStyle.set($0) })) { + ForEach(SidebarWorkspaceStatusStyle.allCases, id: \.self) { style in + Text(style.displayName).tag(style) + } + } + .labelsHidden() + .pickerStyle(.menu) + } + SettingsCardDivider() + + SettingsCardRow( + configurationReview: .json("sidebar.scrollEdgeFade"), + String(localized: "settings.sidebar.scrollEdgeFade", defaultValue: "Tab List Edge Fade"), + subtitle: scrollEdgeFade.current.rowDescription, + controlWidth: 150 + ) { + Picker("", selection: Binding(get: { scrollEdgeFade.current }, set: { scrollEdgeFade.set($0) })) { + ForEach(SidebarScrollEdgeFadeStyle.allCases, id: \.self) { style in + Text(style.displayName).tag(style) + } + } + .labelsHidden() + .pickerStyle(.menu) + } + SettingsCardDivider() + SettingsCardRow( configurationReview: .json("sidebar.rightMaxWidth"), String(localized: "settings.sidebar.rightMaxWidth", defaultValue: "Dock Max Width"), diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarScrollEdgeFadeStyle+Display.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarScrollEdgeFadeStyle+Display.swift new file mode 100644 index 000000000000..70cfec905c80 --- /dev/null +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarScrollEdgeFadeStyle+Display.swift @@ -0,0 +1,27 @@ +import CmuxSettings +import Foundation + +/// UI-facing labels for ``SidebarScrollEdgeFadeStyle``. +extension SidebarScrollEdgeFadeStyle { + var displayName: String { + switch self { + case .full: + return String(localized: "sidebarScrollEdgeFadeStyle.full.name", defaultValue: "Full") + case .subtle: + return String(localized: "sidebarScrollEdgeFadeStyle.subtle.name", defaultValue: "Subtle") + case .off: + return String(localized: "sidebarScrollEdgeFadeStyle.off.name", defaultValue: "Off") + } + } + + var rowDescription: String { + switch self { + case .full: + return String(localized: "sidebarScrollEdgeFadeStyle.full.description", defaultValue: "Use the current top and bottom fade over the tab list.") + case .subtle: + return String(localized: "sidebarScrollEdgeFadeStyle.subtle.description", defaultValue: "Use a shorter, lighter fade at the top and bottom of the tab list.") + case .off: + return String(localized: "sidebarScrollEdgeFadeStyle.off.description", defaultValue: "Disable the tab-list fade at both scroll edges.") + } + } +} diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift new file mode 100644 index 000000000000..d8478ab45483 --- /dev/null +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift @@ -0,0 +1,23 @@ +import CmuxSettings +import Foundation + +/// UI-facing labels for ``SidebarWorkspaceStatusStyle``. +extension SidebarWorkspaceStatusStyle { + var displayName: String { + switch self { + case .sentence: + return String(localized: "sidebarWorkspaceStatusStyle.sentence.name", defaultValue: "Sentence") + case .dot: + return String(localized: "sidebarWorkspaceStatusStyle.dot.name", defaultValue: "Dot") + } + } + + var rowDescription: String { + switch self { + case .sentence: + return String(localized: "sidebarWorkspaceStatusStyle.sentence.description", defaultValue: "Agent status appears as a subtitle under each workspace title.") + case .dot: + return String(localized: "sidebarWorkspaceStatusStyle.dot.description", defaultValue: "Agent status appears as a colored dot so workspace rows stay one line.") + } + } +} diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings index f3b7ecad9f3b..328103b86deb 100644 --- a/Resources/Localizable.xcstrings +++ b/Resources/Localizable.xcstrings @@ -205097,6 +205097,244 @@ } } }, + "settings.search.alias.setting.sidebarAppearance.scroll-edge-fade": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle タブリスト 端 フェード 影 スクリム 上 下 無効 控えめ" + } + } + } + }, + "settings.search.alias.setting.sidebarAppearance.workspace-status-style": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status subtitle sentence dot one line compact waiting input running idle" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status subtitle sentence dot one line compact waiting input running idle エージェント 状態 サブタイトル 文章 ドット 1行 コンパクト 待機 入力 実行中 アイドル" + } + } + } + }, + "settings.sidebar.scrollEdgeFade": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Tab List Edge Fade" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "タブリスト端のフェード" + } + } + } + }, + "settings.sidebar.workspaceStatusStyle": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Workspace Status Style" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "ワークスペース状態の表示形式" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.full.description": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Use the current top and bottom fade over the tab list." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "タブリストの上下に現在のフェードを使用します。" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.full.name": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Full" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "標準" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.off.description": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Disable the tab-list fade at both scroll edges." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "タブリスト両端のフェードを無効にします。" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.off.name": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Off" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "オフ" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.subtle.description": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Use a shorter, lighter fade at the top and bottom of the tab list." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "タブリストの上下に短く控えめなフェードを使用します。" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.subtle.name": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Subtle" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "控えめ" + } + } + } + }, + "sidebarWorkspaceStatusStyle.dot.description": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Agent status appears as a colored dot so workspace rows stay one line." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "エージェントの状態を色付きドットで表示し、ワークスペース行を1行に保ちます。" + } + } + } + }, + "sidebarWorkspaceStatusStyle.dot.name": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Dot" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "ドット" + } + } + } + }, + "sidebarWorkspaceStatusStyle.sentence.description": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Agent status appears as a subtitle under each workspace title." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "エージェントの状態を各ワークスペースタイトルの下のサブタイトルとして表示します。" + } + } + } + }, + "sidebarWorkspaceStatusStyle.sentence.name": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Sentence" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "文章" + } + } + } + }, "settings.sidebar.rightMaxWidth": { "extractionState": "manual", "localizations": { diff --git a/Sources/CmuxSettingsJSONPathSupport.swift b/Sources/CmuxSettingsJSONPathSupport.swift index 85925e7464ef..81baed5cf92d 100644 --- a/Sources/CmuxSettingsJSONPathSupport.swift +++ b/Sources/CmuxSettingsJSONPathSupport.swift @@ -180,6 +180,13 @@ enum SidebarSettingsFileMapping { let defaultsKey: String } + struct StringEnumSetting { + let jsonKey: String + let defaultsKey: String + let acceptedValues: Set + let invalidPath: String + } + static let booleanSettings: [BooleanSetting] = [ .init( jsonKey: "hideAllDetails", @@ -242,6 +249,21 @@ enum SidebarSettingsFileMapping { ), ] + static let stringEnumSettings: [StringEnumSetting] = [ + .init( + jsonKey: "workspaceStatusStyle", + defaultsKey: sidebar.workspaceStatusStyle.userDefaultsKey, + acceptedValues: Set(SidebarWorkspaceStatusStyle.allCases.map(\.rawValue)), + invalidPath: "sidebar.workspaceStatusStyle" + ), + .init( + jsonKey: "scrollEdgeFade", + defaultsKey: sidebar.scrollEdgeFade.userDefaultsKey, + acceptedValues: Set(SidebarScrollEdgeFadeStyle.allCases.map(\.rawValue)), + invalidPath: "sidebar.scrollEdgeFade" + ), + ] + static func branchLayoutStoredValue(_ rawValue: String) -> Bool? { switch rawValue { case "vertical": @@ -369,6 +391,8 @@ extension CmuxSettingsFileStore { "sidebar.hideAllDetails", "sidebar.wrapWorkspaceTitles", "sidebar.showWorkspaceDescription", + "sidebar.workspaceStatusStyle", + "sidebar.scrollEdgeFade", "sidebar.branchLayout", "sidebar.stackBranchDirectory", "sidebar.pathLastSegmentOnly", diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index d18f384bef73..8ca4b0d6a41f 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -10069,6 +10069,8 @@ struct VerticalTabsSidebar: View { @LiveSetting(\.betaFeatures.customSidebars) private var customSidebarsExperimentalEnabled @LiveSetting(\.customSidebars.renderer) private var customSidebarRenderer @LiveSetting(\.shortcuts.showModifierHoldHints) private var showModifierHoldHints + @LiveSetting(\.sidebar.workspaceStatusStyle) private var sidebarWorkspaceStatusStyle + @LiveSetting(\.sidebar.scrollEdgeFade) private var sidebarScrollEdgeFade // The provider to actually render. Built-in views are always honored; only // the hosted-extension selection falls back to the default workspaces @@ -10262,11 +10264,22 @@ struct VerticalTabsSidebar: View { } private var sidebarTopScrimHeight: CGFloat { - SidebarWorkspaceListMetrics.topScrimHeight + SidebarWorkspaceListMetrics.topScrimHeight * sidebarScrollEdgeFadeHeightScale } private var sidebarBottomScrimHeight: CGFloat { - SidebarWorkspaceListMetrics.bottomScrimHeight + SidebarWorkspaceListMetrics.bottomScrimHeight * sidebarScrollEdgeFadeHeightScale + } + + private var sidebarScrollEdgeFadeHeightScale: CGFloat { + switch sidebarScrollEdgeFade { + case .full: + return 1 + case .subtle: + return 0.5 + case .off: + return 0 + } } private var isMinimalMode: Bool { @@ -10603,7 +10616,8 @@ struct VerticalTabsSidebar: View { .mask( SidebarWorkspaceScrollEdgeFadeMask( topHeight: sidebarTopScrimHeight, - bottomHeight: sidebarBottomScrimHeight + bottomHeight: sidebarBottomScrimHeight, + fadeStyle: sidebarScrollEdgeFade ) ) .overlay(alignment: .top) { @@ -10781,7 +10795,8 @@ struct VerticalTabsSidebar: View { .mask( SidebarWorkspaceScrollEdgeFadeMask( topHeight: 0, - bottomHeight: sidebarBottomScrimHeight + bottomHeight: sidebarBottomScrimHeight, + fadeStyle: sidebarScrollEdgeFade ) ) } else if effectiveExtensionSidebarProviderId.hasPrefix(CmuxExtensionSidebarSelection.customSidebarProviderPrefix), @@ -10814,7 +10829,8 @@ struct VerticalTabsSidebar: View { .mask( SidebarWorkspaceScrollEdgeFadeMask( topHeight: sidebarTopScrimHeight, - bottomHeight: sidebarBottomScrimHeight + bottomHeight: sidebarBottomScrimHeight, + fadeStyle: sidebarScrollEdgeFade ) ) } else { @@ -10890,7 +10906,8 @@ struct VerticalTabsSidebar: View { .mask( SidebarWorkspaceScrollEdgeFadeMask( topHeight: sidebarTopScrimHeight, - bottomHeight: sidebarBottomScrimHeight + bottomHeight: sidebarBottomScrimHeight, + fadeStyle: sidebarScrollEdgeFade ) ) .overlay(alignment: .top) { @@ -11800,6 +11817,7 @@ struct VerticalTabsSidebar: View { providerId: providerId, relativeNow: now, isSelected: row.workspaceId == selectedWorkspaceId, + workspaceStatusStyle: sidebarWorkspaceStatusStyle, onSelect: selectExtensionSidebarWorkspace, onOpenWindow: CmuxExtensionSidebarInspectorWindowController.show ) diff --git a/Sources/ExtensionSidebarWorkspaceRowView.swift b/Sources/ExtensionSidebarWorkspaceRowView.swift index 6f4475250692..d5f3832877d4 100644 --- a/Sources/ExtensionSidebarWorkspaceRowView.swift +++ b/Sources/ExtensionSidebarWorkspaceRowView.swift @@ -1,5 +1,6 @@ import CmuxFoundation import AppKit +import CmuxSettings import CmuxSidebarProviderKit import SwiftUI import WebKit @@ -10,6 +11,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { let providerId: String let relativeNow: Date let isSelected: Bool + let workspaceStatusStyle: SidebarWorkspaceStatusStyle let onSelect: (UUID) -> Void let onOpenWindow: (CmuxSidebarProviderWorkspace) -> Void @State private var showsInspector = false @@ -20,7 +22,8 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { lhs.workspace == rhs.workspace && lhs.providerId == rhs.providerId && lhs.relativeNow == rhs.relativeNow && - lhs.isSelected == rhs.isSelected + lhs.isSelected == rhs.isSelected && + lhs.workspaceStatusStyle == rhs.workspaceStatusStyle } private var isSuperCompact: Bool { @@ -34,15 +37,25 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { var body: some View { let primarySize: CGFloat = isSuperCompact ? 10.5 : 12.5 let secondarySize: CGFloat = isSuperCompact ? 9 : 10 + let subtitle = rendered(row.subtitle) HStack(spacing: isSuperCompact ? 5 : 7) { VStack(alignment: .leading, spacing: isSuperCompact ? 0 : 2) { - Text(row.title) - .cmuxFont(size: primarySize, weight: .regular) - .foregroundColor(isSelected ? .primary : .primary.opacity(0.86)) - .lineLimit(1) - .truncationMode(.tail) + HStack(spacing: 5) { + Text(row.title) + .cmuxFont(size: primarySize, weight: .regular) + .foregroundColor(isSelected ? .primary : .primary.opacity(0.86)) + .lineLimit(1) + .truncationMode(.tail) - if !isSuperCompact, let subtitle = rendered(row.subtitle) { + if workspaceStatusStyle == .dot, let subtitle { + Circle() + .fill(agentStatusColor(for: subtitle)) + .frame(width: 6, height: 6) + .accessibilityLabel(Text(subtitle)) + } + } + + if workspaceStatusStyle == .sentence, !isSuperCompact, let subtitle { Text(subtitle) .cmuxFont(size: secondarySize, weight: .regular) .foregroundColor(.secondary) @@ -95,8 +108,8 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { } .padding(.leading, isSuperCompact ? 14 : 28) .padding(.trailing, 8) - .padding(.vertical, isSuperCompact ? 2 : (isThin ? 5 : 7)) - .frame(minHeight: isSuperCompact ? 22 : 32) + .padding(.vertical, rowVerticalPadding) + .frame(minHeight: rowMinimumHeight) .background { if isSelected { Rectangle() @@ -109,6 +122,38 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { } } + private var rowVerticalPadding: CGFloat { + if isSuperCompact { return 2 } + if isThin || workspaceStatusStyle == .dot { return 5 } + return 7 + } + + private var rowMinimumHeight: CGFloat { + if isSuperCompact { return 22 } + if workspaceStatusStyle == .dot { return 28 } + return 32 + } + + private func agentStatusColor(for subtitle: String) -> Color { + let normalized = subtitle.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + if normalized.contains("needs input") + || normalized.contains("need input") + || normalized.contains("waiting for input") + || normalized.contains("waiting for your input") + || normalized.contains("your input") { + return .orange + } + if normalized.contains("running") + || normalized.contains("working") + || normalized.contains("processing") + || normalized.contains("thinking") + || normalized.contains("in progress") + || normalized.contains("executing") { + return .green + } + return .secondary + } + private func rendered(_ text: CmuxSidebarProviderText?) -> String? { guard let text else { return nil } switch text { diff --git a/Sources/KeyboardShortcutSettingsFileStore+Template.swift b/Sources/KeyboardShortcutSettingsFileStore+Template.swift index 8be440770be7..a2358ed9df6a 100644 --- a/Sources/KeyboardShortcutSettingsFileStore+Template.swift +++ b/Sources/KeyboardShortcutSettingsFileStore+Template.swift @@ -127,6 +127,8 @@ extension CmuxSettingsFileStore { "hideAllDetails": SettingCatalog().sidebar.hideAllDetails.defaultValue, "wrapWorkspaceTitles": SidebarWorkspaceTitleWrapSettings.defaultWrap, "showWorkspaceDescription": SettingCatalog().sidebar.showWorkspaceDescription.defaultValue, + "workspaceStatusStyle": SettingCatalog().sidebar.workspaceStatusStyle.defaultValue.rawValue, + "scrollEdgeFade": SettingCatalog().sidebar.scrollEdgeFade.defaultValue.rawValue, "branchLayout": SettingCatalog().sidebar.branchVerticalLayout.defaultValue ? "vertical" : "inline", "stackBranchDirectory": SettingCatalog().sidebar.stackBranchDirectory.defaultValue, "pathLastSegmentOnly": SettingCatalog().sidebar.pathLastSegmentOnly.defaultValue, diff --git a/Sources/KeyboardShortcutSettingsFileStore.swift b/Sources/KeyboardShortcutSettingsFileStore.swift index f0fa23e70ca3..aa8470ea2739 100644 --- a/Sources/KeyboardShortcutSettingsFileStore.swift +++ b/Sources/KeyboardShortcutSettingsFileStore.swift @@ -655,6 +655,17 @@ final class CmuxSettingsFileStore { snapshot.managedUserDefaults[setting.defaultsKey] = .bool(value) } } + for setting in SidebarSettingsFileMapping.stringEnumSettings { + if let raw = jsonString(section[setting.jsonKey]) { + if setting.acceptedValues.contains(raw) { + snapshot.managedUserDefaults[setting.defaultsKey] = .string(raw) + } else { + logInvalid(setting.invalidPath, sourcePath: sourcePath) + } + } else if section.keys.contains(setting.jsonKey) { + logInvalid(setting.invalidPath, sourcePath: sourcePath) + } + } if let raw = jsonString(section["branchLayout"]) { if let value = SidebarSettingsFileMapping.branchLayoutStoredValue(raw) { diff --git a/Sources/SettingsNavigation.swift b/Sources/SettingsNavigation.swift index eb7bb9f208e5..93afb2827972 100644 --- a/Sources/SettingsNavigation.swift +++ b/Sources/SettingsNavigation.swift @@ -379,6 +379,8 @@ enum SettingsSearchIndex { setting(.sidebarAppearance, "hide-sidebar-details", String(localized: "settings.app.hideAllSidebarDetails", defaultValue: "Hide All Sidebar Details"), "workspace sidebar compact"), setting(.sidebarAppearance, "wrap-workspace-titles", String(localized: "settings.app.wrapWorkspaceTitles", defaultValue: "Wrap Workspace Titles in Sidebar"), "workspace title wrap multiline pr pull request"), setting(.sidebarAppearance, "show-workspace-description", String(localized: "settings.app.showWorkspaceDescription", defaultValue: "Show Workspace Description in Sidebar"), "workspace description notes markdown"), + setting(.sidebarAppearance, "workspace-status-style", String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Workspace Status Style"), "sidebar.workspaceStatusStyle agent status subtitle sentence dot compact one line tab row"), + setting(.sidebarAppearance, "scroll-edge-fade", String(localized: "settings.sidebar.scrollEdgeFade", defaultValue: "Tab List Edge Fade"), "sidebar.scrollEdgeFade sidebar tab list fade shadow scrim edge top bottom off subtle"), setting(.sidebarAppearance, "sidebar-branch-layout", String(localized: "settings.app.sidebarBranchLayout", defaultValue: "Sidebar Branch Layout"), "branch directory vertical inline"), setting(.sidebarAppearance, "stack-branch-directory", String(localized: "settings.app.stackBranchDirectory", defaultValue: "Stack Branch and Directory"), "branch directory cwd path stack two rows separate lines"), setting(.sidebarAppearance, "path-last-segment-only", String(localized: "settings.app.pathLastSegmentOnly", defaultValue: "Truncate Path From Start"), "cwd path directory truncate last segment basename viewport"), @@ -505,6 +507,8 @@ enum SettingsSearchIndex { "sidebar.hideAllDetails": settingID(for: .sidebarAppearance, idSuffix: "hide-sidebar-details"), "sidebar.wrapWorkspaceTitles": settingID(for: .sidebarAppearance, idSuffix: "wrap-workspace-titles"), "sidebar.showWorkspaceDescription": settingID(for: .sidebarAppearance, idSuffix: "show-workspace-description"), + "sidebar.workspaceStatusStyle": settingID(for: .sidebarAppearance, idSuffix: "workspace-status-style"), + "sidebar.scrollEdgeFade": settingID(for: .sidebarAppearance, idSuffix: "scroll-edge-fade"), "sidebar.branchLayout": settingID(for: .sidebarAppearance, idSuffix: "sidebar-branch-layout"), "sidebar.stackBranchDirectory": settingID(for: .sidebarAppearance, idSuffix: "stack-branch-directory"), "sidebar.pathLastSegmentOnly": settingID(for: .sidebarAppearance, idSuffix: "path-last-segment-only"), diff --git a/Sources/SettingsSearchAliases.swift b/Sources/SettingsSearchAliases.swift index c449619730a3..40046b105c2e 100644 --- a/Sources/SettingsSearchAliases.swift +++ b/Sources/SettingsSearchAliases.swift @@ -104,6 +104,8 @@ enum SettingsSearchAliasIndex { "sidebarAppearance:hide-sidebar-details": localized("settings.search.alias.setting.app.hide-sidebar-details", defaultValue: "sidebar.hideAllDetails compact sidebar hide details only title minimal left rail"), "sidebarAppearance:wrap-workspace-titles": localized("settings.search.alias.setting.app.wrap-workspace-titles", defaultValue: "sidebar.wrapWorkspaceTitles workspace title wrap multiline pr pull request"), "sidebarAppearance:show-workspace-description": localized("settings.search.alias.setting.app.show-workspace-description", defaultValue: "sidebar.showWorkspaceDescription workspace description notes markdown sidebar"), + "sidebarAppearance:workspace-status-style": localized("settings.search.alias.setting.sidebarAppearance.workspace-status-style", defaultValue: "sidebar.workspaceStatusStyle agent status subtitle sentence dot compact one line tab row"), + "sidebarAppearance:scroll-edge-fade": localized("settings.search.alias.setting.sidebarAppearance.scroll-edge-fade", defaultValue: "sidebar.scrollEdgeFade sidebar tab list fade shadow scrim edge top bottom off subtle"), "sidebarAppearance:sidebar-branch-layout": localized("settings.search.alias.setting.app.sidebar-branch-layout", defaultValue: "sidebar.branchLayout git branch layout vertical inline cwd directory"), "sidebarAppearance:stack-branch-directory": localized("settings.search.alias.setting.app.stack-branch-directory", defaultValue: "sidebar.stackBranchDirectory git branch directory cwd path stack stacked separate lines two rows"), "sidebarAppearance:path-last-segment-only": localized("settings.search.alias.setting.app.path-last-segment-only", defaultValue: "sidebar.pathLastSegmentOnly cwd path directory last segment basename short truncate folder repo"), diff --git a/Sources/SidebarScrim.swift b/Sources/SidebarScrim.swift index b5ac091c85a3..af0d1e384b98 100644 --- a/Sources/SidebarScrim.swift +++ b/Sources/SidebarScrim.swift @@ -1,17 +1,23 @@ +import CmuxSettings import SwiftUI struct SidebarWorkspaceScrollEdgeFadeMask: View { let topHeight: CGFloat let bottomHeight: CGFloat + let fadeStyle: SidebarScrollEdgeFadeStyle var body: some View { VStack(spacing: 0) { - SidebarEdgeFadeGradient(edge: .top) - .frame(height: topHeight) + if topHeight > 0 { + SidebarEdgeFadeGradient(edge: .top, fadeStyle: fadeStyle) + .frame(height: topHeight) + } Rectangle() .fill(Color.black) - SidebarEdgeFadeGradient(edge: .bottom) - .frame(height: bottomHeight) + if bottomHeight > 0 { + SidebarEdgeFadeGradient(edge: .bottom, fadeStyle: fadeStyle) + .frame(height: bottomHeight) + } } } } @@ -23,6 +29,7 @@ private struct SidebarEdgeFadeGradient: View { } let edge: Edge + let fadeStyle: SidebarScrollEdgeFadeStyle var body: some View { LinearGradient( @@ -33,12 +40,7 @@ private struct SidebarEdgeFadeGradient: View { } private var maskColors: [Color] { - let colors = [ - Color.black.opacity(0.05), - Color.black.opacity(0.25), - Color.black.opacity(0.65), - Color.black, - ] + let colors = fadeStyle.maskColors switch edge { case .top: return colors @@ -47,3 +49,26 @@ private struct SidebarEdgeFadeGradient: View { } } } + +private extension SidebarScrollEdgeFadeStyle { + var maskColors: [Color] { + switch self { + case .full: + return [ + Color.black.opacity(0.05), + Color.black.opacity(0.25), + Color.black.opacity(0.65), + Color.black, + ] + case .subtle: + return [ + Color.black.opacity(0.45), + Color.black.opacity(0.68), + Color.black.opacity(0.88), + Color.black, + ] + case .off: + return [Color.black, Color.black] + } + } +} diff --git a/cmuxTests/SidebarWidthPolicyTests.swift b/cmuxTests/SidebarWidthPolicyTests.swift index 6db2d6a2bb5b..7bd2be46bc19 100644 --- a/cmuxTests/SidebarWidthPolicyTests.swift +++ b/cmuxTests/SidebarWidthPolicyTests.swift @@ -1,6 +1,7 @@ import AppKit import CmuxAppKitSupportUI import CmuxFoundation +import CmuxSettings import SwiftUI import XCTest @@ -13,6 +14,8 @@ import XCTest final class SidebarWidthPolicyTests: XCTestCase { private let settingsFileBackupsDefaultsKey = "cmux.settingsFile.backups.v1" private let importedManagedDefaultsKey = "cmux.settingsFile.importedManagedDefaults.v1" + private let sidebarWorkspaceStatusStyleKey = SidebarCatalogSection().workspaceStatusStyle.userDefaultsKey + private let sidebarScrollEdgeFadeKey = SidebarCatalogSection().scrollEdgeFade.userDefaultsKey func testDefaultMinimumSidebarWidthIsPersistedProductDefault() { let suiteName = "SidebarWidthPolicyTests.defaultMinimum.\(UUID().uuidString)" @@ -254,6 +257,59 @@ final class SidebarWidthPolicyTests: XCTestCase { ) } + func testSettingsFileStoreAppliesSidebarStatusAndScrimSettings() throws { + let defaults = UserDefaults.standard + let managedKeys = [ + sidebarWorkspaceStatusStyleKey, + sidebarScrollEdgeFadeKey, + settingsFileBackupsDefaultsKey, + importedManagedDefaultsKey, + ] + let previousValues = managedKeys.reduce(into: [String: Any]()) { values, key in + values[key] = defaults.object(forKey: key) + } + defer { + for key in managedKeys { + if let value = previousValues[key] { + defaults.set(value, forKey: key) + } else { + defaults.removeObject(forKey: key) + } + } + } + + for key in managedKeys { + defaults.removeObject(forKey: key) + } + + let directoryURL = FileManager.default.temporaryDirectory.appendingPathComponent( + "sidebar-status-scrim-settings-\(UUID().uuidString)", + isDirectory: true + ) + try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true) + defer { try? FileManager.default.removeItem(at: directoryURL) } + + let settingsFileURL = directoryURL.appendingPathComponent("cmux.json", isDirectory: false) + try """ + { + "sidebar": { + "workspaceStatusStyle": "dot", + "scrollEdgeFade": "off" + } + } + """.write(to: settingsFileURL, atomically: true, encoding: .utf8) + + _ = KeyboardShortcutSettingsFileStore( + primaryPath: settingsFileURL.path, + fallbackPath: nil, + additionalFallbackPaths: [], + startWatching: false + ) + + XCTAssertEqual(defaults.string(forKey: sidebarWorkspaceStatusStyleKey), "dot") + XCTAssertEqual(defaults.string(forKey: sidebarScrollEdgeFadeKey), "off") + } + func testLeadingSidebarResizeRangeFavorsSidebarSide() { let range = SidebarResizeInteraction.Edge.leading.hitRange(dividerX: 200) diff --git a/web/data/cmux.schema.json b/web/data/cmux.schema.json index 4e640706037b..f02755ccd961 100644 --- a/web/data/cmux.schema.json +++ b/web/data/cmux.schema.json @@ -693,6 +693,20 @@ "default": true, "description": "Show custom workspace descriptions in the sidebar." }, + "workspaceStatusStyle": { + "type": "string", + "enum": ["sentence", "dot"], + "default": "sentence", + "descriptionKey": "schemaDescriptions.sidebar.workspaceStatusStyle", + "description": "How extension-sidebar workspace rows show agent status: `sentence` keeps the subtitle text, while `dot` uses a compact colored indicator." + }, + "scrollEdgeFade": { + "type": "string", + "enum": ["full", "subtle", "off"], + "default": "full", + "descriptionKey": "schemaDescriptions.sidebar.scrollEdgeFade", + "description": "Strength of the top and bottom scroll-edge fade over the sidebar tab list." + }, "branchLayout": { "type": "string", "enum": ["vertical", "inline"], diff --git a/web/messages/en.json b/web/messages/en.json index b540d9b966f3..ac7f7e03389a 100644 --- a/web/messages/en.json +++ b/web/messages/en.json @@ -1029,6 +1029,8 @@ "wordWrap": "Wrap long lines at the editor's right edge instead of scrolling horizontally." }, "sidebar": { + "workspaceStatusStyle": "How extension-sidebar workspace rows show agent status: `sentence` keeps the subtitle text, while `dot` uses a compact colored indicator.", + "scrollEdgeFade": "Strength of the top and bottom scroll-edge fade over the sidebar tab list.", "rightMaxWidth": "Maximum width in points for the right sidebar. When omitted, the built-in dynamic cap applies." }, "fileExplorer": { diff --git a/web/messages/ja.json b/web/messages/ja.json index 26459ce28a53..373033482bb2 100644 --- a/web/messages/ja.json +++ b/web/messages/ja.json @@ -988,6 +988,8 @@ "wordWrap": "横スクロールする代わりに、エディタの右端で長い行を折り返します。" }, "sidebar": { + "workspaceStatusStyle": "拡張サイドバーのワークスペース行でエージェント状態を表示する方法です。`sentence` はサブタイトル文を表示し、`dot` はコンパクトな色付きインジケータを使います。", + "scrollEdgeFade": "サイドバーのタブ一覧の上下にかかるスクロール端フェードの強さです。", "rightMaxWidth": "右サイドバーの最大幅(ポイント)。省略すると、組み込みの動的上限が適用されます。" }, "fileExplorer": { From a8b3fde08bf76d591bc4082f1bfe74ba6a1fa81e Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 19:39:27 -0700 Subject: [PATCH 02/25] Use lifecycle state for sidebar status dots --- Sources/ContentView.swift | 25 +++++++++ .../ExtensionSidebarWorkspaceRowView.swift | 56 ++++++++++++------- Sources/Workspace.swift | 1 + 3 files changed, 62 insertions(+), 20 deletions(-) diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index 8ca4b0d6a41f..b079a1e79990 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -11702,6 +11702,29 @@ struct VerticalTabsSidebar: View { return snapshotsById } + private func extensionSidebarWorkspaceAgentLifecycleStatesById( + for rows: [CmuxSidebarProviderRow] + ) -> [UUID: AgentHibernationLifecycleState] { + var statesById: [UUID: AgentHibernationLifecycleState] = [:] + for row in rows where statesById[row.workspaceId] == nil { + guard let workspace = tabManager.tabs.first(where: { $0.id == row.workspaceId }), + let state = extensionSidebarAgentLifecycleState(for: workspace) else { + continue + } + statesById[row.workspaceId] = state + } + return statesById + } + + private func extensionSidebarAgentLifecycleState(for workspace: Workspace) -> AgentHibernationLifecycleState? { + let states = workspace.agentLifecycleStatesByPanelId.values.flatMap { Array($0.values) } + guard !states.isEmpty else { return nil } + if states.contains(.needsInput) { return .needsInput } + if states.contains(.running) { return .running } + if states.contains(.idle) { return .idle } + return .unknown + } + private func extensionBrowserStackIcon( _ icon: CmuxSidebarProviderIcon?, size: CGFloat @@ -11763,6 +11786,7 @@ struct VerticalTabsSidebar: View { let canCreateWorktree = section.treeSection.projectRootPath != nil let selectedWorkspaceId = tabManager.selectedTabId let workspaceSnapshotsById = extensionSidebarWorkspaceSnapshotsById(for: section.rows) + let workspaceAgentLifecycleStatesById = extensionSidebarWorkspaceAgentLifecycleStatesById(for: section.rows) VStack(alignment: .leading, spacing: 1) { HStack(spacing: 7) { @@ -11818,6 +11842,7 @@ struct VerticalTabsSidebar: View { relativeNow: now, isSelected: row.workspaceId == selectedWorkspaceId, workspaceStatusStyle: sidebarWorkspaceStatusStyle, + workspaceAgentLifecycleState: workspaceAgentLifecycleStatesById[row.workspaceId], onSelect: selectExtensionSidebarWorkspace, onOpenWindow: CmuxExtensionSidebarInspectorWindowController.show ) diff --git a/Sources/ExtensionSidebarWorkspaceRowView.swift b/Sources/ExtensionSidebarWorkspaceRowView.swift index d5f3832877d4..811610cf9a56 100644 --- a/Sources/ExtensionSidebarWorkspaceRowView.swift +++ b/Sources/ExtensionSidebarWorkspaceRowView.swift @@ -12,6 +12,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { let relativeNow: Date let isSelected: Bool let workspaceStatusStyle: SidebarWorkspaceStatusStyle + let workspaceAgentLifecycleState: AgentHibernationLifecycleState? let onSelect: (UUID) -> Void let onOpenWindow: (CmuxSidebarProviderWorkspace) -> Void @State private var showsInspector = false @@ -23,7 +24,8 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { lhs.providerId == rhs.providerId && lhs.relativeNow == rhs.relativeNow && lhs.isSelected == rhs.isSelected && - lhs.workspaceStatusStyle == rhs.workspaceStatusStyle + lhs.workspaceStatusStyle == rhs.workspaceStatusStyle && + lhs.workspaceAgentLifecycleState == rhs.workspaceAgentLifecycleState } private var isSuperCompact: Bool { @@ -38,6 +40,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { let primarySize: CGFloat = isSuperCompact ? 10.5 : 12.5 let secondarySize: CGFloat = isSuperCompact ? 9 : 10 let subtitle = rendered(row.subtitle) + let showsStatusDot = workspaceStatusStyle == .dot && workspaceAgentLifecycleState != nil HStack(spacing: isSuperCompact ? 5 : 7) { VStack(alignment: .leading, spacing: isSuperCompact ? 0 : 2) { HStack(spacing: 5) { @@ -47,15 +50,20 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { .lineLimit(1) .truncationMode(.tail) - if workspaceStatusStyle == .dot, let subtitle { + if workspaceStatusStyle == .dot, let workspaceAgentLifecycleState { + let accessibilityLabel = agentStatusAccessibilityLabel( + subtitle: subtitle, + state: workspaceAgentLifecycleState + ) Circle() - .fill(agentStatusColor(for: subtitle)) + .fill(agentStatusColor(for: workspaceAgentLifecycleState)) .frame(width: 6, height: 6) - .accessibilityLabel(Text(subtitle)) + .accessibilityLabel(Text(accessibilityLabel ?? "")) + .accessibilityHidden(accessibilityLabel == nil) } } - if workspaceStatusStyle == .sentence, !isSuperCompact, let subtitle { + if !showsStatusDot, !isSuperCompact, let subtitle { Text(subtitle) .cmuxFont(size: secondarySize, weight: .regular) .foregroundColor(.secondary) @@ -134,24 +142,32 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { return 32 } - private func agentStatusColor(for subtitle: String) -> Color { - let normalized = subtitle.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() - if normalized.contains("needs input") - || normalized.contains("need input") - || normalized.contains("waiting for input") - || normalized.contains("waiting for your input") - || normalized.contains("your input") { + private func agentStatusColor(for state: AgentHibernationLifecycleState) -> Color { + switch state { + case .needsInput: return .orange - } - if normalized.contains("running") - || normalized.contains("working") - || normalized.contains("processing") - || normalized.contains("thinking") - || normalized.contains("in progress") - || normalized.contains("executing") { + case .running: return .green + case .idle, .unknown: + return .secondary + } + } + + private func agentStatusAccessibilityLabel( + subtitle: String?, + state: AgentHibernationLifecycleState + ) -> String? { + if let subtitle { return subtitle } + switch state { + case .needsInput: + return String(localized: "feed.status.needsInput", defaultValue: "Needs input") + case .running: + return String(localized: "agentSession.web.status.running", defaultValue: "Running") + case .idle: + return String(localized: "agentSession.web.status.idle", defaultValue: "Idle") + case .unknown: + return nil } - return .secondary } private func rendered(_ text: CmuxSidebarProviderText?) -> String? { diff --git a/Sources/Workspace.swift b/Sources/Workspace.swift index a10d01af9e65..760e2506574a 100644 --- a/Sources/Workspace.swift +++ b/Sources/Workspace.swift @@ -4637,6 +4637,7 @@ final class Workspace: Identifiable, ObservableObject { workspaceId: id, panelId: panelId ) + sidebarMetadata.invalidateWorkspaceObservation() } func agentHibernationLifecycleState( From ebd592f2e2bfa4db9d0ad6367fa6735b077c2480 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 19:46:22 -0700 Subject: [PATCH 03/25] Refresh Swift file length budget --- .github/swift-file-length-budget.tsv | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/swift-file-length-budget.tsv b/.github/swift-file-length-budget.tsv index 4ffc65fcdce6..f71c05d2e0a5 100644 --- a/.github/swift-file-length-budget.tsv +++ b/.github/swift-file-length-budget.tsv @@ -2,19 +2,19 @@ # Format: max_linesrelative path # Reduce counts as files shrink. CI fails if tracked files exceed this budget. 34590 CLI/cmux.swift -17827 Sources/AppDelegate.swift -16128 Sources/ContentView.swift +17826 Sources/AppDelegate.swift +16171 Sources/ContentView.swift 13832 Sources/TerminalController.swift -12845 Sources/Workspace.swift +12879 Sources/Workspace.swift 12237 Sources/GhosttyTerminalView.swift 12144 cmuxTests/AppDelegateShortcutRoutingTests.swift -11569 Sources/Panels/BrowserPanel.swift +11578 Sources/Panels/BrowserPanel.swift 9497 cmuxTests/CLINotifyProcessIntegrationRegressionTests.swift 8016 CLI/cmux_open.swift 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From 3c7b5234b4acf3d5281cc4c3c9db41e370bc2d14 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 19:47:08 -0700 Subject: [PATCH 04/25] Avoid repeated sidebar lifecycle scans --- Sources/ContentView.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index b079a1e79990..e43702c2c8df 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -11702,12 +11702,12 @@ struct VerticalTabsSidebar: View { return snapshotsById } - private func extensionSidebarWorkspaceAgentLifecycleStatesById( - for rows: [CmuxSidebarProviderRow] - ) -> [UUID: AgentHibernationLifecycleState] { + private func extensionSidebarWorkspaceAgentLifecycleStatesById(for rows: [CmuxSidebarProviderRow]) + -> [UUID: AgentHibernationLifecycleState] { + let workspaceById = Dictionary(uniqueKeysWithValues: tabManager.tabs.map { ($0.id, $0) }) var statesById: [UUID: AgentHibernationLifecycleState] = [:] for row in rows where statesById[row.workspaceId] == nil { - guard let workspace = tabManager.tabs.first(where: { $0.id == row.workspaceId }), + guard let workspace = workspaceById[row.workspaceId], let state = extensionSidebarAgentLifecycleState(for: workspace) else { continue } From 569959047c0d09c8a825c46772a20b943d1c3cb4 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 19:58:21 -0700 Subject: [PATCH 05/25] Fix sidebar status dot refresh and subtitles --- .../SettingsRowAnchorResolutionTests.swift | 2 ++ .../ExtensionSidebarWorkspaceRowView.swift | 21 ++++++++++++++----- Sources/WorkspaceSidebarObservation.swift | 2 ++ .../WorkspaceSidebarObservationTests.swift | 20 ++++++++++++++++++ 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SettingsRowAnchorResolutionTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SettingsRowAnchorResolutionTests.swift index 6cf4f7ccab61..a88a4f069bcc 100644 --- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SettingsRowAnchorResolutionTests.swift +++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SettingsRowAnchorResolutionTests.swift @@ -93,6 +93,7 @@ struct SettingsRowAnchorResolutionTests { "sidebar.openPullRequestLinksInCmuxBrowser", "sidebar.pathLastSegmentOnly", "sidebar.rightMaxWidth", + "sidebar.scrollEdgeFade", "sidebar.showBranchDirectory", "sidebar.showCustomMetadata", "sidebar.showLog", @@ -105,6 +106,7 @@ struct SettingsRowAnchorResolutionTests { "sidebar.stackBranchDirectory", "sidebar.watchGitStatus", "sidebar.wrapWorkspaceTitles", + "sidebar.workspaceStatusStyle", "sidebarAppearance.matchTerminalBackground", "shortcuts.showModifierHoldHints", "terminal.agentHibernation.enabled", diff --git a/Sources/ExtensionSidebarWorkspaceRowView.swift b/Sources/ExtensionSidebarWorkspaceRowView.swift index 811610cf9a56..ed9f48d3c77a 100644 --- a/Sources/ExtensionSidebarWorkspaceRowView.swift +++ b/Sources/ExtensionSidebarWorkspaceRowView.swift @@ -40,7 +40,6 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { let primarySize: CGFloat = isSuperCompact ? 10.5 : 12.5 let secondarySize: CGFloat = isSuperCompact ? 9 : 10 let subtitle = rendered(row.subtitle) - let showsStatusDot = workspaceStatusStyle == .dot && workspaceAgentLifecycleState != nil HStack(spacing: isSuperCompact ? 5 : 7) { VStack(alignment: .leading, spacing: isSuperCompact ? 0 : 2) { HStack(spacing: 5) { @@ -52,7 +51,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { if workspaceStatusStyle == .dot, let workspaceAgentLifecycleState { let accessibilityLabel = agentStatusAccessibilityLabel( - subtitle: subtitle, + subtitle: replacesSubtitleWithStatusDot ? subtitle : nil, state: workspaceAgentLifecycleState ) Circle() @@ -63,7 +62,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { } } - if !showsStatusDot, !isSuperCompact, let subtitle { + if !replacesSubtitleWithStatusDot, !isSuperCompact, let subtitle { Text(subtitle) .cmuxFont(size: secondarySize, weight: .regular) .foregroundColor(.secondary) @@ -130,15 +129,27 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { } } + private var showsStatusDot: Bool { + workspaceStatusStyle == .dot && workspaceAgentLifecycleState != nil + } + + private var replacesSubtitleWithStatusDot: Bool { + showsStatusDot && providerId == CmuxSidebarProviderDescriptor.defaultWorkspacesID + } + + private var usesOneLineStatusDotLayout: Bool { + showsStatusDot && (row.subtitle == nil || replacesSubtitleWithStatusDot) + } + private var rowVerticalPadding: CGFloat { if isSuperCompact { return 2 } - if isThin || workspaceStatusStyle == .dot { return 5 } + if isThin || usesOneLineStatusDotLayout { return 5 } return 7 } private var rowMinimumHeight: CGFloat { if isSuperCompact { return 22 } - if workspaceStatusStyle == .dot { return 28 } + if usesOneLineStatusDotLayout { return 28 } return 32 } diff --git a/Sources/WorkspaceSidebarObservation.swift b/Sources/WorkspaceSidebarObservation.swift index 3db0a5eff28d..98b266325d2f 100644 --- a/Sources/WorkspaceSidebarObservation.swift +++ b/Sources/WorkspaceSidebarObservation.swift @@ -34,6 +34,7 @@ private struct SidebarObservationState: Equatable { let panelGitBranches: [UUID: SidebarGitBranchState] let pullRequest: SidebarPullRequestState? let panelPullRequests: [UUID: SidebarPullRequestState] + let agentLifecycleStatesByPanelId: [UUID: [String: AgentHibernationLifecycleState]] let remoteConfiguration: WorkspaceRemoteConfiguration? let remoteConnectionState: WorkspaceRemoteConnectionState let remoteConnectionDetail: String? @@ -126,6 +127,7 @@ extension Workspace { panelGitBranches: gitFields.1, pullRequest: gitFields.2, panelPullRequests: gitFields.3, + agentLifecycleStatesByPanelId: self.agentLifecycleStatesByPanelId, remoteConfiguration: remoteFields.0, remoteConnectionState: remoteFields.1, remoteConnectionDetail: remoteFields.2, diff --git a/cmuxTests/WorkspaceSidebarObservationTests.swift b/cmuxTests/WorkspaceSidebarObservationTests.swift index 5ab5eef384a3..d814038f2310 100644 --- a/cmuxTests/WorkspaceSidebarObservationTests.swift +++ b/cmuxTests/WorkspaceSidebarObservationTests.swift @@ -70,4 +70,24 @@ final class WorkspaceSidebarObservationTests: XCTestCase { "Expected non-visible remote heartbeat updates to avoid invalidating sidebar rows" ) } + + func testSidebarObservationPublisherEmitsForAgentLifecycleOnlyChange() throws { + let workspace = Workspace() + let panelId = try XCTUnwrap(workspace.focusedPanelId) + + var publishCount = 0 + let cancellable = workspace.sidebarObservationPublisher.sink { + publishCount += 1 + } + defer { cancellable.cancel() } + publishCount = 0 + + workspace.setAgentLifecycle(key: "codex", panelId: panelId, lifecycle: .needsInput) + + XCTAssertGreaterThan( + publishCount, + 0, + "Agent lifecycle changes must refresh extension sidebar status dots even when no visible metadata text changes" + ) + } } From db4c0477f07beea962794c5f9693a5f88941e18f Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 20:01:35 -0700 Subject: [PATCH 06/25] Address sidebar status review feedback --- .../AgentHibernationLifecycleState.swift | 8 ++++++++ Sources/ContentView.swift | 10 +++------- Sources/Workspace.swift | 10 ++++------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Sources/AgentHibernation/AgentHibernationLifecycleState.swift b/Sources/AgentHibernation/AgentHibernationLifecycleState.swift index 6d957a31a0da..813fbf129546 100644 --- a/Sources/AgentHibernation/AgentHibernationLifecycleState.swift +++ b/Sources/AgentHibernation/AgentHibernationLifecycleState.swift @@ -16,6 +16,14 @@ enum AgentHibernationLifecycleState: String, Codable, Sendable, Equatable, CaseI self == .idle } + static func dominant(in states: [Self], fallback: Self?) -> Self { + if states.contains(.running) { return .running } + if states.contains(.needsInput) { return .needsInput } + if states.contains(.unknown) { return .unknown } + if states.contains(.idle) { return .idle } + return fallback ?? .unknown + } + func encode(to encoder: Encoder) throws { var container = encoder.singleValueContainer() try container.encode(rawValue) diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index e43702c2c8df..8aa5dfa139db 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -11702,9 +11702,8 @@ struct VerticalTabsSidebar: View { return snapshotsById } - private func extensionSidebarWorkspaceAgentLifecycleStatesById(for rows: [CmuxSidebarProviderRow]) + private func extensionSidebarWorkspaceAgentLifecycleStatesById(for rows: [CmuxSidebarProviderRow], workspaceById: [UUID: Workspace]) -> [UUID: AgentHibernationLifecycleState] { - let workspaceById = Dictionary(uniqueKeysWithValues: tabManager.tabs.map { ($0.id, $0) }) var statesById: [UUID: AgentHibernationLifecycleState] = [:] for row in rows where statesById[row.workspaceId] == nil { guard let workspace = workspaceById[row.workspaceId], @@ -11719,10 +11718,7 @@ struct VerticalTabsSidebar: View { private func extensionSidebarAgentLifecycleState(for workspace: Workspace) -> AgentHibernationLifecycleState? { let states = workspace.agentLifecycleStatesByPanelId.values.flatMap { Array($0.values) } guard !states.isEmpty else { return nil } - if states.contains(.needsInput) { return .needsInput } - if states.contains(.running) { return .running } - if states.contains(.idle) { return .idle } - return .unknown + return AgentHibernationLifecycleState.dominant(in: states, fallback: .unknown) } private func extensionBrowserStackIcon( @@ -11786,7 +11782,7 @@ struct VerticalTabsSidebar: View { let canCreateWorktree = section.treeSection.projectRootPath != nil let selectedWorkspaceId = tabManager.selectedTabId let workspaceSnapshotsById = extensionSidebarWorkspaceSnapshotsById(for: section.rows) - let workspaceAgentLifecycleStatesById = extensionSidebarWorkspaceAgentLifecycleStatesById(for: section.rows) + let workspaceAgentLifecycleStatesById = extensionSidebarWorkspaceAgentLifecycleStatesById(for: section.rows, workspaceById: renderContext.workspaceById) VStack(alignment: .leading, spacing: 1) { HStack(spacing: 7) { diff --git a/Sources/Workspace.swift b/Sources/Workspace.swift index 760e2506574a..4ee43b600634 100644 --- a/Sources/Workspace.swift +++ b/Sources/Workspace.swift @@ -4648,12 +4648,10 @@ final class Workspace: Identifiable, ObservableObject { !panelStates.isEmpty else { return fallback ?? .unknown } - let states = Array(panelStates.values) - if states.contains(.running) { return .running } - if states.contains(.needsInput) { return .needsInput } - if states.contains(.unknown) { return .unknown } - if states.contains(.idle) { return .idle } - return fallback ?? .unknown + return AgentHibernationLifecycleState.dominant( + in: Array(panelStates.values), + fallback: fallback + ) } func restorableAgentForHibernation( From 2487f7325c0fada9cbea2064adf8a715f7c05ded Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 20:11:20 -0700 Subject: [PATCH 07/25] Fix sidebar schema localization --- Sources/ContentView.swift | 11 ++++------- web/messages/ar.json | 2 ++ web/messages/bs.json | 2 ++ web/messages/da.json | 2 ++ web/messages/de.json | 2 ++ web/messages/es.json | 2 ++ web/messages/fr.json | 2 ++ web/messages/it.json | 2 ++ web/messages/km.json | 2 ++ web/messages/ko.json | 2 ++ web/messages/no.json | 2 ++ web/messages/pl.json | 2 ++ web/messages/pt-BR.json | 2 ++ web/messages/ru.json | 2 ++ web/messages/th.json | 2 ++ web/messages/tr.json | 2 ++ web/messages/uk.json | 2 ++ web/messages/zh-CN.json | 2 ++ web/messages/zh-TW.json | 2 ++ 19 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index 8aa5dfa139db..2f6bf78ef410 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -10861,7 +10861,7 @@ struct VerticalTabsSidebar: View { } else { VStack(alignment: .leading, spacing: 2) { ForEach(model.sections) { section in - extensionSidebarSection(section, providerId: model.providerId, now: now) + extensionSidebarSection(section, providerId: model.providerId, now: now, workspaceById: renderContext.workspaceById) } SidebarEmptyArea( @@ -11773,16 +11773,13 @@ struct VerticalTabsSidebar: View { } @ViewBuilder - private func extensionSidebarSection( - _ section: CmuxSidebarProviderSection, - providerId: String, - now: Date - ) -> some View { + private func extensionSidebarSection(_ section: CmuxSidebarProviderSection, providerId: String, now: Date, + workspaceById: [UUID: Workspace]) -> some View { let isCollapsed = collapsedExtensionSidebarSectionIds.contains(section.id) let canCreateWorktree = section.treeSection.projectRootPath != nil let selectedWorkspaceId = tabManager.selectedTabId let workspaceSnapshotsById = extensionSidebarWorkspaceSnapshotsById(for: section.rows) - let workspaceAgentLifecycleStatesById = extensionSidebarWorkspaceAgentLifecycleStatesById(for: section.rows, workspaceById: renderContext.workspaceById) + let workspaceAgentLifecycleStatesById = extensionSidebarWorkspaceAgentLifecycleStatesById(for: section.rows, workspaceById: workspaceById) VStack(alignment: .leading, spacing: 1) { HStack(spacing: 7) { diff --git a/web/messages/ar.json b/web/messages/ar.json index 589784af5be5..62529acb8309 100644 --- a/web/messages/ar.json +++ b/web/messages/ar.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "كيفية عرض صفوف مساحات العمل في الشريط الجانبي للإضافات لحالة الوكيل: `sentence` تبقي نص العنوان الفرعي، بينما `dot` تستخدم مؤشرا ملونا مضغوطا.", + "scrollEdgeFade": "قوة تلاشي حافة التمرير العلوية والسفلية فوق قائمة تبويبات الشريط الجانبي.", "rightMaxWidth": "أقصى عرض بالنقاط للشريط الجانبي الأيمن. عند تركه فارغًا، يُطبّق الحد الديناميكي المضمن." }, "fileExplorer": { diff --git a/web/messages/bs.json b/web/messages/bs.json index 24775c1e19f6..239c3968733a 100644 --- a/web/messages/bs.json +++ b/web/messages/bs.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Kako redovi radnog prostora u bočnoj traci ekstenzije prikazuju status agenta: `sentence` zadržava tekst podnaslova, dok `dot` koristi kompaktni obojeni indikator.", + "scrollEdgeFade": "Jačina gornjeg i donjeg izbljeđivanja ivice skrolovanja preko liste tabova u bočnoj traci.", "rightMaxWidth": "Maksimalna širina desne bočne trake u tačkama. Ako se izostavi, primjenjuje se ugrađeno dinamičko ograničenje." }, "fileExplorer": { diff --git a/web/messages/da.json b/web/messages/da.json index 7d15a6bf7ff1..ccb930809d59 100644 --- a/web/messages/da.json +++ b/web/messages/da.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Hvordan arbejdsområderækker i udvidelsessidepanelet viser agentstatus: `sentence` beholder underteksten, mens `dot` bruger en kompakt farvet indikator.", + "scrollEdgeFade": "Styrken af den øverste og nederste rulningskantfade over sidepanelets faneliste.", "rightMaxWidth": "Maksimal bredde i punkter for højre sidepanel. Hvis den udelades, bruges den indbyggede dynamiske grænse." }, "fileExplorer": { diff --git a/web/messages/de.json b/web/messages/de.json index af6789f6dc07..385e9a291aa6 100644 --- a/web/messages/de.json +++ b/web/messages/de.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Wie Workspace-Zeilen der Erweiterungsseitenleiste den Agentenstatus anzeigen: `sentence` behält den Untertiteltext bei, während `dot` einen kompakten farbigen Indikator nutzt.", + "scrollEdgeFade": "Stärke des oberen und unteren Scrollkanten-Fades über der Tab-Liste der Seitenleiste.", "rightMaxWidth": "Maximale Breite der rechten Seitenleiste in Punkten. Wenn weggelassen, gilt die integrierte dynamische Obergrenze." }, "fileExplorer": { diff --git a/web/messages/es.json b/web/messages/es.json index 1c445c0db15b..e529fcf9bfa0 100644 --- a/web/messages/es.json +++ b/web/messages/es.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Cómo las filas de espacio de trabajo de la barra lateral de extensiones muestran el estado del agente: `sentence` conserva el subtítulo, mientras que `dot` usa un indicador de color compacto.", + "scrollEdgeFade": "Intensidad del desvanecimiento superior e inferior del borde de desplazamiento sobre la lista de pestañas de la barra lateral.", "rightMaxWidth": "Ancho máximo en puntos para la barra lateral derecha. Si se omite, se aplica el límite dinámico integrado." }, "fileExplorer": { diff --git a/web/messages/fr.json b/web/messages/fr.json index 853e96c5f414..08eebd6945af 100644 --- a/web/messages/fr.json +++ b/web/messages/fr.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Façon dont les lignes d'espace de travail de la barre latérale d'extension affichent l'état de l'agent : `sentence` conserve le sous-titre, tandis que `dot` utilise un indicateur coloré compact.", + "scrollEdgeFade": "Intensité du fondu des bords de défilement supérieur et inférieur au-dessus de la liste d'onglets de la barre latérale.", "rightMaxWidth": "Largeur maximale en points de la barre latérale droite. Si elle est omise, la limite dynamique intégrée s’applique." }, "fileExplorer": { diff --git a/web/messages/it.json b/web/messages/it.json index 7d061dc0700d..6db0e7d0b628 100644 --- a/web/messages/it.json +++ b/web/messages/it.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Come le righe dell'area di lavoro nella barra laterale delle estensioni mostrano lo stato dell'agente: `sentence` mantiene il sottotitolo, mentre `dot` usa un indicatore colorato compatto.", + "scrollEdgeFade": "Intensità della dissolvenza dei bordi di scorrimento superiore e inferiore sopra l'elenco delle schede della barra laterale.", "rightMaxWidth": "Larghezza massima in punti della barra laterale destra. Se omessa, si applica il limite dinamico integrato." }, "fileExplorer": { diff --git a/web/messages/km.json b/web/messages/km.json index 1f854bc3c50f..3082d9676256 100644 --- a/web/messages/km.json +++ b/web/messages/km.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "របៀបដែលជួរតំបន់ការងារនៅក្នុងរបារចំហៀងផ្នែកបន្ថែមបង្ហាញស្ថានភាពភ្នាក់ងារ៖ `sentence` រក្សាអត្ថបទចំណងជើងរង ខណៈ `dot` ប្រើសញ្ញាចង្អុលពណ៌តូច។", + "scrollEdgeFade": "កម្រិតភាពស្រអាប់នៅគែមរមូរខាងលើ និងខាងក្រោមលើបញ្ជីផ្ទាំងនៃរបារចំហៀង។", "rightMaxWidth": "ទទឹងអតិបរមាជាពិន្ទុសម្រាប់របារចំហៀងខាងស្តាំ។ បើមិនបញ្ជាក់ នឹងប្រើដែនកំណត់ថាមវន្តដែលមានស្រាប់។" }, "fileExplorer": { diff --git a/web/messages/ko.json b/web/messages/ko.json index 2d9c7bbeb581..2b88e90844e2 100644 --- a/web/messages/ko.json +++ b/web/messages/ko.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "확장 사이드바의 워크스페이스 행이 에이전트 상태를 표시하는 방식입니다. `sentence`는 자막 텍스트를 유지하고, `dot`은 작은 색상 표시기를 사용합니다.", + "scrollEdgeFade": "사이드바 탭 목록 위아래의 스크롤 가장자리 페이드 강도입니다.", "rightMaxWidth": "오른쪽 사이드바의 최대 너비(포인트). 생략하면 내장 동적 상한이 적용됩니다." }, "fileExplorer": { diff --git a/web/messages/no.json b/web/messages/no.json index e440e62049cd..cc04b4e8f936 100644 --- a/web/messages/no.json +++ b/web/messages/no.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Hvordan arbeidsområderader i utvidelsessidefeltet viser agentstatus: `sentence` beholder undertittelteksten, mens `dot` bruker en kompakt farget indikator.", + "scrollEdgeFade": "Styrken på øvre og nedre rullekanttoning over fanelisten i sidefeltet.", "rightMaxWidth": "Maksimal bredde i punkter for høyre sidepanel. Hvis den utelates, brukes den innebygde dynamiske grensen." }, "fileExplorer": { diff --git a/web/messages/pl.json b/web/messages/pl.json index 7b9db613c7b9..a8dc04bf4c08 100644 --- a/web/messages/pl.json +++ b/web/messages/pl.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Sposób wyświetlania stanu agenta w wierszach obszarów roboczych paska bocznego rozszerzeń: `sentence` zachowuje tekst podtytułu, a `dot` używa zwartego kolorowego wskaźnika.", + "scrollEdgeFade": "Siła górnego i dolnego zanikania krawędzi przewijania nad listą kart paska bocznego.", "rightMaxWidth": "Maksymalna szerokość prawego paska bocznego w punktach. Jeśli pominięta, obowiązuje wbudowany limit dynamiczny." }, "fileExplorer": { diff --git a/web/messages/pt-BR.json b/web/messages/pt-BR.json index 13247ecfaf50..0924ff03e451 100644 --- a/web/messages/pt-BR.json +++ b/web/messages/pt-BR.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Como as linhas de espaço de trabalho da barra lateral de extensões mostram o status do agente: `sentence` mantém o texto do subtítulo, enquanto `dot` usa um indicador colorido compacto.", + "scrollEdgeFade": "Intensidade do esmaecimento das bordas superior e inferior de rolagem sobre a lista de abas da barra lateral.", "rightMaxWidth": "Largura máxima em pontos para a barra lateral direita. Quando omitida, o limite dinâmico integrado se aplica." }, "fileExplorer": { diff --git a/web/messages/ru.json b/web/messages/ru.json index 800e1792a20d..9258296275c5 100644 --- a/web/messages/ru.json +++ b/web/messages/ru.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Как строки рабочих пространств в боковой панели расширений показывают статус агента: `sentence` оставляет текст подзаголовка, а `dot` использует компактный цветной индикатор.", + "scrollEdgeFade": "Сила затемнения верхнего и нижнего края прокрутки над списком вкладок боковой панели.", "rightMaxWidth": "Максимальная ширина правой боковой панели в пунктах. Если не указано, применяется встроенное динамическое ограничение." }, "fileExplorer": { diff --git a/web/messages/th.json b/web/messages/th.json index c9a0629d52fd..0fb7a2da18b0 100644 --- a/web/messages/th.json +++ b/web/messages/th.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "วิธีที่แถวเวิร์กสเปซในแถบด้านข้างส่วนขยายแสดงสถานะเอเจนต์: `sentence` คงข้อความคำบรรยายไว้ ส่วน `dot` ใช้ตัวบ่งชี้สีแบบกะทัดรัด", + "scrollEdgeFade": "ความเข้มของเฟดขอบการเลื่อนด้านบนและด้านล่างเหนือรายการแท็บในแถบด้านข้าง", "rightMaxWidth": "ความกว้างสูงสุดเป็นพอยต์สำหรับแถบด้านขวา หากเว้นไว้ จะใช้ขีดจำกัดแบบไดนามิกในตัว" }, "fileExplorer": { diff --git a/web/messages/tr.json b/web/messages/tr.json index 1b082069eace..ae424e21bf56 100644 --- a/web/messages/tr.json +++ b/web/messages/tr.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Uzantı kenar çubuğundaki çalışma alanı satırlarının ajan durumunu gösterme biçimi: `sentence` alt başlık metnini korur, `dot` ise kompakt renkli bir gösterge kullanır.", + "scrollEdgeFade": "Kenar çubuğu sekme listesinin üstündeki ve altındaki kaydırma kenarı solma gücü.", "rightMaxWidth": "Sağ kenar çubuğu için puan cinsinden en fazla genişlik. Atlanırsa yerleşik dinamik sınır uygulanır." }, "fileExplorer": { diff --git a/web/messages/uk.json b/web/messages/uk.json index 36d918db5eba..2022151aaa83 100644 --- a/web/messages/uk.json +++ b/web/messages/uk.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "Як рядки робочих просторів у бічній панелі розширень показують стан агента: `sentence` зберігає текст підзаголовка, а `dot` використовує компактний кольоровий індикатор.", + "scrollEdgeFade": "Сила затемнення верхнього й нижнього краю прокручування над списком вкладок бічної панелі.", "rightMaxWidth": "Максимальна ширина правої бічної панелі в пунктах. Якщо пропущено, застосовується вбудоване динамічне обмеження." }, "fileExplorer": { diff --git a/web/messages/zh-CN.json b/web/messages/zh-CN.json index a763291d3908..8f43c5d07a2f 100644 --- a/web/messages/zh-CN.json +++ b/web/messages/zh-CN.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "扩展侧边栏的工作区行显示代理状态的方式:`sentence` 保留副标题文本,`dot` 使用紧凑的彩色指示器。", + "scrollEdgeFade": "侧边栏标签列表顶部和底部滚动边缘淡化的强度。", "rightMaxWidth": "右侧边栏的最大宽度(点)。省略时使用内置动态上限。" }, "fileExplorer": { diff --git a/web/messages/zh-TW.json b/web/messages/zh-TW.json index 1d3940181965..341b5f26fb45 100644 --- a/web/messages/zh-TW.json +++ b/web/messages/zh-TW.json @@ -837,6 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { + "workspaceStatusStyle": "擴充功能側邊欄的工作區列顯示代理狀態的方式:`sentence` 保留副標題文字,`dot` 使用精簡的彩色指示器。", + "scrollEdgeFade": "側邊欄分頁列表頂部與底部捲動邊緣淡化的強度。", "rightMaxWidth": "右側邊欄的最大寬度(點)。省略時使用內建動態上限。" }, "fileExplorer": { From 0e1d61be40b728e9b95a263d8580072e526b645a Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 20:21:01 -0700 Subject: [PATCH 08/25] Split sidebar status indicator priority --- .../AgentHibernationLifecycleState.swift | 10 +++++++++- Sources/ContentView.swift | 2 +- Sources/Workspace.swift | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Sources/AgentHibernation/AgentHibernationLifecycleState.swift b/Sources/AgentHibernation/AgentHibernationLifecycleState.swift index 813fbf129546..ad47c0030416 100644 --- a/Sources/AgentHibernation/AgentHibernationLifecycleState.swift +++ b/Sources/AgentHibernation/AgentHibernationLifecycleState.swift @@ -16,7 +16,7 @@ enum AgentHibernationLifecycleState: String, Codable, Sendable, Equatable, CaseI self == .idle } - static func dominant(in states: [Self], fallback: Self?) -> Self { + static func dominantForHibernation(in states: [Self], fallback: Self?) -> Self { if states.contains(.running) { return .running } if states.contains(.needsInput) { return .needsInput } if states.contains(.unknown) { return .unknown } @@ -24,6 +24,14 @@ enum AgentHibernationLifecycleState: String, Codable, Sendable, Equatable, CaseI return fallback ?? .unknown } + static func dominantForStatusIndicator(in states: [Self], fallback: Self?) -> Self { + if states.contains(.needsInput) { return .needsInput } + if states.contains(.running) { return .running } + if states.contains(.unknown) { return .unknown } + if states.contains(.idle) { return .idle } + return fallback ?? .unknown + } + func encode(to encoder: Encoder) throws { var container = encoder.singleValueContainer() try container.encode(rawValue) diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index 2f6bf78ef410..5dfc46e69f13 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -11718,7 +11718,7 @@ struct VerticalTabsSidebar: View { private func extensionSidebarAgentLifecycleState(for workspace: Workspace) -> AgentHibernationLifecycleState? { let states = workspace.agentLifecycleStatesByPanelId.values.flatMap { Array($0.values) } guard !states.isEmpty else { return nil } - return AgentHibernationLifecycleState.dominant(in: states, fallback: .unknown) + return AgentHibernationLifecycleState.dominantForStatusIndicator(in: states, fallback: .unknown) } private func extensionBrowserStackIcon( diff --git a/Sources/Workspace.swift b/Sources/Workspace.swift index 4ee43b600634..9376d8984654 100644 --- a/Sources/Workspace.swift +++ b/Sources/Workspace.swift @@ -4648,7 +4648,7 @@ final class Workspace: Identifiable, ObservableObject { !panelStates.isEmpty else { return fallback ?? .unknown } - return AgentHibernationLifecycleState.dominant( + return AgentHibernationLifecycleState.dominantForHibernation( in: Array(panelStates.values), fallback: fallback ) From 9ecbe11049f7bbbddaa27b2d636ec1a250f52bde Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 20:22:04 -0700 Subject: [PATCH 09/25] Fix Korean sidebar schema copy --- web/messages/ko.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/messages/ko.json b/web/messages/ko.json index 2b88e90844e2..1a41aeed7ed0 100644 --- a/web/messages/ko.json +++ b/web/messages/ko.json @@ -837,8 +837,8 @@ "maxWidth": "Default maximum reading column width, in CSS pixels, for newly opened markdown viewers." }, "sidebar": { - "workspaceStatusStyle": "확장 사이드바의 워크스페이스 행이 에이전트 상태를 표시하는 방식입니다. `sentence`는 자막 텍스트를 유지하고, `dot`은 작은 색상 표시기를 사용합니다.", - "scrollEdgeFade": "사이드바 탭 목록 위아래의 스크롤 가장자리 페이드 강도입니다.", + "workspaceStatusStyle": "확장 사이드바의 작업 공간 행에서 에이전트 상태를 표시하는 방법입니다. `sentence`는 보조 설명을 표시하고, `dot`은 작은 색상 표시기를 사용합니다.", + "scrollEdgeFade": "사이드바 탭 목록의 위쪽과 아래쪽 스크롤 가장자리 페이드 강도입니다.", "rightMaxWidth": "오른쪽 사이드바의 최대 너비(포인트). 생략하면 내장 동적 상한이 적용됩니다." }, "fileExplorer": { From ff1f8a5961ac96b511dbb7c604fc7e8d270ee386 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 20:27:47 -0700 Subject: [PATCH 10/25] Respect live push rate limit env in tests --- web/app/api/notifications/push/route.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/app/api/notifications/push/route.ts b/web/app/api/notifications/push/route.ts index 3dda77a168a1..3675a3d643b1 100644 --- a/web/app/api/notifications/push/route.ts +++ b/web/app/api/notifications/push/route.ts @@ -53,8 +53,9 @@ async function sendPush(request: Request): Promise { const user = await verifyRequest(request, { allowCookie: false }); if (!user) return unauthorized(); - if (process.env.VERCEL === "1" && env.CMUX_PUSH_RATE_LIMIT_ID) { - const { error, rateLimited } = await checkRateLimit(env.CMUX_PUSH_RATE_LIMIT_ID, { + const pushRateLimitId = process.env.CMUX_PUSH_RATE_LIMIT_ID?.trim() || env.CMUX_PUSH_RATE_LIMIT_ID; + if (process.env.VERCEL === "1" && pushRateLimitId) { + const { error, rateLimited } = await checkRateLimit(pushRateLimitId, { request, rateLimitKey: user.id, }); @@ -65,7 +66,7 @@ async function sendPush(request: Request): Promise { }); } if (error === "not-found") { - console.error("notifications.push.rate_limit_not_found", env.CMUX_PUSH_RATE_LIMIT_ID); + console.error("notifications.push.rate_limit_not_found", pushRateLimitId); } } From 2a963fac2291919271c117ddded072b108006faa Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 20:36:45 -0700 Subject: [PATCH 11/25] Fix sidebar status dot subtitle replacement --- Sources/ContentView.swift | 5 ++--- Sources/ExtensionSidebarWorkspaceRowView.swift | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index 5dfc46e69f13..950a319006ab 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -10861,7 +10861,7 @@ struct VerticalTabsSidebar: View { } else { VStack(alignment: .leading, spacing: 2) { ForEach(model.sections) { section in - extensionSidebarSection(section, providerId: model.providerId, now: now, workspaceById: renderContext.workspaceById) + extensionSidebarSection(section, now: now, workspaceById: renderContext.workspaceById) } SidebarEmptyArea( @@ -11773,7 +11773,7 @@ struct VerticalTabsSidebar: View { } @ViewBuilder - private func extensionSidebarSection(_ section: CmuxSidebarProviderSection, providerId: String, now: Date, + private func extensionSidebarSection(_ section: CmuxSidebarProviderSection, now: Date, workspaceById: [UUID: Workspace]) -> some View { let isCollapsed = collapsedExtensionSidebarSectionIds.contains(section.id) let canCreateWorktree = section.treeSection.projectRootPath != nil @@ -11831,7 +11831,6 @@ struct VerticalTabsSidebar: View { CmuxExtensionSidebarWorkspaceRowView( row: row, workspace: workspaceSnapshotsById[row.workspaceId], - providerId: providerId, relativeNow: now, isSelected: row.workspaceId == selectedWorkspaceId, workspaceStatusStyle: sidebarWorkspaceStatusStyle, diff --git a/Sources/ExtensionSidebarWorkspaceRowView.swift b/Sources/ExtensionSidebarWorkspaceRowView.swift index ed9f48d3c77a..f9f15377b271 100644 --- a/Sources/ExtensionSidebarWorkspaceRowView.swift +++ b/Sources/ExtensionSidebarWorkspaceRowView.swift @@ -8,7 +8,6 @@ import WebKit struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { let row: CmuxSidebarProviderRow let workspace: CmuxSidebarProviderWorkspace? - let providerId: String let relativeNow: Date let isSelected: Bool let workspaceStatusStyle: SidebarWorkspaceStatusStyle @@ -21,7 +20,6 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { nonisolated static func == (lhs: Self, rhs: Self) -> Bool { lhs.row == rhs.row && lhs.workspace == rhs.workspace && - lhs.providerId == rhs.providerId && lhs.relativeNow == rhs.relativeNow && lhs.isSelected == rhs.isSelected && lhs.workspaceStatusStyle == rhs.workspaceStatusStyle && @@ -134,7 +132,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { } private var replacesSubtitleWithStatusDot: Bool { - showsStatusDot && providerId == CmuxSidebarProviderDescriptor.defaultWorkspacesID + showsStatusDot } private var usesOneLineStatusDotLayout: Bool { From cbcd8cd3de115021bbf305bb28b8ddaac77bdf73 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 20:46:09 -0700 Subject: [PATCH 12/25] Preserve sidebar provider subtitles in dot mode --- .../SidebarWorkspaceStatusStyle+Display.swift | 2 +- Resources/Localizable.xcstrings | 4 ++-- Sources/CmuxSettingsJSONPathSupport.swift | 18 +++++++++--------- Sources/ExtensionSidebarWorkspaceRowView.swift | 10 +++------- ...ardShortcutSettingsFileStore+Template.swift | 5 +++-- cmuxTests/SidebarWidthPolicyTests.swift | 4 ++-- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift index d8478ab45483..c3f4e4a8527c 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift @@ -17,7 +17,7 @@ extension SidebarWorkspaceStatusStyle { case .sentence: return String(localized: "sidebarWorkspaceStatusStyle.sentence.description", defaultValue: "Agent status appears as a subtitle under each workspace title.") case .dot: - return String(localized: "sidebarWorkspaceStatusStyle.dot.description", defaultValue: "Agent status appears as a colored dot so workspace rows stay one line.") + return String(localized: "sidebarWorkspaceStatusStyle.dot.description", defaultValue: "Agent status appears as a colored dot beside each workspace title.") } } } diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings index 328103b86deb..785c8e05ae4b 100644 --- a/Resources/Localizable.xcstrings +++ b/Resources/Localizable.xcstrings @@ -205273,13 +205273,13 @@ "en": { "stringUnit": { "state": "translated", - "value": "Agent status appears as a colored dot so workspace rows stay one line." + "value": "Agent status appears as a colored dot beside each workspace title." } }, "ja": { "stringUnit": { "state": "translated", - "value": "エージェントの状態を色付きドットで表示し、ワークスペース行を1行に保ちます。" + "value": "エージェントの状態を各ワークスペースタイトルの横に色付きドットで表示します。" } } } diff --git a/Sources/CmuxSettingsJSONPathSupport.swift b/Sources/CmuxSettingsJSONPathSupport.swift index 81baed5cf92d..302c4c4e1fdd 100644 --- a/Sources/CmuxSettingsJSONPathSupport.swift +++ b/Sources/CmuxSettingsJSONPathSupport.swift @@ -173,7 +173,7 @@ enum TerminalSettingsFileMapping { } enum SidebarSettingsFileMapping { - private static let sidebar = SidebarCatalogSection() + private static let sidebarCatalog = SidebarCatalogSection() struct BooleanSetting { let jsonKey: String @@ -190,7 +190,7 @@ enum SidebarSettingsFileMapping { static let booleanSettings: [BooleanSetting] = [ .init( jsonKey: "hideAllDetails", - defaultsKey: sidebar.hideAllDetails.userDefaultsKey + defaultsKey: sidebarCatalog.hideAllDetails.userDefaultsKey ), .init( jsonKey: "wrapWorkspaceTitles", @@ -198,19 +198,19 @@ enum SidebarSettingsFileMapping { ), .init( jsonKey: "showWorkspaceDescription", - defaultsKey: sidebar.showWorkspaceDescription.userDefaultsKey + defaultsKey: sidebarCatalog.showWorkspaceDescription.userDefaultsKey ), .init( jsonKey: "stackBranchDirectory", - defaultsKey: sidebar.stackBranchDirectory.userDefaultsKey + defaultsKey: sidebarCatalog.stackBranchDirectory.userDefaultsKey ), .init( jsonKey: "pathLastSegmentOnly", - defaultsKey: sidebar.pathLastSegmentOnly.userDefaultsKey + defaultsKey: sidebarCatalog.pathLastSegmentOnly.userDefaultsKey ), .init( jsonKey: "showNotificationMessage", - defaultsKey: sidebar.showNotificationMessage.userDefaultsKey + defaultsKey: sidebarCatalog.showNotificationMessage.userDefaultsKey ), .init( jsonKey: "showBranchDirectory", @@ -226,7 +226,7 @@ enum SidebarSettingsFileMapping { ), .init( jsonKey: "makePullRequestsClickable", - defaultsKey: sidebar.makePullRequestsClickable.userDefaultsKey + defaultsKey: sidebarCatalog.makePullRequestsClickable.userDefaultsKey ), .init( jsonKey: "openPullRequestLinksInCmuxBrowser", @@ -252,13 +252,13 @@ enum SidebarSettingsFileMapping { static let stringEnumSettings: [StringEnumSetting] = [ .init( jsonKey: "workspaceStatusStyle", - defaultsKey: sidebar.workspaceStatusStyle.userDefaultsKey, + defaultsKey: sidebarCatalog.workspaceStatusStyle.userDefaultsKey, acceptedValues: Set(SidebarWorkspaceStatusStyle.allCases.map(\.rawValue)), invalidPath: "sidebar.workspaceStatusStyle" ), .init( jsonKey: "scrollEdgeFade", - defaultsKey: sidebar.scrollEdgeFade.userDefaultsKey, + defaultsKey: sidebarCatalog.scrollEdgeFade.userDefaultsKey, acceptedValues: Set(SidebarScrollEdgeFadeStyle.allCases.map(\.rawValue)), invalidPath: "sidebar.scrollEdgeFade" ), diff --git a/Sources/ExtensionSidebarWorkspaceRowView.swift b/Sources/ExtensionSidebarWorkspaceRowView.swift index f9f15377b271..39ff94086809 100644 --- a/Sources/ExtensionSidebarWorkspaceRowView.swift +++ b/Sources/ExtensionSidebarWorkspaceRowView.swift @@ -49,7 +49,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { if workspaceStatusStyle == .dot, let workspaceAgentLifecycleState { let accessibilityLabel = agentStatusAccessibilityLabel( - subtitle: replacesSubtitleWithStatusDot ? subtitle : nil, + subtitle: nil, state: workspaceAgentLifecycleState ) Circle() @@ -60,7 +60,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { } } - if !replacesSubtitleWithStatusDot, !isSuperCompact, let subtitle { + if !isSuperCompact, let subtitle { Text(subtitle) .cmuxFont(size: secondarySize, weight: .regular) .foregroundColor(.secondary) @@ -131,12 +131,8 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { workspaceStatusStyle == .dot && workspaceAgentLifecycleState != nil } - private var replacesSubtitleWithStatusDot: Bool { - showsStatusDot - } - private var usesOneLineStatusDotLayout: Bool { - showsStatusDot && (row.subtitle == nil || replacesSubtitleWithStatusDot) + showsStatusDot && row.subtitle == nil } private var rowVerticalPadding: CGFloat { diff --git a/Sources/KeyboardShortcutSettingsFileStore+Template.swift b/Sources/KeyboardShortcutSettingsFileStore+Template.swift index a2358ed9df6a..1e3ef1218ed9 100644 --- a/Sources/KeyboardShortcutSettingsFileStore+Template.swift +++ b/Sources/KeyboardShortcutSettingsFileStore+Template.swift @@ -53,6 +53,7 @@ extension CmuxSettingsFileStore { (action.rawValue, shortcutTemplateValue(action.defaultShortcut, usesNumberedDigits: action.usesNumberedDigitMatching)) } ) + let sidebarCatalog = SidebarCatalogSection() return [ [ @@ -127,8 +128,8 @@ extension CmuxSettingsFileStore { "hideAllDetails": SettingCatalog().sidebar.hideAllDetails.defaultValue, "wrapWorkspaceTitles": SidebarWorkspaceTitleWrapSettings.defaultWrap, "showWorkspaceDescription": SettingCatalog().sidebar.showWorkspaceDescription.defaultValue, - "workspaceStatusStyle": SettingCatalog().sidebar.workspaceStatusStyle.defaultValue.rawValue, - "scrollEdgeFade": SettingCatalog().sidebar.scrollEdgeFade.defaultValue.rawValue, + "workspaceStatusStyle": sidebarCatalog.workspaceStatusStyle.defaultValue.rawValue, + "scrollEdgeFade": sidebarCatalog.scrollEdgeFade.defaultValue.rawValue, "branchLayout": SettingCatalog().sidebar.branchVerticalLayout.defaultValue ? "vertical" : "inline", "stackBranchDirectory": SettingCatalog().sidebar.stackBranchDirectory.defaultValue, "pathLastSegmentOnly": SettingCatalog().sidebar.pathLastSegmentOnly.defaultValue, diff --git a/cmuxTests/SidebarWidthPolicyTests.swift b/cmuxTests/SidebarWidthPolicyTests.swift index 7bd2be46bc19..6275206a77c8 100644 --- a/cmuxTests/SidebarWidthPolicyTests.swift +++ b/cmuxTests/SidebarWidthPolicyTests.swift @@ -14,8 +14,8 @@ import XCTest final class SidebarWidthPolicyTests: XCTestCase { private let settingsFileBackupsDefaultsKey = "cmux.settingsFile.backups.v1" private let importedManagedDefaultsKey = "cmux.settingsFile.importedManagedDefaults.v1" - private let sidebarWorkspaceStatusStyleKey = SidebarCatalogSection().workspaceStatusStyle.userDefaultsKey - private let sidebarScrollEdgeFadeKey = SidebarCatalogSection().scrollEdgeFade.userDefaultsKey + private let sidebarWorkspaceStatusStyleKey = "sidebarWorkspaceStatusStyle" + private let sidebarScrollEdgeFadeKey = "sidebarScrollEdgeFade" func testDefaultMinimumSidebarWidthIsPersistedProductDefault() { let suiteName = "SidebarWidthPolicyTests.defaultMinimum.\(UUID().uuidString)" From 34a0bbb859b6c263201b4ece73cc1f7f22abc577 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 20:53:34 -0700 Subject: [PATCH 13/25] Separate sidebar status subtitles from provider metadata --- .../AttentionQueueSidebar.swift | 12 +++++--- .../SidebarExamples.swift | 2 ++ .../AttentionQueueSidebarTests.swift | 29 +++++++++++++++++-- .../Rows/CmuxSidebarProviderRow.swift | 4 +++ .../CmuxSidebarProviderRowSubtitleRole.swift | 7 +++++ .../ExtensionSidebarWorkspaceRowView.swift | 10 +++++-- 6 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Rows/CmuxSidebarProviderRowSubtitleRole.swift diff --git a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift index 3efa9a0f8642..d8d3ac814013 100644 --- a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift +++ b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift @@ -30,7 +30,7 @@ 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"), @@ -38,7 +38,7 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { projectRootPath: nil, workspaces: pinned ) - .render(subtitle: rowSubtitle), + .render(subtitle: rowSubtitle, subtitleRole: rowSubtitleRole), ExampleSidebarSection( id: "attention", title: localized("example.sidebar.group.needsAttention", "Needs Attention"), @@ -46,7 +46,7 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { projectRootPath: nil, workspaces: attention ) - .render(subtitle: rowSubtitle), + .render(subtitle: rowSubtitle, subtitleRole: rowSubtitleRole), ExampleSidebarSection( id: "quiet", title: localized("example.sidebar.group.quiet", "Quiet"), @@ -54,7 +54,7 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { projectRootPath: nil, workspaces: quiet ) - .render(subtitle: rowSubtitle), + .render(subtitle: rowSubtitle, subtitleRole: rowSubtitleRole), ] return renderModel(providerId: descriptor.id, snapshot: snapshot, sections: sections) @@ -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 + } + private func hasRemoteTarget(_ workspace: CmuxSidebarProviderWorkspace) -> Bool { trimmed(workspace.remoteDisplayTarget) != nil } diff --git a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/SidebarExamples.swift b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/SidebarExamples.swift index 8696bb331212..8384bad18fe5 100644 --- a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/SidebarExamples.swift +++ b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/SidebarExamples.swift @@ -25,6 +25,7 @@ struct ExampleSidebarSection { rowTitle: (CmuxSidebarProviderWorkspace) -> String = { $0.title }, accessory: CmuxSidebarProviderRowAccessory? = .inspector, subtitle: (CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderText? = { _ in nil }, + subtitleRole: (CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderRowSubtitleRole? = { _ in nil }, trailingText: (CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderText? = { _ in nil }, leadingIcon: (CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderIcon? = { _ in nil } ) -> CmuxSidebarProviderSection { @@ -46,6 +47,7 @@ struct ExampleSidebarSection { workspaceId: workspace.id, accessory: accessory, subtitle: subtitle(workspace), + subtitleRole: subtitleRole(workspace), trailingText: trailingText(workspace), leadingIcon: leadingIcon(workspace) ) diff --git a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift index 1033f12a0500..4e408cd9e75d 100644 --- a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift +++ b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift @@ -22,6 +22,7 @@ final class AttentionQueueSidebarTests: XCTestCase { 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")) + XCTAssertNil(quiet.rows.first?.subtitleRole) } func testRemoteDisconnectedWorkspaceNeedsAttention() throws { @@ -42,14 +43,38 @@ final class AttentionQueueSidebarTests: XCTestCase { 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(attention.rows.first?.subtitleRole) XCTAssertNil(model.sections.first { $0.id == "quiet" }) } + func testLatestNotificationSubtitleIsAgentStatus() 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 XCTUnwrap(model.sections.first { $0.id == "attention" }) + XCTAssertEqual(attention.rows.map(\.workspaceId), [waiting.id]) + XCTAssertEqual(attention.rows.first?.subtitle, .plain("Claude is waiting for your input")) + XCTAssertEqual(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(), @@ -62,7 +87,7 @@ final class AttentionQueueSidebarTests: XCTestCase { remoteDisplayTarget: remoteDisplayTarget, remoteConnectionState: remoteConnectionState, unreadCount: 0, - latestNotificationText: nil, + latestNotificationText: latestNotificationText, listeningPorts: [] ) } diff --git a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Rows/CmuxSidebarProviderRow.swift b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Rows/CmuxSidebarProviderRow.swift index 8a6502a5ff7d..f6ca1bd68149 100644 --- a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Rows/CmuxSidebarProviderRow.swift +++ b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Rows/CmuxSidebarProviderRow.swift @@ -12,6 +12,8 @@ public struct CmuxSidebarProviderRow: Identifiable, Codable, Equatable, Sendable public var accessory: CmuxSidebarProviderRowAccessory? /// Optional subtitle. public var subtitle: CmuxSidebarProviderText? + /// Optional semantic role for the subtitle. + public var subtitleRole: CmuxSidebarProviderRowSubtitleRole? /// Optional trailing text. public var trailingText: CmuxSidebarProviderText? /// Optional leading icon. @@ -24,6 +26,7 @@ public struct CmuxSidebarProviderRow: Identifiable, Codable, Equatable, Sendable workspaceId: UUID, accessory: CmuxSidebarProviderRowAccessory?, subtitle: CmuxSidebarProviderText? = nil, + subtitleRole: CmuxSidebarProviderRowSubtitleRole? = nil, trailingText: CmuxSidebarProviderText? = nil, leadingIcon: CmuxSidebarProviderIcon? = nil ) { @@ -32,6 +35,7 @@ public struct CmuxSidebarProviderRow: Identifiable, Codable, Equatable, Sendable self.workspaceId = workspaceId self.accessory = accessory self.subtitle = subtitle + self.subtitleRole = subtitleRole self.trailingText = trailingText self.leadingIcon = leadingIcon } diff --git a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Rows/CmuxSidebarProviderRowSubtitleRole.swift b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Rows/CmuxSidebarProviderRowSubtitleRole.swift new file mode 100644 index 000000000000..f367b6fffb27 --- /dev/null +++ b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Rows/CmuxSidebarProviderRowSubtitleRole.swift @@ -0,0 +1,7 @@ +import Foundation + +/// Semantic role for a provider row subtitle. +public enum CmuxSidebarProviderRowSubtitleRole: String, Codable, Equatable, Sendable { + /// Subtitle text is an agent status sentence that can be replaced by a compact status indicator. + case agentStatus +} diff --git a/Sources/ExtensionSidebarWorkspaceRowView.swift b/Sources/ExtensionSidebarWorkspaceRowView.swift index 39ff94086809..25b9a23082f6 100644 --- a/Sources/ExtensionSidebarWorkspaceRowView.swift +++ b/Sources/ExtensionSidebarWorkspaceRowView.swift @@ -49,7 +49,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { if workspaceStatusStyle == .dot, let workspaceAgentLifecycleState { let accessibilityLabel = agentStatusAccessibilityLabel( - subtitle: nil, + subtitle: hidesSubtitleInDotMode ? subtitle : nil, state: workspaceAgentLifecycleState ) Circle() @@ -60,7 +60,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { } } - if !isSuperCompact, let subtitle { + if !hidesSubtitleInDotMode, !isSuperCompact, let subtitle { Text(subtitle) .cmuxFont(size: secondarySize, weight: .regular) .foregroundColor(.secondary) @@ -131,8 +131,12 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { workspaceStatusStyle == .dot && workspaceAgentLifecycleState != nil } + private var hidesSubtitleInDotMode: Bool { + showsStatusDot && row.subtitleRole == .agentStatus + } + private var usesOneLineStatusDotLayout: Bool { - showsStatusDot && row.subtitle == nil + showsStatusDot && (row.subtitle == nil || hidesSubtitleInDotMode) } private var rowVerticalPadding: CGFloat { From 6f6b2a890b4dffda96ecff72a71eb13ec572155e Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 21:10:15 -0700 Subject: [PATCH 14/25] Address sidebar status review feedback --- .../AttentionQueueSidebarTests.swift | 43 +++++++------- .../Keys/SidebarCatalogSection.swift | 2 + .../AgentHibernationLifecycleState.swift | 8 --- Sources/CmuxSettingsJSONPathSupport.swift | 16 +++--- Sources/ContentView.swift | 2 +- ...utModifierHoldHintsSettingsFileTests.swift | 37 ++++++++++++ cmuxTests/SidebarWidthPolicyTests.swift | 56 ------------------- .../WorkspaceSidebarObservationTests.swift | 40 ++++++------- 8 files changed, 93 insertions(+), 111 deletions(-) diff --git a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift index 4e408cd9e75d..ca0573aa6b32 100644 --- a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift +++ b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift @@ -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", @@ -18,14 +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")) - XCTAssertNil(quiet.rows.first?.subtitleRole) + #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", @@ -40,14 +44,15 @@ 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(attention.rows.first?.subtitleRole) - 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) } - func testLatestNotificationSubtitleIsAgentStatus() throws { + @Test + func latestNotificationSubtitleIsAgentStatus() throws { let waiting = workspace( title: "Waiting", customDescription: "Agent workspace", @@ -63,10 +68,10 @@ 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), [waiting.id]) - XCTAssertEqual(attention.rows.first?.subtitle, .plain("Claude is waiting for your input")) - XCTAssertEqual(attention.rows.first?.subtitleRole, .agentStatus) + 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( diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/SidebarCatalogSection.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/SidebarCatalogSection.swift index 907617f3afe5..02826fa5fa88 100644 --- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/SidebarCatalogSection.swift +++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/SidebarCatalogSection.swift @@ -21,12 +21,14 @@ public struct SidebarCatalogSection: SettingCatalogSection { userDefaultsKey: "sidebarShowWorkspaceDescription" ) + /// Stores how agent status subtitles are presented in workspace rows. public let workspaceStatusStyle = DefaultsKey( id: "sidebar.workspaceStatusStyle", defaultValue: .sentence, userDefaultsKey: "sidebarWorkspaceStatusStyle" ) + /// Stores how strongly the sidebar workspace list fades at scroll edges. public let scrollEdgeFade = DefaultsKey( id: "sidebar.scrollEdgeFade", defaultValue: .full, diff --git a/Sources/AgentHibernation/AgentHibernationLifecycleState.swift b/Sources/AgentHibernation/AgentHibernationLifecycleState.swift index ad47c0030416..6f5825dbb9ab 100644 --- a/Sources/AgentHibernation/AgentHibernationLifecycleState.swift +++ b/Sources/AgentHibernation/AgentHibernationLifecycleState.swift @@ -24,14 +24,6 @@ enum AgentHibernationLifecycleState: String, Codable, Sendable, Equatable, CaseI return fallback ?? .unknown } - static func dominantForStatusIndicator(in states: [Self], fallback: Self?) -> Self { - if states.contains(.needsInput) { return .needsInput } - if states.contains(.running) { return .running } - if states.contains(.unknown) { return .unknown } - if states.contains(.idle) { return .idle } - return fallback ?? .unknown - } - func encode(to encoder: Encoder) throws { var container = encoder.singleValueContainer() try container.encode(rawValue) diff --git a/Sources/CmuxSettingsJSONPathSupport.swift b/Sources/CmuxSettingsJSONPathSupport.swift index 302c4c4e1fdd..d42cd6e72dc6 100644 --- a/Sources/CmuxSettingsJSONPathSupport.swift +++ b/Sources/CmuxSettingsJSONPathSupport.swift @@ -81,6 +81,13 @@ struct SettingsFileStringMapping { let defaultsKey: String } +struct SettingsFileStringEnumMapping { + let jsonKey: String + let defaultsKey: String + let acceptedValues: Set + let invalidPath: String +} + struct SettingsFileStringArrayMapping { let jsonKey: String let defaultsKey: String @@ -180,13 +187,6 @@ enum SidebarSettingsFileMapping { let defaultsKey: String } - struct StringEnumSetting { - let jsonKey: String - let defaultsKey: String - let acceptedValues: Set - let invalidPath: String - } - static let booleanSettings: [BooleanSetting] = [ .init( jsonKey: "hideAllDetails", @@ -249,7 +249,7 @@ enum SidebarSettingsFileMapping { ), ] - static let stringEnumSettings: [StringEnumSetting] = [ + static let stringEnumSettings: [SettingsFileStringEnumMapping] = [ .init( jsonKey: "workspaceStatusStyle", defaultsKey: sidebarCatalog.workspaceStatusStyle.userDefaultsKey, diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index 950a319006ab..f88cbab16540 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -11718,7 +11718,7 @@ struct VerticalTabsSidebar: View { private func extensionSidebarAgentLifecycleState(for workspace: Workspace) -> AgentHibernationLifecycleState? { let states = workspace.agentLifecycleStatesByPanelId.values.flatMap { Array($0.values) } guard !states.isEmpty else { return nil } - return AgentHibernationLifecycleState.dominantForStatusIndicator(in: states, fallback: .unknown) + return AgentHibernationLifecycleState.dominantForHibernation(in: states, fallback: .unknown) } private func extensionBrowserStackIcon( diff --git a/cmuxTests/KeyboardShortcutModifierHoldHintsSettingsFileTests.swift b/cmuxTests/KeyboardShortcutModifierHoldHintsSettingsFileTests.swift index 7f6e2bbebcbe..b4ca2379207a 100644 --- a/cmuxTests/KeyboardShortcutModifierHoldHintsSettingsFileTests.swift +++ b/cmuxTests/KeyboardShortcutModifierHoldHintsSettingsFileTests.swift @@ -12,6 +12,8 @@ import Testing struct KeyboardShortcutModifierHoldHintsSettingsFileTests { private let settingsFileBackupsDefaultsKey = "cmux.settingsFile.backups.v1" private let importedManagedDefaultsKey = "cmux.settingsFile.importedManagedDefaults.v1" + private let sidebarWorkspaceStatusStyleKey = "sidebarWorkspaceStatusStyle" + private let sidebarScrollEdgeFadeKey = "sidebarScrollEdgeFade" @Test func settingsFileStoreAppliesShowModifierHoldHintsSetting() throws { @@ -44,6 +46,41 @@ struct KeyboardShortcutModifierHoldHintsSettingsFileTests { } } + @Test + func settingsFileStoreAppliesSidebarStatusAndScrimSettings() throws { + let defaults = UserDefaults.standard + let managedKeys = [ + sidebarWorkspaceStatusStyleKey, + sidebarScrollEdgeFadeKey, + settingsFileBackupsDefaultsKey, + importedManagedDefaultsKey, + ] + try preservingDefaults(keys: managedKeys) { + let directoryURL = try makeTemporaryDirectory() + defer { try? FileManager.default.removeItem(at: directoryURL) } + + let settingsFileURL = directoryURL.appendingPathComponent("cmux.json", isDirectory: false) + try """ + { + "sidebar": { + "workspaceStatusStyle": "dot", + "scrollEdgeFade": "off" + } + } + """.write(to: settingsFileURL, atomically: true, encoding: .utf8) + + _ = KeyboardShortcutSettingsFileStore( + primaryPath: settingsFileURL.path, + fallbackPath: nil, + additionalFallbackPaths: [], + startWatching: false + ) + + #expect(defaults.string(forKey: sidebarWorkspaceStatusStyleKey) == "dot") + #expect(defaults.string(forKey: sidebarScrollEdgeFadeKey) == "off") + } + } + @Test @MainActor func focusControllerSeedsBonsplitHintEligibilityFromDisabledSetting() throws { let defaults = UserDefaults.standard diff --git a/cmuxTests/SidebarWidthPolicyTests.swift b/cmuxTests/SidebarWidthPolicyTests.swift index 6275206a77c8..6db2d6a2bb5b 100644 --- a/cmuxTests/SidebarWidthPolicyTests.swift +++ b/cmuxTests/SidebarWidthPolicyTests.swift @@ -1,7 +1,6 @@ import AppKit import CmuxAppKitSupportUI import CmuxFoundation -import CmuxSettings import SwiftUI import XCTest @@ -14,8 +13,6 @@ import XCTest final class SidebarWidthPolicyTests: XCTestCase { private let settingsFileBackupsDefaultsKey = "cmux.settingsFile.backups.v1" private let importedManagedDefaultsKey = "cmux.settingsFile.importedManagedDefaults.v1" - private let sidebarWorkspaceStatusStyleKey = "sidebarWorkspaceStatusStyle" - private let sidebarScrollEdgeFadeKey = "sidebarScrollEdgeFade" func testDefaultMinimumSidebarWidthIsPersistedProductDefault() { let suiteName = "SidebarWidthPolicyTests.defaultMinimum.\(UUID().uuidString)" @@ -257,59 +254,6 @@ final class SidebarWidthPolicyTests: XCTestCase { ) } - func testSettingsFileStoreAppliesSidebarStatusAndScrimSettings() throws { - let defaults = UserDefaults.standard - let managedKeys = [ - sidebarWorkspaceStatusStyleKey, - sidebarScrollEdgeFadeKey, - settingsFileBackupsDefaultsKey, - importedManagedDefaultsKey, - ] - let previousValues = managedKeys.reduce(into: [String: Any]()) { values, key in - values[key] = defaults.object(forKey: key) - } - defer { - for key in managedKeys { - if let value = previousValues[key] { - defaults.set(value, forKey: key) - } else { - defaults.removeObject(forKey: key) - } - } - } - - for key in managedKeys { - defaults.removeObject(forKey: key) - } - - let directoryURL = FileManager.default.temporaryDirectory.appendingPathComponent( - "sidebar-status-scrim-settings-\(UUID().uuidString)", - isDirectory: true - ) - try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true) - defer { try? FileManager.default.removeItem(at: directoryURL) } - - let settingsFileURL = directoryURL.appendingPathComponent("cmux.json", isDirectory: false) - try """ - { - "sidebar": { - "workspaceStatusStyle": "dot", - "scrollEdgeFade": "off" - } - } - """.write(to: settingsFileURL, atomically: true, encoding: .utf8) - - _ = KeyboardShortcutSettingsFileStore( - primaryPath: settingsFileURL.path, - fallbackPath: nil, - additionalFallbackPaths: [], - startWatching: false - ) - - XCTAssertEqual(defaults.string(forKey: sidebarWorkspaceStatusStyleKey), "dot") - XCTAssertEqual(defaults.string(forKey: sidebarScrollEdgeFadeKey), "off") - } - func testLeadingSidebarResizeRangeFavorsSidebarSide() { let range = SidebarResizeInteraction.Edge.leading.hitRange(dividerX: 200) diff --git a/cmuxTests/WorkspaceSidebarObservationTests.swift b/cmuxTests/WorkspaceSidebarObservationTests.swift index d814038f2310..f89ae33ace1c 100644 --- a/cmuxTests/WorkspaceSidebarObservationTests.swift +++ b/cmuxTests/WorkspaceSidebarObservationTests.swift @@ -1,5 +1,6 @@ +import Combine import Foundation -import XCTest +import Testing import CmuxSidebar @@ -10,8 +11,10 @@ import CmuxSidebar #endif @MainActor -final class WorkspaceSidebarObservationTests: XCTestCase { - func testSidebarObservationPublisherEmitsForLateStatusSubscriber() { +@Suite("Workspace sidebar observation", .serialized) +struct WorkspaceSidebarObservationTests { + @Test + func sidebarObservationPublisherEmitsForLateStatusSubscriber() { let workspace = Workspace() workspace.statusEntries["test_probe"] = SidebarStatusEntry( key: "test_probe", @@ -27,14 +30,14 @@ final class WorkspaceSidebarObservationTests: XCTestCase { } defer { cancellable.cancel() } - XCTAssertGreaterThan( - publishCount, - 0, + #expect( + publishCount > 0, "A sidebar row that subscribes after status metadata already exists must still refresh from the current workspace state." ) } - func testSidebarImmediateObservationPublisherEmitsForLateTitleSubscriber() { + @Test + func sidebarImmediateObservationPublisherEmitsForLateTitleSubscriber() { let workspace = Workspace() workspace.title = "Restored Workspace" @@ -44,14 +47,14 @@ final class WorkspaceSidebarObservationTests: XCTestCase { } defer { cancellable.cancel() } - XCTAssertGreaterThan( - publishCount, - 0, + #expect( + publishCount > 0, "A sidebar row that subscribes after immediate workspace fields already exist must still refresh from the current workspace state." ) } - func testSidebarObservationPublisherIgnoresRemoteHeartbeatOnlyChanges() { + @Test + func sidebarObservationPublisherIgnoresRemoteHeartbeatOnlyChanges() { let workspace = Workspace() var publishCount = 0 @@ -64,16 +67,16 @@ final class WorkspaceSidebarObservationTests: XCTestCase { workspace.remoteHeartbeatCount = 1 workspace.remoteLastHeartbeatAt = Date() - XCTAssertEqual( - publishCount, - 0, + #expect( + publishCount == 0, "Expected non-visible remote heartbeat updates to avoid invalidating sidebar rows" ) } - func testSidebarObservationPublisherEmitsForAgentLifecycleOnlyChange() throws { + @Test + func sidebarObservationPublisherEmitsForAgentLifecycleOnlyChange() throws { let workspace = Workspace() - let panelId = try XCTUnwrap(workspace.focusedPanelId) + let panelId = try #require(workspace.focusedPanelId) var publishCount = 0 let cancellable = workspace.sidebarObservationPublisher.sink { @@ -84,9 +87,8 @@ final class WorkspaceSidebarObservationTests: XCTestCase { workspace.setAgentLifecycle(key: "codex", panelId: panelId, lifecycle: .needsInput) - XCTAssertGreaterThan( - publishCount, - 0, + #expect( + publishCount > 0, "Agent lifecycle changes must refresh extension sidebar status dots even when no visible metadata text changes" ) } From 8af7bef17155944d7740274897b2edab59f52047 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 21:18:46 -0700 Subject: [PATCH 15/25] Prioritize needs-input sidebar status dots --- .../AgentHibernationLifecycleState.swift | 10 ++++++++++ Sources/ContentView.swift | 2 +- cmuxTests/WorkspaceSidebarObservationTests.swift | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Sources/AgentHibernation/AgentHibernationLifecycleState.swift b/Sources/AgentHibernation/AgentHibernationLifecycleState.swift index 6f5825dbb9ab..889ebc77698a 100644 --- a/Sources/AgentHibernation/AgentHibernationLifecycleState.swift +++ b/Sources/AgentHibernation/AgentHibernationLifecycleState.swift @@ -24,6 +24,16 @@ enum AgentHibernationLifecycleState: String, Codable, Sendable, Equatable, CaseI return fallback ?? .unknown } + static func dominantForStatusIndicator(in states: [Self], fallback: Self?) -> Self { + // The sidebar dot is an attention signal: a waiting agent should stay visible + // even if another panel in the same workspace is still running. + if states.contains(.needsInput) { return .needsInput } + if states.contains(.running) { return .running } + if states.contains(.unknown) { return .unknown } + if states.contains(.idle) { return .idle } + return fallback ?? .unknown + } + func encode(to encoder: Encoder) throws { var container = encoder.singleValueContainer() try container.encode(rawValue) diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index f88cbab16540..950a319006ab 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -11718,7 +11718,7 @@ struct VerticalTabsSidebar: View { private func extensionSidebarAgentLifecycleState(for workspace: Workspace) -> AgentHibernationLifecycleState? { let states = workspace.agentLifecycleStatesByPanelId.values.flatMap { Array($0.values) } guard !states.isEmpty else { return nil } - return AgentHibernationLifecycleState.dominantForHibernation(in: states, fallback: .unknown) + return AgentHibernationLifecycleState.dominantForStatusIndicator(in: states, fallback: .unknown) } private func extensionBrowserStackIcon( diff --git a/cmuxTests/WorkspaceSidebarObservationTests.swift b/cmuxTests/WorkspaceSidebarObservationTests.swift index f89ae33ace1c..3f3983e57930 100644 --- a/cmuxTests/WorkspaceSidebarObservationTests.swift +++ b/cmuxTests/WorkspaceSidebarObservationTests.swift @@ -92,4 +92,14 @@ struct WorkspaceSidebarObservationTests { "Agent lifecycle changes must refresh extension sidebar status dots even when no visible metadata text changes" ) } + + @Test + func sidebarStatusIndicatorPrioritizesNeedsInputOverRunning() { + #expect( + AgentHibernationLifecycleState.dominantForStatusIndicator( + in: [.running, .needsInput], + fallback: .unknown + ) == .needsInput + ) + } } From 55291c854dfd752b987cad148208dbc74dd551e7 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 21:25:25 -0700 Subject: [PATCH 16/25] Keep generic sidebar notifications visible --- .../AttentionQueueSidebar.swift | 15 +++++++++++- .../AttentionQueueSidebarTests.swift | 23 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift index d8d3ac814013..6ce00c63c6fc 100644 --- a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift +++ b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift @@ -83,7 +83,20 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { } private func rowSubtitleRole(_ workspace: CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderRowSubtitleRole? { - trimmed(workspace.latestNotificationText) == nil ? nil : .agentStatus + guard let notification = trimmed(workspace.latestNotificationText), + Self.isAgentStatusNotification(notification) else { + return nil + } + return .agentStatus + } + + private static func isAgentStatusNotification(_ text: String) -> Bool { + let normalized = text.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + return normalized == "waiting for input" + || normalized == "needs input" + || normalized.hasSuffix(" needs input") + || normalized.hasSuffix(" needs your input") + || normalized.hasSuffix(" is waiting for your input") } private func hasRemoteTarget(_ workspace: CmuxSidebarProviderWorkspace) -> Bool { diff --git a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift index ca0573aa6b32..49470689e871 100644 --- a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift +++ b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift @@ -74,6 +74,29 @@ struct AttentionQueueSidebarTests { #expect(attention.rows.first?.subtitleRole == .agentStatus) } + @Test + func genericNotificationSubtitleKeepsProviderRole() throws { + let notified = workspace( + title: "Build", + customDescription: "CI workspace", + remoteDisplayTarget: nil, + remoteConnectionState: nil, + latestNotificationText: "Build failed in deploy step" + ) + let snapshot = CmuxSidebarProviderSnapshot( + sequence: 1, + selectedWorkspaceId: nil, + workspaces: [notified] + ) + + let model = AttentionQueueSidebar().render(snapshot: snapshot) + + let attention = try #require(model.sections.first { $0.id == "attention" }) + #expect(attention.rows.map(\.workspaceId) == [notified.id]) + #expect(attention.rows.first?.subtitle == .plain("Build failed in deploy step")) + #expect(attention.rows.first?.subtitleRole == nil) + } + private func workspace( title: String, customDescription: String?, From e7a4735f8e20be95cdeb5c6a04895b28d08462d1 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 21:34:28 -0700 Subject: [PATCH 17/25] Keep status dot accessibility current --- Sources/ExtensionSidebarWorkspaceRowView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/ExtensionSidebarWorkspaceRowView.swift b/Sources/ExtensionSidebarWorkspaceRowView.swift index 25b9a23082f6..4734f733a40a 100644 --- a/Sources/ExtensionSidebarWorkspaceRowView.swift +++ b/Sources/ExtensionSidebarWorkspaceRowView.swift @@ -166,7 +166,7 @@ struct CmuxExtensionSidebarWorkspaceRowView: View, Equatable { subtitle: String?, state: AgentHibernationLifecycleState ) -> String? { - if let subtitle { return subtitle } + if state == .needsInput, let subtitle { return subtitle } switch state { case .needsInput: return String(localized: "feed.status.needsInput", defaultValue: "Needs input") From f1eeda0ca6d9b2b5eaa2fb18c92d01a499c46cdd Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Wed, 24 Jun 2026 22:46:57 -0700 Subject: [PATCH 18/25] Keep sidebar enum mapping local --- Sources/CmuxSettingsJSONPathSupport.swift | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Sources/CmuxSettingsJSONPathSupport.swift b/Sources/CmuxSettingsJSONPathSupport.swift index d42cd6e72dc6..5fffba45ffbc 100644 --- a/Sources/CmuxSettingsJSONPathSupport.swift +++ b/Sources/CmuxSettingsJSONPathSupport.swift @@ -81,13 +81,6 @@ struct SettingsFileStringMapping { let defaultsKey: String } -struct SettingsFileStringEnumMapping { - let jsonKey: String - let defaultsKey: String - let acceptedValues: Set - let invalidPath: String -} - struct SettingsFileStringArrayMapping { let jsonKey: String let defaultsKey: String @@ -249,14 +242,19 @@ enum SidebarSettingsFileMapping { ), ] - static let stringEnumSettings: [SettingsFileStringEnumMapping] = [ - .init( + static let stringEnumSettings: [( + jsonKey: String, + defaultsKey: String, + acceptedValues: Set, + invalidPath: String + )] = [ + ( jsonKey: "workspaceStatusStyle", defaultsKey: sidebarCatalog.workspaceStatusStyle.userDefaultsKey, acceptedValues: Set(SidebarWorkspaceStatusStyle.allCases.map(\.rawValue)), invalidPath: "sidebar.workspaceStatusStyle" ), - .init( + ( jsonKey: "scrollEdgeFade", defaultsKey: sidebarCatalog.scrollEdgeFade.userDefaultsKey, acceptedValues: Set(SidebarScrollEdgeFadeStyle.allCases.map(\.rawValue)), From b885540ee25664841ca126522bd47e21ac99ed70 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Thu, 25 Jun 2026 21:12:03 -0700 Subject: [PATCH 19/25] Surface status dot setting in Settings --- .../CuratedSettingEntry+Default.swift | 2 +- .../Sections/SidebarSection.swift | 22 +++++++++++-------- .../SidebarWorkspaceStatusStyle+Display.swift | 4 ++-- Resources/Localizable.xcstrings | 16 +++++++------- Sources/SettingsNavigation.swift | 2 +- Sources/SettingsSearchAliases.swift | 2 +- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift index 4a6a15ed8c22..7eb81e6c042a 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift @@ -122,7 +122,7 @@ 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: "workspace-status-style", title: String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Compact Agent Status Dots"), synonyms: "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence 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"), diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift index 84320faf367e..a781b7879c9e 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift @@ -121,6 +121,13 @@ public struct SidebarSection: View { rightMaxWidth.current.isFinite && rightMaxWidth.current > 0 } + private var workspaceStatusDotsBinding: Binding { + Binding( + get: { workspaceStatusStyle.current == .dot }, + set: { workspaceStatusStyle.set($0 ? .dot : .sentence) } + ) + } + private var rightMaxWidthOverrideBinding: Binding { Binding( get: { rightMaxWidthOverrideEnabled }, @@ -233,17 +240,14 @@ public struct SidebarSection: View { SettingsCardRow( configurationReview: .json("sidebar.workspaceStatusStyle"), - String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Workspace Status Style"), - subtitle: workspaceStatusStyle.current.rowDescription, - controlWidth: 150 + String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Compact Agent Status Dots"), + subtitle: workspaceStatusStyle.current.rowDescription ) { - Picker("", selection: Binding(get: { workspaceStatusStyle.current }, set: { workspaceStatusStyle.set($0) })) { - ForEach(SidebarWorkspaceStatusStyle.allCases, id: \.self) { style in - Text(style.displayName).tag(style) - } - } + Toggle("", isOn: workspaceStatusDotsBinding) .labelsHidden() - .pickerStyle(.menu) + .toggleStyle(.switch) + .controlSize(.small) + .accessibilityLabel(String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Compact Agent Status Dots")) } SettingsCardDivider() diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift index c3f4e4a8527c..22ea666130ca 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Values/SidebarWorkspaceStatusStyle+Display.swift @@ -15,9 +15,9 @@ extension SidebarWorkspaceStatusStyle { var rowDescription: String { switch self { case .sentence: - return String(localized: "sidebarWorkspaceStatusStyle.sentence.description", defaultValue: "Agent status appears as a subtitle under each workspace title.") + return String(localized: "sidebarWorkspaceStatusStyle.sentence.description", defaultValue: "Show agent status as subtitle text under each workspace title.") case .dot: - return String(localized: "sidebarWorkspaceStatusStyle.dot.description", defaultValue: "Agent status appears as a colored dot beside each workspace title.") + return String(localized: "sidebarWorkspaceStatusStyle.dot.description", defaultValue: "Show agent status as a colored dot beside the title. Provider subtitles stay visible.") } } } diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings index 785c8e05ae4b..7f68f469adc1 100644 --- a/Resources/Localizable.xcstrings +++ b/Resources/Localizable.xcstrings @@ -205120,13 +205120,13 @@ "en": { "stringUnit": { "state": "translated", - "value": "sidebar.workspaceStatusStyle agent status subtitle sentence dot one line compact waiting input running idle" + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle" } }, "ja": { "stringUnit": { "state": "translated", - "value": "sidebar.workspaceStatusStyle agent status subtitle sentence dot one line compact waiting input running idle エージェント 状態 サブタイトル 文章 ドット 1行 コンパクト 待機 入力 実行中 アイドル" + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle エージェント 状態 ドット コンパクト サブタイトル 文章 1行 待機 入力 実行中 アイドル" } } } @@ -205154,13 +205154,13 @@ "en": { "stringUnit": { "state": "translated", - "value": "Workspace Status Style" + "value": "Compact Agent Status Dots" } }, "ja": { "stringUnit": { "state": "translated", - "value": "ワークスペース状態の表示形式" + "value": "コンパクトなエージェント状態ドット" } } } @@ -205273,13 +205273,13 @@ "en": { "stringUnit": { "state": "translated", - "value": "Agent status appears as a colored dot beside each workspace title." + "value": "Show agent status as a colored dot beside the title. Provider subtitles stay visible." } }, "ja": { "stringUnit": { "state": "translated", - "value": "エージェントの状態を各ワークスペースタイトルの横に色付きドットで表示します。" + "value": "エージェントの状態をタイトル横の色付きドットで表示します。プロバイダーのサブタイトルは表示したままにします。" } } } @@ -205307,13 +205307,13 @@ "en": { "stringUnit": { "state": "translated", - "value": "Agent status appears as a subtitle under each workspace title." + "value": "Show agent status as subtitle text under each workspace title." } }, "ja": { "stringUnit": { "state": "translated", - "value": "エージェントの状態を各ワークスペースタイトルの下のサブタイトルとして表示します。" + "value": "エージェントの状態を各ワークスペースタイトル下のサブタイトル文として表示します。" } } } diff --git a/Sources/SettingsNavigation.swift b/Sources/SettingsNavigation.swift index 93afb2827972..36fde929e1f5 100644 --- a/Sources/SettingsNavigation.swift +++ b/Sources/SettingsNavigation.swift @@ -379,7 +379,7 @@ enum SettingsSearchIndex { setting(.sidebarAppearance, "hide-sidebar-details", String(localized: "settings.app.hideAllSidebarDetails", defaultValue: "Hide All Sidebar Details"), "workspace sidebar compact"), setting(.sidebarAppearance, "wrap-workspace-titles", String(localized: "settings.app.wrapWorkspaceTitles", defaultValue: "Wrap Workspace Titles in Sidebar"), "workspace title wrap multiline pr pull request"), setting(.sidebarAppearance, "show-workspace-description", String(localized: "settings.app.showWorkspaceDescription", defaultValue: "Show Workspace Description in Sidebar"), "workspace description notes markdown"), - setting(.sidebarAppearance, "workspace-status-style", String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Workspace Status Style"), "sidebar.workspaceStatusStyle agent status subtitle sentence dot compact one line tab row"), + setting(.sidebarAppearance, "workspace-status-style", String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Compact Agent Status Dots"), "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line tab row"), setting(.sidebarAppearance, "scroll-edge-fade", String(localized: "settings.sidebar.scrollEdgeFade", defaultValue: "Tab List Edge Fade"), "sidebar.scrollEdgeFade sidebar tab list fade shadow scrim edge top bottom off subtle"), setting(.sidebarAppearance, "sidebar-branch-layout", String(localized: "settings.app.sidebarBranchLayout", defaultValue: "Sidebar Branch Layout"), "branch directory vertical inline"), setting(.sidebarAppearance, "stack-branch-directory", String(localized: "settings.app.stackBranchDirectory", defaultValue: "Stack Branch and Directory"), "branch directory cwd path stack two rows separate lines"), diff --git a/Sources/SettingsSearchAliases.swift b/Sources/SettingsSearchAliases.swift index 40046b105c2e..1ac003901a57 100644 --- a/Sources/SettingsSearchAliases.swift +++ b/Sources/SettingsSearchAliases.swift @@ -104,7 +104,7 @@ enum SettingsSearchAliasIndex { "sidebarAppearance:hide-sidebar-details": localized("settings.search.alias.setting.app.hide-sidebar-details", defaultValue: "sidebar.hideAllDetails compact sidebar hide details only title minimal left rail"), "sidebarAppearance:wrap-workspace-titles": localized("settings.search.alias.setting.app.wrap-workspace-titles", defaultValue: "sidebar.wrapWorkspaceTitles workspace title wrap multiline pr pull request"), "sidebarAppearance:show-workspace-description": localized("settings.search.alias.setting.app.show-workspace-description", defaultValue: "sidebar.showWorkspaceDescription workspace description notes markdown sidebar"), - "sidebarAppearance:workspace-status-style": localized("settings.search.alias.setting.sidebarAppearance.workspace-status-style", defaultValue: "sidebar.workspaceStatusStyle agent status subtitle sentence dot compact one line tab row"), + "sidebarAppearance:workspace-status-style": localized("settings.search.alias.setting.sidebarAppearance.workspace-status-style", defaultValue: "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line tab row"), "sidebarAppearance:scroll-edge-fade": localized("settings.search.alias.setting.sidebarAppearance.scroll-edge-fade", defaultValue: "sidebar.scrollEdgeFade sidebar tab list fade shadow scrim edge top bottom off subtle"), "sidebarAppearance:sidebar-branch-layout": localized("settings.search.alias.setting.app.sidebar-branch-layout", defaultValue: "sidebar.branchLayout git branch layout vertical inline cwd directory"), "sidebarAppearance:stack-branch-directory": localized("settings.search.alias.setting.app.stack-branch-directory", defaultValue: "sidebar.stackBranchDirectory git branch directory cwd path stack stacked separate lines two rows"), From 702a45a02058405abd5493a342501343f0eed3c9 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Thu, 25 Jun 2026 21:30:20 -0700 Subject: [PATCH 20/25] Localize status dot setting across app locales --- Resources/Localizable.xcstrings | 432 ++++++++++++++++++++++++++++++++ 1 file changed, 432 insertions(+) diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings index 7f68f469adc1..48c0e3f415a3 100644 --- a/Resources/Localizable.xcstrings +++ b/Resources/Localizable.xcstrings @@ -205117,17 +205117,125 @@ "settings.search.alias.setting.sidebarAppearance.workspace-status-style": { "extractionState": "manual", "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle الشريط الجانبي حالة الوكيل نقاط مدمجة عنوان فرعي جملة سطر واحد انتظار إدخال قيد التشغيل خامل" + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle bočna traka status agenta tačke kompaktno podnaslov rečenica jedan red čekanje unos pokrenuto neaktivno" + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle sidepanel agentstatus prikker kompakt undertekst sætning én linje venter input kører inaktiv" + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle Seitenleiste Agentenstatus Punkte kompakt Untertitel Satz eine Zeile wartet Eingabe läuft inaktiv" + } + }, "en": { "stringUnit": { "state": "translated", "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle" } }, + "es": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle barra lateral estado del agente puntos compacto subtítulo frase una línea esperando entrada ejecutando inactivo" + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle barre latérale état agent pastilles compact sous-titre phrase une ligne attente saisie exécution inactif" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle barra laterale stato agente punti compatto sottotitolo frase una riga attesa input in esecuzione inattivo" + } + }, "ja": { "stringUnit": { "state": "translated", "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle エージェント 状態 ドット コンパクト サブタイトル 文章 1行 待機 入力 実行中 アイドル" } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle របារចំហៀង ស្ថានភាព ភ្នាក់ងារ ចំណុច បង្រួម ចំណងជើងរង ប្រយោគ មួយបន្ទាត់ រង់ចាំ បញ្ចូល កំពុងដំណើរការ ទំនេរ" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle 사이드바 에이전트 상태 점 간결함 부제목 문장 한 줄 대기 입력 실행 중 유휴" + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle sidefelt agentstatus prikker kompakt undertekst setning én linje venter inndata kjører inaktiv" + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle pasek boczny stan agenta kropki kompakt podtytuł zdanie jeden wiersz oczekiwanie wejście działa bezczynny" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle barra lateral status do agente pontos compacto subtítulo frase uma linha aguardando entrada executando ocioso" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle боковая панель статус агента точки компактно подзаголовок предложение одна строка ожидание ввод выполняется простаивает" + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle แถบด้านข้าง สถานะเอเจนต์ จุด กะทัดรัด คำบรรยาย ประโยค บรรทัดเดียว รอ อินพุต กำลังทำงาน ว่าง" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle kenar çubuğu ajan durumu noktalar kompakt alt başlık cümle tek satır bekleme giriş çalışıyor boşta" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle бічна панель стан агента точки компактно підзаголовок речення один рядок очікування ввід виконується неактивний" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle 侧边栏 代理 状态 圆点 紧凑 副标题 句子 单行 等待 输入 运行中 空闲" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "sidebar.workspaceStatusStyle agent status dots compact subtitle sentence one line waiting input running idle 側邊欄 代理 狀態 圓點 精簡 副標題 句子 單行 等待 輸入 執行中 閒置" + } } } }, @@ -205151,17 +205259,125 @@ "settings.sidebar.workspaceStatusStyle": { "extractionState": "manual", "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "نقاط حالة الوكيل المدمجة" + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Kompaktne tačke statusa agenta" + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Kompakte agentstatusprikker" + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Kompakte Agentenstatuspunkte" + } + }, "en": { "stringUnit": { "state": "translated", "value": "Compact Agent Status Dots" } }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Puntos compactos de estado del agente" + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Pastilles compactes d’état de l’agent" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Punti compatti di stato agente" + } + }, "ja": { "stringUnit": { "state": "translated", "value": "コンパクトなエージェント状態ドット" } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "ចំណុចស្ថានភាពភ្នាក់ងារបង្រួម" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "간결한 에이전트 상태 점" + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Kompakte agentstatusprikker" + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Kompaktowe kropki stanu agenta" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Pontos compactos de status do agente" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Компактные точки статуса агента" + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "จุดสถานะเอเจนต์แบบกะทัดรัด" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Kompakt ajan durumu noktaları" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Компактні точки стану агента" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "紧凑代理状态圆点" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "精簡代理狀態圓點" + } } } }, @@ -205270,17 +205486,125 @@ "sidebarWorkspaceStatusStyle.dot.description": { "extractionState": "manual", "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "اعرض حالة الوكيل كنقطة ملونة بجانب العنوان. تبقى عناوين المزوّد الفرعية مرئية." + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Prikaži status agenta kao obojenu tačku pored naslova. Podnaslovi pružatelja ostaju vidljivi." + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Vis agentstatus som en farvet prik ved siden af titlen. Udbyderundertekster forbliver synlige." + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Agentenstatus als farbigen Punkt neben dem Titel anzeigen. Anbieter-Untertitel bleiben sichtbar." + } + }, "en": { "stringUnit": { "state": "translated", "value": "Show agent status as a colored dot beside the title. Provider subtitles stay visible." } }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Muestra el estado del agente como un punto de color junto al título. Los subtítulos del proveedor permanecen visibles." + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Afficher l’état de l’agent comme une pastille colorée à côté du titre. Les sous-titres du fournisseur restent visibles." + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Mostra lo stato dell’agente come un punto colorato accanto al titolo. I sottotitoli del provider restano visibili." + } + }, "ja": { "stringUnit": { "state": "translated", "value": "エージェントの状態をタイトル横の色付きドットで表示します。プロバイダーのサブタイトルは表示したままにします。" } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "បង្ហាញស្ថានភាពភ្នាក់ងារជាចំណុចពណ៌នៅក្បែរចំណងជើង។ ចំណងជើងរងរបស់អ្នកផ្តល់នៅតែបង្ហាញ។" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "제목 옆에 색상 점으로 에이전트 상태를 표시합니다. 제공자 부제목은 계속 표시됩니다." + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Vis agentstatus som en farget prikk ved siden av tittelen. Leverandørundertekster forblir synlige." + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Pokaż stan agenta jako kolorową kropkę obok tytułu. Podtytuły dostawcy pozostają widoczne." + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Mostra o status do agente como um ponto colorido ao lado do título. Os subtítulos do provedor continuam visíveis." + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Показывать статус агента цветной точкой рядом с названием. Подзаголовки поставщика остаются видимыми." + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "แสดงสถานะเอเจนต์เป็นจุดสีข้างชื่อเรื่อง คำบรรยายของผู้ให้บริการยังคงแสดงอยู่" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Ajan durumunu başlığın yanında renkli bir nokta olarak göster. Sağlayıcı alt başlıkları görünür kalır." + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Показувати стан агента кольоровою точкою поруч із назвою. Підзаголовки постачальника залишаються видимими." + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "在标题旁以彩色圆点显示代理状态。提供方副标题仍会显示。" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "在標題旁以彩色圓點顯示代理狀態。提供者副標題仍會顯示。" + } } } }, @@ -205304,17 +205628,125 @@ "sidebarWorkspaceStatusStyle.sentence.description": { "extractionState": "manual", "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "اعرض حالة الوكيل كنص عنوان فرعي أسفل عنوان كل مساحة عمل." + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Prikaži status agenta kao tekst podnaslova ispod naslova svakog radnog prostora." + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Vis agentstatus som undertekst under hver arbejdsområdetitel." + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Agentenstatus als Untertitel unter jedem Workspace-Titel anzeigen." + } + }, "en": { "stringUnit": { "state": "translated", "value": "Show agent status as subtitle text under each workspace title." } }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Muestra el estado del agente como subtítulo debajo del título de cada espacio de trabajo." + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Afficher l’état de l’agent comme sous-titre sous le titre de chaque espace de travail." + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Mostra lo stato dell’agente come sottotitolo sotto il titolo di ogni area di lavoro." + } + }, "ja": { "stringUnit": { "state": "translated", "value": "エージェントの状態を各ワークスペースタイトル下のサブタイトル文として表示します。" } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "បង្ហាញស្ថានភាពភ្នាក់ងារជាអត្ថបទចំណងជើងរងក្រោមចំណងជើងតំបន់ការងារនីមួយៗ។" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "각 작업 공간 제목 아래에 에이전트 상태를 부제목 텍스트로 표시합니다." + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Vis agentstatus som undertekst under tittelen på hvert arbeidsområde." + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Pokaż stan agenta jako tekst podtytułu pod tytułem każdego obszaru roboczego." + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Mostra o status do agente como subtítulo abaixo do título de cada espaço de trabalho." + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Показывать статус агента как текст подзаголовка под названием каждого рабочего пространства." + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "แสดงสถานะเอเจนต์เป็นข้อความคำบรรยายใต้ชื่อเวิร์กสเปซแต่ละรายการ" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Ajan durumunu her çalışma alanı başlığının altında alt başlık metni olarak göster." + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Показувати стан агента як текст підзаголовка під назвою кожного робочого простору." + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "在每个工作区标题下方以副标题文本显示代理状态。" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "在每個工作區標題下方以副標題文字顯示代理狀態。" + } } } }, From 91192c3b1621db9bb84b261496d1f80a744f7e9f Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Thu, 25 Jun 2026 21:43:26 -0700 Subject: [PATCH 21/25] Complete sidebar settings localization --- .../Sections/SidebarSection.swift | 9 +- Resources/Localizable.xcstrings | 1384 +++++++++++++++-- 2 files changed, 1233 insertions(+), 160 deletions(-) diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift index a781b7879c9e..57b12b7370ab 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/SidebarSection.swift @@ -121,13 +121,6 @@ public struct SidebarSection: View { rightMaxWidth.current.isFinite && rightMaxWidth.current > 0 } - private var workspaceStatusDotsBinding: Binding { - Binding( - get: { workspaceStatusStyle.current == .dot }, - set: { workspaceStatusStyle.set($0 ? .dot : .sentence) } - ) - } - private var rightMaxWidthOverrideBinding: Binding { Binding( get: { rightMaxWidthOverrideEnabled }, @@ -243,7 +236,7 @@ public struct SidebarSection: View { String(localized: "settings.sidebar.workspaceStatusStyle", defaultValue: "Compact Agent Status Dots"), subtitle: workspaceStatusStyle.current.rowDescription ) { - Toggle("", isOn: workspaceStatusDotsBinding) + Toggle("", isOn: Binding(get: { workspaceStatusStyle.current == .dot }, set: { workspaceStatusStyle.set($0 ? .dot : .sentence) })) .labelsHidden() .toggleStyle(.switch) .controlSize(.small) diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings index 48c0e3f415a3..e2cd68b0a91f 100644 --- a/Resources/Localizable.xcstrings +++ b/Resources/Localizable.xcstrings @@ -205100,17 +205100,125 @@ "settings.search.alias.setting.sidebarAppearance.scroll-edge-fade": { "extractionState": "manual", "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle قائمة التبويبات حافة تلاشي ظل سكرم أعلى أسفل إزالة تعطيل خفيف" + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle lista tabova ivica izbljeđivanje sjena skrem vrh dno ukloni isključi suptilno" + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle faneliste kant fade skygge scrim top bund fjern deaktiver diskret" + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle Tabliste Kante Fade Schatten Scrim oben unten entfernen deaktivieren dezent" + } + }, "en": { "stringUnit": { "state": "translated", "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle" } }, + "es": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle lista de pestañas borde desvanecimiento sombra velo arriba abajo quitar desactivar sutil" + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle liste onglets bord fondu ombre voile haut bas supprimer désactiver discret" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle elenco schede bordo dissolvenza ombra velo alto basso rimuovi disattiva leggera" + } + }, "ja": { "stringUnit": { "state": "translated", "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle タブリスト 端 フェード 影 スクリム 上 下 無効 控えめ" } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle បញ្ជីផ្ទាំង គែម ភាពស្រអាប់ ស្រមោល ស្គ្រីម ខាងលើ ខាងក្រោម លុប បិទ ស្រាល" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle 탭 목록 가장자리 페이드 그림자 스크림 위 아래 제거 비활성화 은은함" + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle faneliste kant toning skygge scrim topp bunn fjern deaktiver diskre" + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle lista kart krawędź zanikanie cień zasłona góra dół usuń wyłącz subtelne" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle lista de abas borda esmaecimento sombra scrim topo inferior remover desativar sutil" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle список вкладок край затухание тень скрим верх низ удалить отключить легкое" + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle รายการแท็บ ขอบ เฟด เงา สคริม บน ล่าง เอาออก ปิด ละเอียดอ่อน" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle sekme listesi kenar solma gölge scrim üst alt kaldır devre dışı hafif" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle список вкладок край затухання тінь скрім верх низ прибрати вимкнути легке" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle 标签列表 边缘 淡化 阴影 遮罩 顶部 底部 移除 禁用 轻微" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "sidebar.scrollEdgeFade tab list edge fade shadow scrim top bottom remove disable subtle 分頁列表 邊緣 淡化 陰影 遮罩 頂部 底部 移除 停用 輕微" + } } } }, @@ -205242,527 +205350,1499 @@ "settings.sidebar.scrollEdgeFade": { "extractionState": "manual", "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "تلاشي حافة قائمة التبويبات" + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Izbljeđivanje ivice liste tabova" + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Fade ved fanelistens kant" + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Fade an den Tablistenrändern" + } + }, "en": { "stringUnit": { "state": "translated", "value": "Tab List Edge Fade" } }, - "ja": { + "es": { + "stringUnit": { + "state": "translated", + "value": "Desvanecimiento de bordes de la lista de pestañas" + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Fondu des bords de la liste d’onglets" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Dissolvenza bordi elenco schede" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "タブリスト端のフェード" + } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "ភាពស្រអាប់គែមបញ្ជីផ្ទាំង" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "탭 목록 가장자리 페이드" + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Kanttoning for faneliste" + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Zanikanie krawędzi listy kart" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Esmaecimento das bordas da lista de abas" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Затухание краев списка вкладок" + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "เฟดขอบรายการแท็บ" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Sekme listesi kenar solması" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Затухання країв списку вкладок" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "标签列表边缘淡化" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "分頁列表邊緣淡化" + } + } + } + }, + "settings.sidebar.workspaceStatusStyle": { + "extractionState": "manual", + "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "نقاط حالة الوكيل المدمجة" + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Kompaktne tačke statusa agenta" + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Kompakte agentstatusprikker" + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Kompakte Agentenstatuspunkte" + } + }, + "en": { + "stringUnit": { + "state": "translated", + "value": "Compact Agent Status Dots" + } + }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Puntos compactos de estado del agente" + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Pastilles compactes d’état de l’agent" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Punti compatti di stato agente" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "コンパクトなエージェント状態ドット" + } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "ចំណុចស្ថានភាពភ្នាក់ងារបង្រួម" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "간결한 에이전트 상태 점" + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Kompakte agentstatusprikker" + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Kompaktowe kropki stanu agenta" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Pontos compactos de status do agente" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Компактные точки статуса агента" + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "จุดสถานะเอเจนต์แบบกะทัดรัด" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Kompakt ajan durumu noktaları" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Компактні точки стану агента" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "紧凑代理状态圆点" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "精簡代理狀態圓點" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.full.description": { + "extractionState": "manual", + "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "استخدم التلاشي الحالي أعلى وأسفل قائمة التبويبات." + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Koristi trenutno izbljeđivanje na vrhu i dnu liste tabova." + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Brug den aktuelle fade øverst og nederst over fanelisten." + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Den aktuellen oberen und unteren Fade über der Tabliste verwenden." + } + }, + "en": { + "stringUnit": { + "state": "translated", + "value": "Use the current top and bottom fade over the tab list." + } + }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Usa el desvanecimiento superior e inferior actual sobre la lista de pestañas." + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Utiliser le fondu actuel en haut et en bas de la liste d’onglets." + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Usa la dissolvenza attuale in alto e in basso sull’elenco delle schede." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "タブリストの上下に現在のフェードを使用します。" + } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "ប្រើភាពស្រអាប់បច្ចុប្បន្ននៅខាងលើ និងខាងក្រោមលើបញ្ជីផ្ទាំង។" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "탭 목록 위와 아래에 현재 페이드를 사용합니다." + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Bruk gjeldende øvre og nedre toning over fanelisten." + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Użyj bieżącego zanikania u góry i u dołu listy kart." + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Usa o esmaecimento atual na parte superior e inferior da lista de abas." + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Использовать текущее затухание сверху и снизу списка вкладок." + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "ใช้เฟดปัจจุบันที่ด้านบนและด้านล่างของรายการแท็บ" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Sekme listesinin üstünde ve altında geçerli solmayı kullan." + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Використовувати поточне затухання зверху й знизу списку вкладок." + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "在标签列表顶部和底部使用当前淡化效果。" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "在分頁列表頂部與底部使用目前的淡化效果。" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.full.name": { + "extractionState": "manual", + "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "كامل" + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Puno" + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Fuld" + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Voll" + } + }, + "en": { + "stringUnit": { + "state": "translated", + "value": "Full" + } + }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Completo" + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Complet" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Completa" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "標準" + } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "ពេញ" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "전체" + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Full" + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Pełne" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Completo" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Полное" + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "เต็ม" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Tam" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Повне" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "完整" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "完整" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.off.description": { + "extractionState": "manual", + "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "عطّل تلاشي قائمة التبويبات عند حافتي التمرير." + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Isključi izbljeđivanje liste tabova na obje ivice skrolovanja." + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Slå fanelistens fade fra ved begge rullekanter." + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Den Tablisten-Fade an beiden Scrollkanten deaktivieren." + } + }, + "en": { + "stringUnit": { + "state": "translated", + "value": "Disable the tab-list fade at both scroll edges." + } + }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Desactiva el desvanecimiento de la lista de pestañas en ambos bordes de desplazamiento." + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Désactiver le fondu de la liste d’onglets aux deux bords de défilement." + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Disattiva la dissolvenza dell’elenco schede su entrambi i bordi di scorrimento." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "タブリスト両端のフェードを無効にします。" + } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "បិទភាពស្រអាប់បញ្ជីផ្ទាំងនៅគែមរមូរទាំងពីរ។" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "양쪽 스크롤 가장자리에서 탭 목록 페이드를 끕니다." + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Slå av fanelistetoning ved begge rullekanter." + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Wyłącz zanikanie listy kart przy obu krawędziach przewijania." + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Desativa o esmaecimento da lista de abas nas duas bordas de rolagem." + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Отключить затухание списка вкладок на обоих краях прокрутки." + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "ปิดเฟดรายการแท็บที่ขอบการเลื่อนทั้งสองด้าน" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Sekme listesi solmasını her iki kaydırma kenarında devre dışı bırak." + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Вимкнути затухання списку вкладок на обох краях прокручування." + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "在两个滚动边缘关闭标签列表淡化效果。" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "在兩個捲動邊緣關閉分頁列表淡化效果。" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.off.name": { + "extractionState": "manual", + "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "إيقاف" + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Isključeno" + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Fra" + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Aus" + } + }, + "en": { + "stringUnit": { + "state": "translated", + "value": "Off" + } + }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Desactivado" + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Désactivé" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Disattivata" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "オフ" + } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "បិទ" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "끔" + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Av" + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Wyłączone" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Desativado" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Выкл." + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "ปิด" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Kapalı" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Вимкнено" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "关闭" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "關閉" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.subtle.description": { + "extractionState": "manual", + "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "استخدم تلاشيًا أقصر وأخف أعلى وأسفل قائمة التبويبات." + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Koristi kraće i blaže izbljeđivanje na vrhu i dnu liste tabova." + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Brug en kortere, lettere fade øverst og nederst på fanelisten." + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Einen kürzeren, leichteren Fade oben und unten an der Tabliste verwenden." + } + }, + "en": { + "stringUnit": { + "state": "translated", + "value": "Use a shorter, lighter fade at the top and bottom of the tab list." + } + }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Usa un desvanecimiento más corto y ligero arriba y abajo en la lista de pestañas." + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Utiliser un fondu plus court et plus léger en haut et en bas de la liste d’onglets." + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Usa una dissolvenza più corta e leggera in alto e in basso nell’elenco delle schede." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "タブリストの上下に短く控えめなフェードを使用します。" + } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "ប្រើភាពស្រអាប់ខ្លី និងស្រាលជាងនៅខាងលើ និងខាងក្រោមបញ្ជីផ្ទាំង។" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "탭 목록 위와 아래에 더 짧고 은은한 페이드를 사용합니다." + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Bruk en kortere, lettere toning øverst og nederst på fanelisten." + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Użyj krótszego, lżejszego zanikania u góry i u dołu listy kart." + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Usa um esmaecimento mais curto e leve na parte superior e inferior da lista de abas." + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Использовать более короткое и легкое затухание сверху и снизу списка вкладок." + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "ใช้เฟดที่สั้นและเบากว่าที่ด้านบนและด้านล่างของรายการแท็บ" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Sekme listesinin üstünde ve altında daha kısa ve hafif bir solma kullan." + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Використовувати коротше й легше затухання зверху та знизу списку вкладок." + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "在标签列表顶部和底部使用更短、更轻的淡化效果。" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "在分頁列表頂部與底部使用較短、較輕的淡化效果。" + } + } + } + }, + "sidebarScrollEdgeFadeStyle.subtle.name": { + "extractionState": "manual", + "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "خفيف" + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Suptilno" + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Diskret" + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Dezent" + } + }, + "en": { + "stringUnit": { + "state": "translated", + "value": "Subtle" + } + }, + "es": { + "stringUnit": { + "state": "translated", + "value": "Sutil" + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Discret" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Leggera" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "控えめ" + } + }, + "km": { + "stringUnit": { + "state": "translated", + "value": "ស្រាល" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "은은함" + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Diskré" + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Subtelne" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Sutil" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Легкое" + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "ละเอียดอ่อน" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Hafif" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Легке" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "轻微" + } + }, + "zh-Hant": { "stringUnit": { "state": "translated", - "value": "タブリスト端のフェード" + "value": "輕微" } } } }, - "settings.sidebar.workspaceStatusStyle": { + "sidebarWorkspaceStatusStyle.dot.description": { "extractionState": "manual", "localizations": { "ar": { "stringUnit": { "state": "translated", - "value": "نقاط حالة الوكيل المدمجة" + "value": "اعرض حالة الوكيل كنقطة ملونة بجانب العنوان. تبقى عناوين المزوّد الفرعية مرئية." } }, "bs": { "stringUnit": { "state": "translated", - "value": "Kompaktne tačke statusa agenta" + "value": "Prikaži status agenta kao obojenu tačku pored naslova. Podnaslovi pružatelja ostaju vidljivi." } }, "da": { "stringUnit": { "state": "translated", - "value": "Kompakte agentstatusprikker" + "value": "Vis agentstatus som en farvet prik ved siden af titlen. Udbyderundertekster forbliver synlige." } }, "de": { "stringUnit": { "state": "translated", - "value": "Kompakte Agentenstatuspunkte" + "value": "Agentenstatus als farbigen Punkt neben dem Titel anzeigen. Anbieter-Untertitel bleiben sichtbar." } }, "en": { "stringUnit": { "state": "translated", - "value": "Compact Agent Status Dots" + "value": "Show agent status as a colored dot beside the title. Provider subtitles stay visible." } }, "es": { "stringUnit": { "state": "translated", - "value": "Puntos compactos de estado del agente" + "value": "Muestra el estado del agente como un punto de color junto al título. Los subtítulos del proveedor permanecen visibles." } }, "fr": { "stringUnit": { "state": "translated", - "value": "Pastilles compactes d’état de l’agent" + "value": "Afficher l’état de l’agent comme une pastille colorée à côté du titre. Les sous-titres du fournisseur restent visibles." } }, "it": { "stringUnit": { "state": "translated", - "value": "Punti compatti di stato agente" + "value": "Mostra lo stato dell’agente come un punto colorato accanto al titolo. I sottotitoli del provider restano visibili." } }, "ja": { "stringUnit": { "state": "translated", - "value": "コンパクトなエージェント状態ドット" + "value": "エージェントの状態をタイトル横の色付きドットで表示します。プロバイダーのサブタイトルは表示したままにします。" } }, "km": { "stringUnit": { "state": "translated", - "value": "ចំណុចស្ថានភាពភ្នាក់ងារបង្រួម" + "value": "បង្ហាញស្ថានភាពភ្នាក់ងារជាចំណុចពណ៌នៅក្បែរចំណងជើង។ ចំណងជើងរងរបស់អ្នកផ្តល់នៅតែបង្ហាញ។" } }, "ko": { "stringUnit": { "state": "translated", - "value": "간결한 에이전트 상태 점" + "value": "제목 옆에 색상 점으로 에이전트 상태를 표시합니다. 제공자 부제목은 계속 표시됩니다." } }, "nb": { "stringUnit": { "state": "translated", - "value": "Kompakte agentstatusprikker" + "value": "Vis agentstatus som en farget prikk ved siden av tittelen. Leverandørundertekster forblir synlige." } }, "pl": { "stringUnit": { "state": "translated", - "value": "Kompaktowe kropki stanu agenta" + "value": "Pokaż stan agenta jako kolorową kropkę obok tytułu. Podtytuły dostawcy pozostają widoczne." } }, "pt-BR": { "stringUnit": { "state": "translated", - "value": "Pontos compactos de status do agente" + "value": "Mostra o status do agente como um ponto colorido ao lado do título. Os subtítulos do provedor continuam visíveis." } }, "ru": { "stringUnit": { "state": "translated", - "value": "Компактные точки статуса агента" + "value": "Показывать статус агента цветной точкой рядом с названием. Подзаголовки поставщика остаются видимыми." } }, "th": { "stringUnit": { "state": "translated", - "value": "จุดสถานะเอเจนต์แบบกะทัดรัด" + "value": "แสดงสถานะเอเจนต์เป็นจุดสีข้างชื่อเรื่อง คำบรรยายของผู้ให้บริการยังคงแสดงอยู่" } }, "tr": { "stringUnit": { "state": "translated", - "value": "Kompakt ajan durumu noktaları" + "value": "Ajan durumunu başlığın yanında renkli bir nokta olarak göster. Sağlayıcı alt başlıkları görünür kalır." } }, "uk": { "stringUnit": { "state": "translated", - "value": "Компактні точки стану агента" + "value": "Показувати стан агента кольоровою точкою поруч із назвою. Підзаголовки постачальника залишаються видимими." } }, "zh-Hans": { "stringUnit": { "state": "translated", - "value": "紧凑代理状态圆点" + "value": "在标题旁以彩色圆点显示代理状态。提供方副标题仍会显示。" } }, "zh-Hant": { "stringUnit": { "state": "translated", - "value": "精簡代理狀態圓點" + "value": "在標題旁以彩色圓點顯示代理狀態。提供者副標題仍會顯示。" } } } }, - "sidebarScrollEdgeFadeStyle.full.description": { + "sidebarWorkspaceStatusStyle.dot.name": { "extractionState": "manual", "localizations": { - "en": { + "ar": { "stringUnit": { "state": "translated", - "value": "Use the current top and bottom fade over the tab list." + "value": "نقطة" } }, - "ja": { + "bs": { "stringUnit": { "state": "translated", - "value": "タブリストの上下に現在のフェードを使用します。" + "value": "Tačka" } - } - } - }, - "sidebarScrollEdgeFadeStyle.full.name": { - "extractionState": "manual", - "localizations": { - "en": { + }, + "da": { "stringUnit": { "state": "translated", - "value": "Full" + "value": "Prik" } }, - "ja": { + "de": { "stringUnit": { "state": "translated", - "value": "標準" + "value": "Punkt" } - } - } - }, - "sidebarScrollEdgeFadeStyle.off.description": { - "extractionState": "manual", - "localizations": { + }, "en": { "stringUnit": { "state": "translated", - "value": "Disable the tab-list fade at both scroll edges." + "value": "Dot" } }, - "ja": { + "es": { "stringUnit": { "state": "translated", - "value": "タブリスト両端のフェードを無効にします。" + "value": "Punto" } - } - } - }, - "sidebarScrollEdgeFadeStyle.off.name": { - "extractionState": "manual", - "localizations": { - "en": { + }, + "fr": { "stringUnit": { "state": "translated", - "value": "Off" + "value": "Pastille" + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Punto" } }, "ja": { "stringUnit": { "state": "translated", - "value": "オフ" + "value": "ドット" } - } - } - }, - "sidebarScrollEdgeFadeStyle.subtle.description": { - "extractionState": "manual", - "localizations": { - "en": { + }, + "km": { "stringUnit": { "state": "translated", - "value": "Use a shorter, lighter fade at the top and bottom of the tab list." + "value": "ចំណុច" } }, - "ja": { + "ko": { "stringUnit": { "state": "translated", - "value": "タブリストの上下に短く控えめなフェードを使用します。" + "value": "점" } - } - } - }, - "sidebarScrollEdgeFadeStyle.subtle.name": { - "extractionState": "manual", - "localizations": { - "en": { + }, + "nb": { "stringUnit": { "state": "translated", - "value": "Subtle" + "value": "Prikk" } }, - "ja": { + "pl": { "stringUnit": { "state": "translated", - "value": "控えめ" + "value": "Kropka" + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Ponto" + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Точка" + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "จุด" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Nokta" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Точка" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "圆点" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "圓點" } } } }, - "sidebarWorkspaceStatusStyle.dot.description": { + "sidebarWorkspaceStatusStyle.sentence.description": { "extractionState": "manual", "localizations": { "ar": { "stringUnit": { "state": "translated", - "value": "اعرض حالة الوكيل كنقطة ملونة بجانب العنوان. تبقى عناوين المزوّد الفرعية مرئية." + "value": "اعرض حالة الوكيل كنص عنوان فرعي أسفل عنوان كل مساحة عمل." } }, "bs": { "stringUnit": { "state": "translated", - "value": "Prikaži status agenta kao obojenu tačku pored naslova. Podnaslovi pružatelja ostaju vidljivi." + "value": "Prikaži status agenta kao tekst podnaslova ispod naslova svakog radnog prostora." } }, "da": { "stringUnit": { "state": "translated", - "value": "Vis agentstatus som en farvet prik ved siden af titlen. Udbyderundertekster forbliver synlige." + "value": "Vis agentstatus som undertekst under hver arbejdsområdetitel." } }, "de": { "stringUnit": { "state": "translated", - "value": "Agentenstatus als farbigen Punkt neben dem Titel anzeigen. Anbieter-Untertitel bleiben sichtbar." + "value": "Agentenstatus als Untertitel unter jedem Workspace-Titel anzeigen." } }, "en": { "stringUnit": { "state": "translated", - "value": "Show agent status as a colored dot beside the title. Provider subtitles stay visible." + "value": "Show agent status as subtitle text under each workspace title." } }, "es": { "stringUnit": { "state": "translated", - "value": "Muestra el estado del agente como un punto de color junto al título. Los subtítulos del proveedor permanecen visibles." + "value": "Muestra el estado del agente como subtítulo debajo del título de cada espacio de trabajo." } }, "fr": { "stringUnit": { "state": "translated", - "value": "Afficher l’état de l’agent comme une pastille colorée à côté du titre. Les sous-titres du fournisseur restent visibles." + "value": "Afficher l’état de l’agent comme sous-titre sous le titre de chaque espace de travail." } }, "it": { "stringUnit": { "state": "translated", - "value": "Mostra lo stato dell’agente come un punto colorato accanto al titolo. I sottotitoli del provider restano visibili." + "value": "Mostra lo stato dell’agente come sottotitolo sotto il titolo di ogni area di lavoro." } }, "ja": { "stringUnit": { "state": "translated", - "value": "エージェントの状態をタイトル横の色付きドットで表示します。プロバイダーのサブタイトルは表示したままにします。" + "value": "エージェントの状態を各ワークスペースタイトル下のサブタイトル文として表示します。" } }, "km": { "stringUnit": { "state": "translated", - "value": "បង្ហាញស្ថានភាពភ្នាក់ងារជាចំណុចពណ៌នៅក្បែរចំណងជើង។ ចំណងជើងរងរបស់អ្នកផ្តល់នៅតែបង្ហាញ។" + "value": "បង្ហាញស្ថានភាពភ្នាក់ងារជាអត្ថបទចំណងជើងរងក្រោមចំណងជើងតំបន់ការងារនីមួយៗ។" } }, "ko": { "stringUnit": { "state": "translated", - "value": "제목 옆에 색상 점으로 에이전트 상태를 표시합니다. 제공자 부제목은 계속 표시됩니다." + "value": "각 작업 공간 제목 아래에 에이전트 상태를 부제목 텍스트로 표시합니다." } }, "nb": { "stringUnit": { "state": "translated", - "value": "Vis agentstatus som en farget prikk ved siden av tittelen. Leverandørundertekster forblir synlige." + "value": "Vis agentstatus som undertekst under tittelen på hvert arbeidsområde." } }, "pl": { "stringUnit": { "state": "translated", - "value": "Pokaż stan agenta jako kolorową kropkę obok tytułu. Podtytuły dostawcy pozostają widoczne." + "value": "Pokaż stan agenta jako tekst podtytułu pod tytułem każdego obszaru roboczego." } }, "pt-BR": { "stringUnit": { "state": "translated", - "value": "Mostra o status do agente como um ponto colorido ao lado do título. Os subtítulos do provedor continuam visíveis." + "value": "Mostra o status do agente como subtítulo abaixo do título de cada espaço de trabalho." } }, "ru": { "stringUnit": { "state": "translated", - "value": "Показывать статус агента цветной точкой рядом с названием. Подзаголовки поставщика остаются видимыми." + "value": "Показывать статус агента как текст подзаголовка под названием каждого рабочего пространства." } }, "th": { "stringUnit": { "state": "translated", - "value": "แสดงสถานะเอเจนต์เป็นจุดสีข้างชื่อเรื่อง คำบรรยายของผู้ให้บริการยังคงแสดงอยู่" + "value": "แสดงสถานะเอเจนต์เป็นข้อความคำบรรยายใต้ชื่อเวิร์กสเปซแต่ละรายการ" } }, "tr": { "stringUnit": { "state": "translated", - "value": "Ajan durumunu başlığın yanında renkli bir nokta olarak göster. Sağlayıcı alt başlıkları görünür kalır." + "value": "Ajan durumunu her çalışma alanı başlığının altında alt başlık metni olarak göster." } }, "uk": { "stringUnit": { "state": "translated", - "value": "Показувати стан агента кольоровою точкою поруч із назвою. Підзаголовки постачальника залишаються видимими." + "value": "Показувати стан агента як текст підзаголовка під назвою кожного робочого простору." } }, "zh-Hans": { "stringUnit": { "state": "translated", - "value": "在标题旁以彩色圆点显示代理状态。提供方副标题仍会显示。" + "value": "在每个工作区标题下方以副标题文本显示代理状态。" } }, "zh-Hant": { "stringUnit": { "state": "translated", - "value": "在標題旁以彩色圓點顯示代理狀態。提供者副標題仍會顯示。" - } - } - } - }, - "sidebarWorkspaceStatusStyle.dot.name": { - "extractionState": "manual", - "localizations": { - "en": { - "stringUnit": { - "state": "translated", - "value": "Dot" - } - }, - "ja": { - "stringUnit": { - "state": "translated", - "value": "ドット" + "value": "在每個工作區標題下方以副標題文字顯示代理狀態。" } } } }, - "sidebarWorkspaceStatusStyle.sentence.description": { + "sidebarWorkspaceStatusStyle.sentence.name": { "extractionState": "manual", "localizations": { "ar": { "stringUnit": { "state": "translated", - "value": "اعرض حالة الوكيل كنص عنوان فرعي أسفل عنوان كل مساحة عمل." + "value": "جملة" } }, "bs": { "stringUnit": { "state": "translated", - "value": "Prikaži status agenta kao tekst podnaslova ispod naslova svakog radnog prostora." + "value": "Rečenica" } }, "da": { "stringUnit": { "state": "translated", - "value": "Vis agentstatus som undertekst under hver arbejdsområdetitel." + "value": "Sætning" } }, "de": { "stringUnit": { "state": "translated", - "value": "Agentenstatus als Untertitel unter jedem Workspace-Titel anzeigen." + "value": "Satz" } }, "en": { "stringUnit": { "state": "translated", - "value": "Show agent status as subtitle text under each workspace title." + "value": "Sentence" } }, "es": { "stringUnit": { "state": "translated", - "value": "Muestra el estado del agente como subtítulo debajo del título de cada espacio de trabajo." + "value": "Frase" } }, "fr": { "stringUnit": { "state": "translated", - "value": "Afficher l’état de l’agent comme sous-titre sous le titre de chaque espace de travail." + "value": "Phrase" } }, "it": { "stringUnit": { "state": "translated", - "value": "Mostra lo stato dell’agente come sottotitolo sotto il titolo di ogni area di lavoro." + "value": "Frase" } }, "ja": { "stringUnit": { "state": "translated", - "value": "エージェントの状態を各ワークスペースタイトル下のサブタイトル文として表示します。" + "value": "文章" } }, "km": { "stringUnit": { "state": "translated", - "value": "បង្ហាញស្ថានភាពភ្នាក់ងារជាអត្ថបទចំណងជើងរងក្រោមចំណងជើងតំបន់ការងារនីមួយៗ។" + "value": "ប្រយោគ" } }, "ko": { "stringUnit": { "state": "translated", - "value": "각 작업 공간 제목 아래에 에이전트 상태를 부제목 텍스트로 표시합니다." + "value": "문장" } }, "nb": { "stringUnit": { "state": "translated", - "value": "Vis agentstatus som undertekst under tittelen på hvert arbeidsområde." + "value": "Setning" } }, "pl": { "stringUnit": { "state": "translated", - "value": "Pokaż stan agenta jako tekst podtytułu pod tytułem każdego obszaru roboczego." + "value": "Zdanie" } }, "pt-BR": { "stringUnit": { "state": "translated", - "value": "Mostra o status do agente como subtítulo abaixo do título de cada espaço de trabalho." + "value": "Frase" } }, "ru": { "stringUnit": { "state": "translated", - "value": "Показывать статус агента как текст подзаголовка под названием каждого рабочего пространства." + "value": "Предложение" } }, "th": { "stringUnit": { "state": "translated", - "value": "แสดงสถานะเอเจนต์เป็นข้อความคำบรรยายใต้ชื่อเวิร์กสเปซแต่ละรายการ" + "value": "ประโยค" } }, "tr": { "stringUnit": { "state": "translated", - "value": "Ajan durumunu her çalışma alanı başlığının altında alt başlık metni olarak göster." + "value": "Cümle" } }, "uk": { "stringUnit": { "state": "translated", - "value": "Показувати стан агента як текст підзаголовка під назвою кожного робочого простору." + "value": "Речення" } }, "zh-Hans": { "stringUnit": { "state": "translated", - "value": "在每个工作区标题下方以副标题文本显示代理状态。" + "value": "句子" } }, "zh-Hant": { "stringUnit": { "state": "translated", - "value": "在每個工作區標題下方以副標題文字顯示代理狀態。" - } - } - } - }, - "sidebarWorkspaceStatusStyle.sentence.name": { - "extractionState": "manual", - "localizations": { - "en": { - "stringUnit": { - "state": "translated", - "value": "Sentence" - } - }, - "ja": { - "stringUnit": { - "state": "translated", - "value": "文章" + "value": "句子" } } } From 9fe3ebaa512f8d38a2c65f36e7fdd7f641230e20 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Thu, 25 Jun 2026 22:01:08 -0700 Subject: [PATCH 22/25] Avoid Foundation dependency in attention sidebar --- .../CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift index 6ce00c63c6fc..85a79f3aca41 100644 --- a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift +++ b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift @@ -91,7 +91,7 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { } private static func isAgentStatusNotification(_ text: String) -> Bool { - let normalized = text.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + let normalized = text.lowercased() return normalized == "waiting for input" || normalized == "needs input" || normalized.hasSuffix(" needs input") From 7efd987b1de75ea98f416a9ac0dbdf898a843a49 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Thu, 25 Jun 2026 22:35:29 -0700 Subject: [PATCH 23/25] Use structured sidebar agent status text --- .../AttentionQueueSidebar.swift | 17 ++++++----------- .../AttentionQueueSidebarTests.swift | 17 ++++++++++++----- .../Snapshot/CmuxSidebarProviderWorkspace.swift | 8 ++++++++ ...muxSidebarProviderWorkspaceAgentStatus.swift | 7 +++++++ Sources/ContentView.swift | 1 + ...est_claude_wrapper_user_binary_resolution.py | 7 ++++--- 6 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspaceAgentStatus.swift diff --git a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift index 85a79f3aca41..ad5645b01ca9 100644 --- a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift +++ b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift @@ -71,6 +71,10 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { } private func rowSubtitle(_ workspace: CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderText? { + if workspace.agentStatus == .needsInput, + let statusText = trimmed(workspace.agentStatusText) { + return .plain(statusText) + } if let notification = trimmed(workspace.latestNotificationText) { return .plain(notification) } @@ -83,22 +87,13 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { } private func rowSubtitleRole(_ workspace: CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderRowSubtitleRole? { - guard let notification = trimmed(workspace.latestNotificationText), - Self.isAgentStatusNotification(notification) else { + guard trimmed(workspace.agentStatusText) != nil, + workspace.agentStatus == .needsInput else { return nil } return .agentStatus } - private static func isAgentStatusNotification(_ text: String) -> Bool { - let normalized = text.lowercased() - return normalized == "waiting for input" - || normalized == "needs input" - || normalized.hasSuffix(" needs input") - || normalized.hasSuffix(" needs your input") - || normalized.hasSuffix(" is waiting for your input") - } - private func hasRemoteTarget(_ workspace: CmuxSidebarProviderWorkspace) -> Bool { trimmed(workspace.remoteDisplayTarget) != nil } diff --git a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift index 49470689e871..4c602ff74223 100644 --- a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift +++ b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift @@ -52,13 +52,15 @@ struct AttentionQueueSidebarTests { } @Test - func latestNotificationSubtitleIsAgentStatus() throws { + func needsInputAgentStatusMarksLatestNotificationSubtitle() throws { let waiting = workspace( title: "Waiting", customDescription: "Agent workspace", remoteDisplayTarget: nil, remoteConnectionState: nil, - latestNotificationText: "Claude is waiting for your input" + latestNotificationText: "入力が必要です", + agentStatus: .needsInput, + agentStatusText: "入力が必要です" ) let snapshot = CmuxSidebarProviderSnapshot( sequence: 1, @@ -70,7 +72,7 @@ struct AttentionQueueSidebarTests { 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?.subtitle == .plain("入力が必要です")) #expect(attention.rows.first?.subtitleRole == .agentStatus) } @@ -81,7 +83,8 @@ struct AttentionQueueSidebarTests { customDescription: "CI workspace", remoteDisplayTarget: nil, remoteConnectionState: nil, - latestNotificationText: "Build failed in deploy step" + latestNotificationText: "Build failed in deploy step", + agentStatus: .needsInput ) let snapshot = CmuxSidebarProviderSnapshot( sequence: 1, @@ -102,7 +105,9 @@ struct AttentionQueueSidebarTests { customDescription: String?, remoteDisplayTarget: String?, remoteConnectionState: String?, - latestNotificationText: String? = nil + latestNotificationText: String? = nil, + agentStatus: CmuxSidebarProviderWorkspaceAgentStatus? = nil, + agentStatusText: String? = nil ) -> CmuxSidebarProviderWorkspace { CmuxSidebarProviderWorkspace( id: UUID(), @@ -116,6 +121,8 @@ struct AttentionQueueSidebarTests { remoteConnectionState: remoteConnectionState, unreadCount: 0, latestNotificationText: latestNotificationText, + agentStatus: agentStatus, + agentStatusText: agentStatusText, listeningPorts: [] ) } diff --git a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspace.swift b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspace.swift index 760bf2f0fcd0..fbfabd3227fd 100644 --- a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspace.swift +++ b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspace.swift @@ -24,6 +24,10 @@ public struct CmuxSidebarProviderWorkspace: Identifiable, Codable, Equatable, Se public var unreadCount: Int /// Latest notification text. public var latestNotificationText: String? + /// Current structured agent status for this workspace. + public var agentStatus: CmuxSidebarProviderWorkspaceAgentStatus? + /// Structured agent status text, if the host has one for this workspace. + public var agentStatusText: String? /// Latest submitted prompt text. public var latestSubmittedMessage: String? /// Timestamp for the latest submitted prompt. @@ -50,6 +54,8 @@ public struct CmuxSidebarProviderWorkspace: Identifiable, Codable, Equatable, Se remoteConnectionState: String?, unreadCount: Int, latestNotificationText: String?, + agentStatus: CmuxSidebarProviderWorkspaceAgentStatus? = nil, + agentStatusText: String? = nil, latestSubmittedMessage: String? = nil, latestSubmittedAt: Date? = nil, listeningPorts: [Int], @@ -68,6 +74,8 @@ public struct CmuxSidebarProviderWorkspace: Identifiable, Codable, Equatable, Se self.remoteConnectionState = remoteConnectionState self.unreadCount = unreadCount self.latestNotificationText = latestNotificationText + self.agentStatus = agentStatus + self.agentStatusText = agentStatusText self.latestSubmittedMessage = latestSubmittedMessage self.latestSubmittedAt = latestSubmittedAt self.listeningPorts = listeningPorts diff --git a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspaceAgentStatus.swift b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspaceAgentStatus.swift new file mode 100644 index 000000000000..261cf1e6e005 --- /dev/null +++ b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspaceAgentStatus.swift @@ -0,0 +1,7 @@ +/// Structured agent status exposed to in-process sidebar providers. +public enum CmuxSidebarProviderWorkspaceAgentStatus: String, Codable, Equatable, Sendable { + case unknown + case running + case idle + case needsInput +} diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index 950a319006ab..8c2279632462 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -11308,6 +11308,7 @@ struct VerticalTabsSidebar: View { remoteConnectionState: workspace.remoteConnectionState.rawValue, unreadCount: sidebarUnread.unreadCount(forWorkspaceId: workspace.id), latestNotificationText: sidebarUnread.latestNotificationText(forWorkspaceId: workspace.id), + agentStatus: CmuxSidebarProviderWorkspaceAgentStatus(rawValue: extensionSidebarAgentLifecycleState(for: workspace)?.rawValue ?? ""), agentStatusText: workspace.sidebarStatusEntriesInDisplayOrder().first { AgentHibernationLifecycleStatusKeys.isAllowed($0.key) }?.value, latestSubmittedMessage: workspace.latestSubmittedMessage, latestSubmittedAt: workspace.latestSubmittedAt, listeningPorts: workspace.listeningPorts, diff --git a/tests/test_claude_wrapper_user_binary_resolution.py b/tests/test_claude_wrapper_user_binary_resolution.py index 170c60e21081..284ebfd4db54 100644 --- a/tests/test_claude_wrapper_user_binary_resolution.py +++ b/tests/test_claude_wrapper_user_binary_resolution.py @@ -191,7 +191,8 @@ def test_shell_integration_preserves_empty_path_components(failures: list[str]) base_env["CMUX_SHELL_INTEGRATION_DIR"] = str(SHELL_INTEGRATION_DIR) base_env["CMUX_SURFACE_ID"] = surface_id base_env["TMPDIR"] = str(tmpdir) - base_env["PATH"] = f":{first}::{shim_root}:{last}:" + base_env["PATH"] = "/usr/bin:/bin" + base_env["CMUX_TEST_PATH"] = f":{first}::{shim_root}:{last}:" base_env.pop("CMUX_SOCKET_PATH", None) base_env.pop("GHOSTTY_BIN_DIR", None) @@ -201,13 +202,13 @@ def test_shell_integration_preserves_empty_path_components(failures: list[str]) "--noprofile", "--norc", "-c", - 'source "$CMUX_SHELL_INTEGRATION_DIR/cmux-bash-integration.bash"; printf "%s\\n" "$PATH"', + 'PATH="$CMUX_TEST_PATH"; export PATH; source "$CMUX_SHELL_INTEGRATION_DIR/cmux-bash-integration.bash"; printf "%s\\n" "$PATH"', ], [ "/bin/zsh", "-f", "-c", - 'source "$CMUX_SHELL_INTEGRATION_DIR/cmux-zsh-integration.zsh"; printf "%s\\n" "$PATH"', + 'PATH="$CMUX_TEST_PATH"; export PATH; source "$CMUX_SHELL_INTEGRATION_DIR/cmux-zsh-integration.zsh"; printf "%s\\n" "$PATH"', ], ] for argv in shell_commands: From 7417463f49e62bb57ae2bc93fe0ca3e300a4a162 Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Thu, 25 Jun 2026 23:08:12 -0700 Subject: [PATCH 24/25] Pair sidebar agent status text with lifecycle --- .../AttentionQueueSidebar.swift | 20 +++++++++--- .../AttentionQueueSidebarTests.swift | 27 +++++++++++++++- .../CmuxSidebarProviderWorkspace.swift | 2 +- ...xSidebarProviderWorkspaceAgentStatus.swift | 4 +++ Sources/ContentView.swift | 4 +-- Sources/Workspace+PanelLifecycle.swift | 22 +++++++++++++ .../WorkspaceSidebarObservationTests.swift | 31 +++++++++++++++++++ 7 files changed, 101 insertions(+), 9 deletions(-) diff --git a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift index ad5645b01ca9..4652a16feb7c 100644 --- a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift +++ b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift @@ -63,6 +63,7 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { private func needsAttention(_ workspace: CmuxSidebarProviderWorkspace) -> Bool { workspace.unreadCount > 0 || trimmed(workspace.latestNotificationText) != nil + || (workspace.agentStatus == .needsInput && trimmed(workspace.agentStatusText) != nil) || (hasRemoteTarget(workspace) && ( workspace.remoteConnectionState == "connecting" || workspace.remoteConnectionState == "reconnecting" @@ -71,13 +72,18 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { } private func rowSubtitle(_ workspace: CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderText? { + if let notification = trimmed(workspace.latestNotificationText) { + if workspace.agentStatus == .needsInput, + let statusText = trimmed(workspace.agentStatusText), + notification == statusText { + return .plain(statusText) + } + return .plain(notification) + } if workspace.agentStatus == .needsInput, let statusText = trimmed(workspace.agentStatusText) { return .plain(statusText) } - if let notification = trimmed(workspace.latestNotificationText) { - return .plain(notification) - } if hasRemoteTarget(workspace), let remoteState = trimmed(workspace.remoteConnectionState), remoteState != "connected" { @@ -87,8 +93,12 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { } private func rowSubtitleRole(_ workspace: CmuxSidebarProviderWorkspace) -> CmuxSidebarProviderRowSubtitleRole? { - guard trimmed(workspace.agentStatusText) != nil, - workspace.agentStatus == .needsInput else { + guard workspace.agentStatus == .needsInput, + let statusText = trimmed(workspace.agentStatusText) else { + return nil + } + if let notification = trimmed(workspace.latestNotificationText), + notification != statusText { return nil } return .agentStatus diff --git a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift index 4c602ff74223..e43699f59af0 100644 --- a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift +++ b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift @@ -76,6 +76,30 @@ struct AttentionQueueSidebarTests { #expect(attention.rows.first?.subtitleRole == .agentStatus) } + @Test + func needsInputAgentStatusWithoutNotificationNeedsAttention() throws { + let waiting = workspace( + title: "Waiting", + customDescription: "Agent workspace", + remoteDisplayTarget: nil, + remoteConnectionState: nil, + agentStatus: .needsInput, + agentStatusText: "入力が必要です" + ) + 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("入力が必要です")) + #expect(attention.rows.first?.subtitleRole == .agentStatus) + } + @Test func genericNotificationSubtitleKeepsProviderRole() throws { let notified = workspace( @@ -84,7 +108,8 @@ struct AttentionQueueSidebarTests { remoteDisplayTarget: nil, remoteConnectionState: nil, latestNotificationText: "Build failed in deploy step", - agentStatus: .needsInput + agentStatus: .needsInput, + agentStatusText: "Needs input" ) let snapshot = CmuxSidebarProviderSnapshot( sequence: 1, diff --git a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspace.swift b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspace.swift index fbfabd3227fd..c592c9a27286 100644 --- a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspace.swift +++ b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspace.swift @@ -26,7 +26,7 @@ public struct CmuxSidebarProviderWorkspace: Identifiable, Codable, Equatable, Se public var latestNotificationText: String? /// Current structured agent status for this workspace. public var agentStatus: CmuxSidebarProviderWorkspaceAgentStatus? - /// Structured agent status text, if the host has one for this workspace. + /// Structured agent status text paired with ``agentStatus``, if the host has one. public var agentStatusText: String? /// Latest submitted prompt text. public var latestSubmittedMessage: String? diff --git a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspaceAgentStatus.swift b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspaceAgentStatus.swift index 261cf1e6e005..57803fbf0b06 100644 --- a/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspaceAgentStatus.swift +++ b/Packages/macOS/CmuxSidebarProviderKit/Sources/CmuxSidebarProviderKit/Snapshot/CmuxSidebarProviderWorkspaceAgentStatus.swift @@ -1,7 +1,11 @@ /// Structured agent status exposed to in-process sidebar providers. public enum CmuxSidebarProviderWorkspaceAgentStatus: String, Codable, Equatable, Sendable { + /// The host knows an agent exists, but does not know whether it is active or idle. case unknown + /// At least one agent is currently running work. case running + /// The agent is idle and can be treated as not actively needing attention. case idle + /// The agent is waiting for user input. case needsInput } diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index 8c2279632462..70013acda8d3 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -11296,6 +11296,7 @@ struct VerticalTabsSidebar: View { private func extensionWorkspaceSnapshot(for workspace: Workspace) -> CmuxSidebarProviderWorkspace { let rootPath = extensionSidebarRootPath(for: workspace) + let agentStatusSnapshot = workspace.agentStatusIndicatorSnapshot() return CmuxSidebarProviderWorkspace( id: workspace.id, title: workspace.title, @@ -11308,7 +11309,7 @@ struct VerticalTabsSidebar: View { remoteConnectionState: workspace.remoteConnectionState.rawValue, unreadCount: sidebarUnread.unreadCount(forWorkspaceId: workspace.id), latestNotificationText: sidebarUnread.latestNotificationText(forWorkspaceId: workspace.id), - agentStatus: CmuxSidebarProviderWorkspaceAgentStatus(rawValue: extensionSidebarAgentLifecycleState(for: workspace)?.rawValue ?? ""), agentStatusText: workspace.sidebarStatusEntriesInDisplayOrder().first { AgentHibernationLifecycleStatusKeys.isAllowed($0.key) }?.value, + agentStatus: CmuxSidebarProviderWorkspaceAgentStatus(rawValue: agentStatusSnapshot?.state.rawValue ?? ""), agentStatusText: agentStatusSnapshot?.text, latestSubmittedMessage: workspace.latestSubmittedMessage, latestSubmittedAt: workspace.latestSubmittedAt, listeningPorts: workspace.listeningPorts, @@ -11319,7 +11320,6 @@ struct VerticalTabsSidebar: View { } ) } - private func extensionSidebarRootPath(for workspace: Workspace) -> String? { workspace.currentDirectory.trimmingCharacters(in: .whitespacesAndNewlines).nilIfEmpty } diff --git a/Sources/Workspace+PanelLifecycle.swift b/Sources/Workspace+PanelLifecycle.swift index 874816dfd44c..4ddc359ddc2b 100644 --- a/Sources/Workspace+PanelLifecycle.swift +++ b/Sources/Workspace+PanelLifecycle.swift @@ -145,6 +145,28 @@ extension Workspace { } } + func agentStatusIndicatorSnapshot() -> (state: AgentHibernationLifecycleState, text: String?)? { + var statesByKey: [String: [AgentHibernationLifecycleState]] = [:] + for panelStates in agentLifecycleStatesByPanelId.values { + for (key, state) in panelStates { + statesByKey[key, default: []].append(state) + } + } + let states = statesByKey.values.flatMap { $0 } + guard !states.isEmpty else { return nil } + let state = AgentHibernationLifecycleState.dominantForStatusIndicator(in: states, fallback: .unknown) + let text = statesByKey.compactMap { key, keyStates -> SidebarStatusEntry? in + guard keyStates.allSatisfy({ $0 == state }), + AgentHibernationLifecycleStatusKeys.isAllowed(key) else { + return nil + } + return statusEntries[key] + }.max { + isSidebarStatusEntryLessCurrent($0, than: $1) + }?.value + return (state, text) + } + private func shouldDisplaySidebarStatusEntry( _ entry: SidebarStatusEntry, visibleStructuredStatusKeys: Set diff --git a/cmuxTests/WorkspaceSidebarObservationTests.swift b/cmuxTests/WorkspaceSidebarObservationTests.swift index 3f3983e57930..563d89eb57bc 100644 --- a/cmuxTests/WorkspaceSidebarObservationTests.swift +++ b/cmuxTests/WorkspaceSidebarObservationTests.swift @@ -102,4 +102,35 @@ struct WorkspaceSidebarObservationTests { ) == .needsInput ) } + + @Test + func agentStatusIndicatorTextMatchesDominantLifecycleKey() { + let workspace = Workspace() + let runningPanelId = UUID() + let waitingPanelId = UUID() + workspace.agentLifecycleStatesByPanelId[runningPanelId] = ["codex": .running] + workspace.agentLifecycleStatesByPanelId[waitingPanelId] = ["claude_code": .needsInput] + workspace.statusEntries["codex"] = SidebarStatusEntry(key: "codex", value: "Running") + workspace.statusEntries["claude_code"] = SidebarStatusEntry(key: "claude_code", value: "Needs input") + + let snapshot = workspace.agentStatusIndicatorSnapshot() + + #expect(snapshot?.state == .needsInput) + #expect(snapshot?.text == "Needs input") + } + + @Test + func agentStatusIndicatorTextIgnoresAmbiguousSharedStatusKey() { + let workspace = Workspace() + let runningPanelId = UUID() + let waitingPanelId = UUID() + workspace.agentLifecycleStatesByPanelId[runningPanelId] = ["codex": .running] + workspace.agentLifecycleStatesByPanelId[waitingPanelId] = ["codex": .needsInput] + workspace.statusEntries["codex"] = SidebarStatusEntry(key: "codex", value: "Running") + + let snapshot = workspace.agentStatusIndicatorSnapshot() + + #expect(snapshot?.state == .needsInput) + #expect(snapshot?.text == nil) + } } From 41f38f161e45a79883efb7cd7a39333ad0385dff Mon Sep 17 00:00:00 2001 From: austinpower1258 Date: Thu, 25 Jun 2026 23:34:53 -0700 Subject: [PATCH 25/25] Keep needs-input rows in attention queue --- .../AttentionQueueSidebar.swift | 2 +- .../AttentionQueueSidebarTests.swift | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift index 4652a16feb7c..63b4d0aebf29 100644 --- a/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift +++ b/Examples/CmuxExtensionSidebarExamples/Sources/CmuxExtensionSidebarExamples/AttentionQueueSidebar.swift @@ -63,7 +63,7 @@ public struct AttentionQueueSidebar: CmuxSidebarProvider { private func needsAttention(_ workspace: CmuxSidebarProviderWorkspace) -> Bool { workspace.unreadCount > 0 || trimmed(workspace.latestNotificationText) != nil - || (workspace.agentStatus == .needsInput && trimmed(workspace.agentStatusText) != nil) + || workspace.agentStatus == .needsInput || (hasRemoteTarget(workspace) && ( workspace.remoteConnectionState == "connecting" || workspace.remoteConnectionState == "reconnecting" diff --git a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift index e43699f59af0..c8753e38142b 100644 --- a/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift +++ b/Examples/CmuxExtensionSidebarExamples/Tests/CmuxExtensionSidebarExamplesTests/AttentionQueueSidebarTests.swift @@ -100,6 +100,29 @@ struct AttentionQueueSidebarTests { #expect(attention.rows.first?.subtitleRole == .agentStatus) } + @Test + func needsInputAgentStatusWithoutTextNeedsAttention() throws { + let waiting = workspace( + title: "Waiting", + customDescription: "Agent workspace", + remoteDisplayTarget: nil, + remoteConnectionState: nil, + agentStatus: .needsInput + ) + 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("Agent workspace")) + #expect(attention.rows.first?.subtitleRole == nil) + } + @Test func genericNotificationSubtitleKeepsProviderRole() throws { let notified = workspace(