Add remove tag shred preview

Ariver

2026-06-25 c8be92c4ca12b53cec27c39977d2139bea3f0fe7

 src/Apptag/AppGridCollectionView.swift

@@ -38,8 +38,8 @@
}

enum AppGridUsageTipsMetrics {
    static let barHeight: CGFloat = 84
    static let reservedHeight: CGFloat = 128
    static let barHeight: CGFloat = 154
    static let reservedHeight: CGFloat = 194
    static let bottomMargin: CGFloat = 20
    static let horizontalInset: CGFloat = 24
    static let minWidth: CGFloat = 640
@@ -51,6 +51,7 @@
    let displayMode: String
    let iconSize: CGFloat
    let showNames: Bool
    let appGridTheme: AppGridTheme
    let bubbleDisabled: Bool
    let showUncommonAppBubbles: Bool
    let highlightedGroupName: String?
@@ -70,6 +71,7 @@
    let onGroupActivate: (String) -> Void
    let onScrollActivity: () -> Void
    let onDragModeChange: (Bool) -> Void
    let onHideUsageTips: () -> Void
    let onUsageTipsHoverChange: (Bool) -> Void

    func makeCoordinator() -> Coordinator {
@@ -90,6 +92,7 @@
            displayMode: displayMode,
            iconSize: iconSize,
            showNames: showNames,
            appGridTheme: appGridTheme,
            bubbleDisabled: bubbleDisabled,
            showUncommonAppBubbles: showUncommonAppBubbles,
            highlightedGroupName: highlightedGroupName,
@@ -109,6 +112,7 @@
            onGroupActivate: onGroupActivate,
            onScrollActivity: onScrollActivity,
            onDragModeChange: onDragModeChange,
            onHideUsageTips: onHideUsageTips,
            onUsageTipIndexChange: { selectedUsageTipIndexBinding.wrappedValue = $0 },
            onUsageTipsHoverChange: onUsageTipsHoverChange
        )
@@ -121,6 +125,7 @@
        var displayMode = AppDefaults.displayMode
        var iconSize: CGFloat = AppDefaults.iconSize
        var showNames = true
        var appGridTheme = AppGridTheme.fallback
        private var externalBubbleDisabled = false
        private var scrollBubbleDisabled = false
        var showUncommonAppBubbles = AppDefaults.showUncommonAppBubbles
@@ -146,6 +151,7 @@
        var onGroupActivate: (String) -> Void = { _ in }
        var onScrollActivity: () -> Void = {}
        var onDragModeChange: (Bool) -> Void = { _ in }
        var onHideUsageTips: () -> Void = {}
        var onUsageTipIndexChange: (Int) -> Void = { _ in }
        var onUsageTipsHoverChange: (Bool) -> Void = { _ in }

@@ -161,6 +167,7 @@
            displayMode: String,
            iconSize: CGFloat,
            showNames: Bool,
            appGridTheme: AppGridTheme,
            bubbleDisabled: Bool,
            showUncommonAppBubbles: Bool,
            highlightedGroupName: String?,
@@ -180,6 +187,7 @@
            onGroupActivate: @escaping (String) -> Void,
            onScrollActivity: @escaping () -> Void,
            onDragModeChange: @escaping (Bool) -> Void,
            onHideUsageTips: @escaping () -> Void,
            onUsageTipIndexChange: @escaping (Int) -> Void,
            onUsageTipsHoverChange: @escaping (Bool) -> Void
        ) {
@@ -188,6 +196,7 @@
            self.displayMode = displayMode
            self.iconSize = iconSize
            self.showNames = showNames
            self.appGridTheme = appGridTheme
            self.externalBubbleDisabled = bubbleDisabled
            self.showUncommonAppBubbles = showUncommonAppBubbles
            self.highlightedGroupName = highlightedGroupName
@@ -207,6 +216,7 @@
            self.onGroupActivate = onGroupActivate
            self.onScrollActivity = onScrollActivity
            self.onDragModeChange = onDragModeChange
            self.onHideUsageTips = onHideUsageTips
            self.onUsageTipIndexChange = onUsageTipIndexChange
            self.onUsageTipsHoverChange = onUsageTipsHoverChange
            if !self.usageTipsVisible {
@@ -218,6 +228,7 @@
                displayMode: displayMode,
                iconSize: iconSize,
                showNames: showNames,
                appGridTheme: appGridTheme,
                showUncommonAppBubbles: showUncommonAppBubbles,
                bottomContentPadding: self.bottomContentPadding,
                contentRevision: contentRevision
@@ -393,6 +404,7 @@
            displayMode: String,
            iconSize: CGFloat,
            showNames: Bool,
            appGridTheme: AppGridTheme,
            showUncommonAppBubbles: Bool,
            bottomContentPadding: CGFloat,
            contentRevision: Int
@@ -405,6 +417,7 @@
                displayMode,
                "\(Int(iconSize.rounded()))",
                showNames ? "names" : "nonames",
                "theme=\(appGridTheme.rawValue)",
                showUncommonAppBubbles ? "uncommon" : "allbubbles",
                "bottom=\(Int(bottomContentPadding.rounded()))",
                colorPart,
@@ -477,6 +490,7 @@

    func applyCoordinatorUpdate() {
        guard let coordinator else { return }
        applyAppearance()
        if coordinator.needsReload {
            coordinator.needsReload = false
            collectionView.reloadData()
@@ -548,6 +562,17 @@
        DispatchQueue.main.async {
            coordinator.onDropOutsideGroup(path, source, copy)
        }
    }

    func canPreviewEmptyDrop(path: String, source: String, screenPoint: NSPoint, copy: Bool) -> Bool {
        guard let coordinator,
              coordinator.displayStyle != .flat
        else { return false }
        return !coordinator.shouldCancelEmptyDropForActiveReorder(
            path: path,
            screenPoint: screenPoint,
            copy: copy
        )
    }

    private func setup() {
@@ -766,6 +791,12 @@
        }
        return didScroll
    }

    private func applyAppearance() {
        let usesDarkGlass = coordinator?.appGridTheme.usesDarkGlass == true
        layer?.backgroundColor = NSColor.clear.cgColor
        collectionView.appearance = usesDarkGlass ? NSAppearance(named: .darkAqua) : nil
    }
}

private final class AppGridUsageTipsShieldView: NSView {
@@ -823,10 +854,12 @@
    weak var coordinator: AppGridCollectionView.Coordinator?

    private let backgroundView = NSVisualEffectView()
    private let titlePanelView = NSView()
    private let iconView = AppGridDecorativeImageView()
    private let titleLabel = NSTextField(labelWithString: "")
    private let detailScrollView = NSScrollView()
    private let detailLabel = NSTextField(labelWithString: "")
    private let closeButton = AppGridUsageTipIconButton(systemImage: "xmark")
    private let previousButton = AppGridUsageTipIconButton(systemImage: "chevron.left")
    private let nextButton = AppGridUsageTipIconButton(systemImage: "chevron.right")
    private let dotsView = AppGridUsageTipDotsView()
@@ -835,9 +868,10 @@
    private var visualWidth: CGFloat = AppGridUsageTipsMetrics.minWidth
    private var visualHeight: CGFloat = AppGridUsageTipsMetrics.barHeight
    private var visualBottomMargin: CGFloat = AppGridUsageTipsMetrics.bottomMargin
    private var currentDetailText = ""

    private let titleFont = NSFont.systemFont(ofSize: 24, weight: .semibold)
    private let detailFont = NSFont.systemFont(ofSize: 24, weight: .regular)
    private let titleFont = NSFont.systemFont(ofSize: 25, weight: .bold)
    private let detailFont = NSFont.systemFont(ofSize: 24, weight: .medium)

    override var isFlipped: Bool { true }
    override var acceptsFirstResponder: Bool { true }
@@ -939,48 +973,69 @@
        let visualFrame = currentVisualFrame()
        backgroundView.frame = visualFrame

        let paddingLeft: CGFloat = 22
        let paddingRight: CGFloat = 16
        let iconSize: CGFloat = 24
        let iconTextGap: CGFloat = 10
        let titleDetailGap: CGFloat = 22
        let detailControlsGap: CGFloat = 24
        let buttonGap: CGFloat = 6
        let buttonSize: CGFloat = 48
        let dotsWidth = dotsView.preferredWidth
        let fullTitleWidth = ceil(titleLabel.attributedStringValue.size().width)
        let outerPaddingX: CGFloat = 20
        let outerPaddingY: CGFloat = 19
        let titlePanelWidth = min(
            max(350, visualFrame.width * 0.24),
            min(460, visualFrame.width * 0.36)
        )
        let titlePanelHeight = max(1, min(116, visualFrame.height - outerPaddingY * 2))
        let titlePanelFrame = NSRect(
            x: visualFrame.minX + outerPaddingX,
            y: visualFrame.midY - titlePanelHeight / 2,
            width: titlePanelWidth,
            height: titlePanelHeight
        )
        titlePanelView.frame = titlePanelFrame

        let centerY = visualFrame.midY
        let iconSize: CGFloat = 26
        let controlZoneWidth: CGFloat = min(148, max(128, visualFrame.width * 0.08))
        let buttonGap: CGFloat = 12
        let buttonSize: CGFloat = 52
        let buttonDotsGap: CGFloat = 10
        let dotsHeight: CGFloat = 10
        let dotsWidth = dotsView.preferredWidth

        let titleIconGap: CGFloat = 20
        let titleSidePadding: CGFloat = 28
        let titleX = titlePanelFrame.minX + titleSidePadding + iconSize + titleIconGap
        let titleWidth = max(1, titlePanelFrame.maxX - titleX - titleSidePadding)
        let titleHeight: CGFloat = 68
        let titleY = titlePanelFrame.midY - titleHeight / 2
        let detailGap = visualFrame.width < 980 ? CGFloat(30) : CGFloat(52)
        let controlGap = visualFrame.width < 980 ? CGFloat(24) : CGFloat(36)
        let detailX = titlePanelFrame.maxX + detailGap
        let controlsMaxX = visualFrame.maxX - 54
        let textRight = controlsMaxX - controlZoneWidth - controlGap
        let detailHeight: CGFloat = 88
        let detailY = visualFrame.minY + max(0, (visualFrame.height - detailHeight) / 2)

        let buttonsWidth = buttonSize * 2 + buttonGap
        let buttonsGroupMinX = controlsMaxX - buttonsWidth

        iconView.frame = NSRect(
            x: visualFrame.minX + paddingLeft,
            y: centerY - iconSize / 2,
            x: titlePanelFrame.minX + titleSidePadding,
            y: titlePanelFrame.midY - iconSize / 2,
            width: iconSize,
            height: iconSize
        )

        let titleX = iconView.frame.maxX + iconTextGap
        let buttonsWidth = buttonSize * 2 + buttonGap
        let trailingWidth = paddingRight + buttonsWidth + detailControlsGap
        let availableTextWidth = max(1, visualFrame.maxX - titleX - titleDetailGap - trailingWidth)
        let minimumReadableDetailWidth: CGFloat = 220
        let titleWidth: CGFloat
        if availableTextWidth >= fullTitleWidth + minimumReadableDetailWidth {
            titleWidth = fullTitleWidth
        } else if availableTextWidth >= fullTitleWidth {
            titleWidth = fullTitleWidth
        } else {
            titleWidth = max(1, availableTextWidth)
        }

        titleLabel.frame = NSRect(
            x: titleX,
            y: visualFrame.minY,
            y: titleY,
            width: titleWidth,
            height: visualFrame.height
            height: titleHeight
        )

        let buttonY = visualFrame.minY + 10
        let buttonsGroupMinX = visualFrame.maxX - paddingRight - buttonsWidth
        closeButton.frame = NSRect(
            x: visualFrame.maxX - 40,
            y: visualFrame.minY + 10,
            width: 30,
            height: 30
        )

        let controlGroupHeight = buttonSize + buttonDotsGap + dotsHeight
        let buttonY = visualFrame.minY + max(0, (visualFrame.height - controlGroupHeight) / 2)
        nextButton.frame = NSRect(
            x: buttonsGroupMinX + buttonSize + buttonGap,
            y: buttonY,
@@ -995,18 +1050,16 @@
        )
        dotsView.frame = NSRect(
            x: buttonsGroupMinX + (buttonsWidth - dotsWidth) / 2,
            y: previousButton.frame.maxY + 6,
            y: previousButton.frame.maxY + buttonDotsGap,
            width: dotsWidth,
            height: 10
            height: dotsHeight
        )

        let detailX = titleLabel.frame.maxX + titleDetailGap
        let detailRight = previousButton.frame.minX - detailControlsGap
        detailScrollView.frame = NSRect(
            x: detailX,
            y: visualFrame.minY,
            width: max(1, detailRight - detailX),
            height: visualFrame.height
            y: detailY,
            width: max(1, textRight - detailX),
            height: detailHeight
        )
        layoutDetailLabel()
    }
@@ -1025,7 +1078,9 @@
        let safeIndex = min(max(0, coordinator.selectedUsageTipIndex), coordinator.usageTips.count - 1)
        let tip = coordinator.usageTips[safeIndex]
        titleLabel.stringValue = tr(tip.titleKey)
        detailLabel.stringValue = formattedTipDetail(tr(tip.detailKey))
        updateTipIcon(id: tip.id)
        currentDetailText = formattedTipDetail(tr(tip.detailKey))
        closeButton.buttonAccessibilityLabel = tr("usageTips.close")
        previousButton.buttonAccessibilityLabel = tr("usageTips.previous")
        nextButton.buttonAccessibilityLabel = tr("usageTips.next")
        dotsView.configure(count: coordinator.usageTips.count, selectedIndex: safeIndex)
@@ -1047,13 +1102,7 @@
    }

    func preferredWidth(maxAvailableWidth: CGFloat) -> CGFloat {
        let padding: CGFloat = 22 + 16
        let fixedWidth: CGFloat = 24 + 10 + 22 + 24 + 48 + 6 + 48
        let titleWidth = ceil(titleLabel.attributedStringValue.size().width)
        let detailWidth = ceil(detailLabel.attributedStringValue.size().width)
        let contentWidth = padding + fixedWidth + titleWidth + detailWidth
        let preferredWidth = max(AppGridUsageTipsMetrics.minWidth, contentWidth)
        return min(maxAvailableWidth, preferredWidth)
        max(1, maxAvailableWidth)
    }

    private func setup() {
@@ -1072,7 +1121,13 @@
        backgroundView.layer?.borderWidth = 1
        addSubview(backgroundView)

        let iconConfig = NSImage.SymbolConfiguration(pointSize: 24, weight: .semibold)
        titlePanelView.wantsLayer = true
        titlePanelView.layer?.cornerRadius = 18
        titlePanelView.layer?.masksToBounds = true
        titlePanelView.layer?.borderWidth = 1
        addSubview(titlePanelView)

        let iconConfig = NSImage.SymbolConfiguration(pointSize: 26, weight: .bold)
        iconView.image = NSImage(
            systemSymbolName: "lightbulb.fill",
            accessibilityDescription: nil
@@ -1080,8 +1135,8 @@
        iconView.imageScaling = .scaleProportionallyDown
        addSubview(iconView)

        configureLabel(titleLabel, font: titleFont, lineBreakMode: .byClipping)
        configureLabel(detailLabel, font: detailFont, lineBreakMode: .byClipping)
        configureLabel(titleLabel, font: titleFont, lineBreakMode: .byWordWrapping)
        configureDetailLabel()

        detailScrollView.drawsBackground = false
        detailScrollView.hasVerticalScroller = false
@@ -1090,12 +1145,14 @@
        detailScrollView.borderType = .noBorder
        detailScrollView.documentView = detailLabel

        closeButton.action = { [weak self] in self?.hideUsageTips() }
        previousButton.action = { [weak self] in self?.selectUsageTip(offset: -1) }
        nextButton.action = { [weak self] in self?.selectUsageTip(offset: 1) }

        addSubview(titleLabel)
        addSubview(detailScrollView)
        addSubview(dotsView)
        addSubview(closeButton)
        addSubview(previousButton)
        addSubview(nextButton)

@@ -1110,8 +1167,22 @@
        label.drawsBackground = false
        label.isBordered = false
        label.lineBreakMode = lineBreakMode
        label.maximumNumberOfLines = 1
        label.maximumNumberOfLines = 2
        label.alignment = .left
        label.font = font
    }

    private func configureDetailLabel() {
        detailLabel.cell = AppGridCenteredMultilineTextFieldCell(textCell: "")
        detailLabel.isEditable = false
        detailLabel.isSelectable = false
        detailLabel.drawsBackground = false
        detailLabel.isBordered = false
        detailLabel.lineBreakMode = .byWordWrapping
        detailLabel.maximumNumberOfLines = 2
        detailLabel.font = detailFont
        detailLabel.cell?.usesSingleLineMode = false
        detailLabel.cell?.wraps = true
    }

    private func claimInteractionFocus() {
@@ -1134,9 +1205,22 @@
        applyCoordinatorState()
    }

    private func hideUsageTips() {
        Diagnostics.log("usageTips.hud.close")
        clearHoverState()
        isHidden = true
        coordinator?.onHideUsageTips()
    }

    private func routeButtonClickIfNeeded(_ event: NSEvent) -> Bool {
        let point = usageTipsPoint(for: event)
        let hitOutset: CGFloat = 24
        let closeHitOutset: CGFloat = 8
        if closeButton.frame.insetBy(dx: -closeHitOutset, dy: -closeHitOutset).contains(point) {
            closeButton.performPressFeedback()
            hideUsageTips()
            return true
        }
        let hitOutset: CGFloat = 6
        if nextButton.frame.insetBy(dx: -hitOutset, dy: -hitOutset).contains(point) {
            Diagnostics.log("usageTips.hud.routedNext")
            selectUsageTip(offset: 1)
@@ -1180,8 +1264,8 @@
    }

    private func layoutDetailLabel() {
        let textWidth = detailLabel.attributedStringValue.size().width
        let width = max(detailScrollView.contentView.bounds.width, ceil(textWidth) + 18)
        let width = max(1, detailScrollView.contentView.bounds.width)
        detailLabel.preferredMaxLayoutWidth = width
        detailLabel.frame = NSRect(x: 0, y: 0, width: width, height: detailScrollView.bounds.height)
    }

@@ -1197,19 +1281,197 @@
    }

    private func formattedTipDetail(_ text: String) -> String {
        text
            .replacingOccurrences(of: " > ", with: " -> ")
            .replacingOccurrences(of: ">", with: "->")
        let normalized = text
            .replacingOccurrences(of: "\\s*(?:-->|->|>|→|＞|,)\\s*", with: "\n", options: .regularExpression)
            .replacingOccurrences(of: "[ \\t]{2,}", with: " ", options: .regularExpression)
            .replacingOccurrences(of: "\\n{2,}", with: "\n", options: .regularExpression)
            .trimmingCharacters(in: .whitespacesAndNewlines)
        return orderedTipDetail(normalized)
    }

    private func orderedTipDetail(_ text: String) -> String {
        let lines = text
            .components(separatedBy: .newlines)
            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
            .filter { !$0.isEmpty }
        guard lines.count > 1 else { return text }
        return lines
            .enumerated()
            .map { "\($0.offset + 1). \($0.element)" }
            .joined(separator: "\n")
    }

    private func updateTipIcon(id: Int) {
        let symbolName: String
        switch id {
        case 1:
            symbolName = "tag.fill"
        case 2:
            symbolName = "checkmark.seal.fill"
        case 3:
            symbolName = "arrow.up.and.down.and.arrow.left.and.right"
        case 4:
            symbolName = "doc.on.doc.fill"
        case 5:
            symbolName = "minus.circle.fill"
        case 6:
            symbolName = "arrow.up.arrow.down.circle.fill"
        case 7:
            symbolName = "square.grid.2x2.fill"
        case 8:
            symbolName = "note.text"
        default:
            symbolName = "lightbulb.fill"
        }
        let iconConfig = NSImage.SymbolConfiguration(pointSize: 26, weight: .bold)
        iconView.image = NSImage(
            systemSymbolName: symbolName,
            accessibilityDescription: nil
        )?.withSymbolConfiguration(iconConfig)
        ?? NSImage(
            systemSymbolName: "lightbulb.fill",
            accessibilityDescription: nil
        )?.withSymbolConfiguration(iconConfig)
    }

    private func updateColors() {
        backgroundView.layer?.borderColor = NSColor.separatorColor.withAlphaComponent(0.35).cgColor
        iconView.contentTintColor = .systemYellow
        titleLabel.textColor = .secondaryLabelColor
        detailLabel.textColor = .labelColor
        previousButton.tintColor = .labelColor
        nextButton.tintColor = .labelColor
        dotsView.needsDisplay = true
        let usesDarkGlass = coordinator?.appGridTheme.usesDarkGlass == true

        backgroundView.material = usesDarkGlass ? .underWindowBackground : .popover
        backgroundView.appearance = usesDarkGlass ? NSAppearance(named: .darkAqua) : nil
        backgroundView.layer?.backgroundColor = (
            usesDarkGlass
                ? NSColor.black.withAlphaComponent(0.46)
                : NSColor.white.withAlphaComponent(0.54)
        ).cgColor
        backgroundView.layer?.borderColor = (
            usesDarkGlass
                ? NSColor.white.withAlphaComponent(0.22)
                : NSColor.black.withAlphaComponent(0.18)
        ).cgColor

        titlePanelView.layer?.backgroundColor = (
            usesDarkGlass
                ? NSColor.white.withAlphaComponent(0.08)
                : NSColor.white.withAlphaComponent(0.42)
        ).cgColor
        titlePanelView.layer?.borderColor = (
            usesDarkGlass
                ? NSColor.white.withAlphaComponent(0.12)
                : NSColor.black.withAlphaComponent(0.08)
        ).cgColor

        let theme = coordinator?.appGridTheme ?? .fallback
        let accentColor = usageTipAccentColor(for: theme)
        iconView.contentTintColor = accentColor
        titleLabel.textColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.92)
            : accentColor.withAlphaComponent(0.94)
        detailLabel.textColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.95)
            : NSColor(calibratedRed: 0.08, green: 0.10, blue: 0.13, alpha: 0.94)
        applyDetailTextStyle()

        let buttonTint = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.90)
            : NSColor(calibratedWhite: 0.08, alpha: 0.92)
        let buttonHoverTint = usesDarkGlass
            ? NSColor.white
            : NSColor(calibratedWhite: 0.04, alpha: 1.00)
        let buttonPressedTint = usesDarkGlass
            ? NSColor.white
            : NSColor.black
        let buttonSurface = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.10)
            : NSColor.white.withAlphaComponent(0.38)
        let buttonHoverSurface = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.20)
            : NSColor.white.withAlphaComponent(0.70)
        let buttonPressedSurface = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.28)
            : NSColor.white.withAlphaComponent(0.86)
        let buttonBorder = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.14)
            : NSColor.black.withAlphaComponent(0.10)
        [previousButton, nextButton].forEach { button in
            button.tintColor = buttonTint
            button.hoveredTintColor = buttonHoverTint
            button.pressedTintColor = buttonPressedTint
            button.surfaceColor = buttonSurface
            button.hoveredSurfaceColor = buttonHoverSurface
            button.pressedSurfaceColor = buttonPressedSurface
            button.borderColor = buttonBorder
        }

        closeButton.tintColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.42)
            : NSColor.black.withAlphaComponent(0.34)
        closeButton.hoveredTintColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.86)
            : NSColor.black.withAlphaComponent(0.78)
        closeButton.pressedTintColor = usesDarkGlass ? .white : .black
        closeButton.surfaceColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.04)
            : NSColor.white.withAlphaComponent(0.08)
        closeButton.hoveredSurfaceColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.14)
            : NSColor.white.withAlphaComponent(0.62)
        closeButton.pressedSurfaceColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.22)
            : NSColor.white.withAlphaComponent(0.82)
        closeButton.borderColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.08)
            : NSColor.black.withAlphaComponent(0.08)

        dotsView.selectedColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.88)
            : NSColor.labelColor.withAlphaComponent(0.74)
        dotsView.idleColor = usesDarkGlass
            ? NSColor.white.withAlphaComponent(0.28)
            : NSColor.labelColor.withAlphaComponent(0.24)

        layer?.shadowOpacity = usesDarkGlass ? 0.28 : 0.14
        layer?.shadowRadius = usesDarkGlass ? 18 : 12
        needsDisplay = true
    }

    private func usageTipAccentColor(for theme: AppGridTheme) -> NSColor {
        switch theme {
        case .defaultLight:
            return NSColor(calibratedRed: 0.34, green: 0.40, blue: 0.48, alpha: 1.00)
        case .deepBlue:
            return NSColor(calibratedRed: 0.42, green: 0.80, blue: 1.00, alpha: 1.00)
        case .black:
            return NSColor(calibratedRed: 0.36, green: 0.74, blue: 1.00, alpha: 1.00)
        case .pink:
            return NSColor(calibratedRed: 0.70, green: 0.18, blue: 0.45, alpha: 1.00)
        case .purple:
            return NSColor(calibratedRed: 0.40, green: 0.22, blue: 0.70, alpha: 1.00)
        case .green:
            return NSColor(calibratedRed: 0.08, green: 0.42, blue: 0.22, alpha: 1.00)
        case .blue:
            return NSColor(calibratedRed: 0.06, green: 0.34, blue: 0.74, alpha: 1.00)
        case .colorful:
            return NSColor(calibratedRed: 0.06, green: 0.44, blue: 0.78, alpha: 1.00)
        }
    }

    private func applyDetailTextStyle() {
        let paragraphStyle = NSMutableParagraphStyle()
        paragraphStyle.alignment = .left
        paragraphStyle.lineBreakMode = .byWordWrapping
        paragraphStyle.minimumLineHeight = 31
        paragraphStyle.maximumLineHeight = 34
        paragraphStyle.lineSpacing = 6

        detailLabel.attributedStringValue = NSAttributedString(
            string: currentDetailText,
            attributes: [
                .font: detailFont,
                .foregroundColor: detailLabel.textColor ?? NSColor.labelColor,
                .paragraphStyle: paragraphStyle
            ]
        )
    }
}

@@ -1219,6 +1481,20 @@
        let textHeight = cellSize(forBounds: rect).height
        drawingRect.origin.y = rect.origin.y + max(0, (rect.height - textHeight) / 2)
        drawingRect.size.height = min(rect.height, textHeight + 2)
        return drawingRect
    }
}

private final class AppGridCenteredMultilineTextFieldCell: NSTextFieldCell {
    override func drawingRect(forBounds rect: NSRect) -> NSRect {
        var drawingRect = super.drawingRect(forBounds: rect)
        let textHeight = attributedStringValue.boundingRect(
            with: NSSize(width: max(1, rect.width), height: .greatestFiniteMagnitude),
            options: [.usesLineFragmentOrigin, .usesFontLeading]
        ).height
        let centeredHeight = min(rect.height, ceil(textHeight) + 4)
        drawingRect.origin.y = rect.origin.y + max(0, (rect.height - centeredHeight) / 2)
        drawingRect.size.height = centeredHeight
        return drawingRect
    }
}
@@ -1242,8 +1518,26 @@
    }
    var tintColor: NSColor = .labelColor {
        didSet {
            imageView.contentTintColor = tintColor
            updateIconTint()
        }
    }
    var hoveredTintColor: NSColor? {
        didSet { updateIconTint() }
    }
    var pressedTintColor: NSColor? {
        didSet { updateIconTint() }
    }
    var surfaceColor: NSColor = .clear {
        didSet { needsDisplay = true }
    }
    var hoveredSurfaceColor: NSColor = NSColor.labelColor.withAlphaComponent(0.08) {
        didSet { needsDisplay = true }
    }
    var pressedSurfaceColor: NSColor = NSColor.labelColor.withAlphaComponent(0.14) {
        didSet { needsDisplay = true }
    }
    var borderColor: NSColor = .clear {
        didSet { needsDisplay = true }
    }

    private let imageView = AppGridDecorativeImageView()
@@ -1283,9 +1577,20 @@
        return true
    }

    func performPressFeedback() {
        isPressed = true
        needsDisplay = true
        updateIconTint()
        DispatchQueue.main.asyncAfter(deadline: .now() + 0.10) { [weak self] in
            self?.isPressed = false
            self?.needsDisplay = true
            self?.updateIconTint()
        }
    }

    override func layout() {
        super.layout()
        let size: CGFloat = 26
        let size = min(CGFloat(26), max(14, min(bounds.width, bounds.height) * 0.62))
        imageView.frame = NSRect(
            x: (bounds.width - size) / 2,
            y: (bounds.height - size) / 2,
@@ -1316,31 +1621,32 @@
    override func mouseEntered(with event: NSEvent) {
        isHovered = true
        needsDisplay = true
        updateIconTint()
    }

    override func mouseExited(with event: NSEvent) {
        isHovered = false
        isPressed = false
        needsDisplay = true
        updateIconTint()
    }

    override func mouseDown(with event: NSEvent) {
        Diagnostics.log("usageTips.button.mouseDown", [
            "label": buttonAccessibilityLabel
        ])
        isPressed = true
        needsDisplay = true
        performPressFeedback()
        action?()
        DispatchQueue.main.asyncAfter(deadline: .now() + 0.10) { [weak self] in
            self?.isPressed = false
            self?.needsDisplay = true
        }
    }

    override func draw(_ dirtyRect: NSRect) {
        guard isHovered || isPressed else { return }
        tintColor.withAlphaComponent(isPressed ? 0.14 : 0.08).setFill()
        NSBezierPath(roundedRect: bounds.insetBy(dx: 1, dy: 1), xRadius: 6, yRadius: 6).fill()
        let path = NSBezierPath(roundedRect: bounds.insetBy(dx: 1, dy: 1), xRadius: 8, yRadius: 8)
        let fill = isPressed ? pressedSurfaceColor : isHovered ? hoveredSurfaceColor : surfaceColor
        fill.setFill()
        path.fill()
        borderColor.setStroke()
        path.lineWidth = 1
        path.stroke()
    }

    private func setup(systemImage: String) {
@@ -1355,11 +1661,27 @@
        addSubview(imageView)
        setAccessibilityRole(.button)
    }

    private func updateIconTint() {
        if isPressed, let pressedTintColor {
            imageView.contentTintColor = pressedTintColor
        } else if isHovered, let hoveredTintColor {
            imageView.contentTintColor = hoveredTintColor
        } else {
            imageView.contentTintColor = tintColor
        }
    }
}

private final class AppGridUsageTipDotsView: NSView {
    private var count = 0
    private var selectedIndex = 0
    var selectedColor: NSColor = .labelColor {
        didSet { needsDisplay = true }
    }
    var idleColor: NSColor = NSColor.labelColor.withAlphaComponent(0.28) {
        didSet { needsDisplay = true }
    }

    override var isFlipped: Bool { true }

@@ -1384,7 +1706,7 @@
        for index in 0..<count {
            let selected = index == selectedIndex
            let dotSize: CGFloat = selected ? 6 : 5
            let color = NSColor.labelColor.withAlphaComponent(selected ? 0.85 : 0.28)
            let color = selected ? selectedColor : idleColor
            color.setFill()
            NSBezierPath(
                ovalIn: NSRect(
@@ -1397,6 +1719,7 @@
            x += 5 + spacing
        }
    }

}

private final class AppGridContainerCollectionLayout: NSCollectionViewLayout {
@@ -1961,15 +2284,24 @@
        if displayStyle.usesCardSurface {
            let rect = bounds.insetBy(dx: 0.5, dy: 0.5)
            let path = NSBezierPath(roundedRect: rect, xRadius: 14, yRadius: 14)
            cardSurfaceColor().setFill()
            path.fill()
            if coordinator.isColoredContainerMode || isColorlessActive {
                tagColor.withAlphaComponent(0.30).setFill()
            if coordinator.appGridTheme.usesDarkGlass {
                drawDarkCardSurface(
                    path: path,
                    tagColor: tagColor,
                    isActive: isHovered || isNavigationHighlighted,
                    isTinted: coordinator.isColoredContainerMode || isColorlessActive
                )
            } else {
                cardSurfaceColor().setFill()
                path.fill()
                if coordinator.isColoredContainerMode || isColorlessActive {
                    tagColor.withAlphaComponent(0.30).setFill()
                    path.fill()
                }
                NSColor.labelColor.withAlphaComponent(0.08).setStroke()
                path.lineWidth = 1
                path.stroke()
            }
            NSColor.labelColor.withAlphaComponent(0.08).setStroke()
            path.lineWidth = 1
            path.stroke()
        }

        drawHeader(title: group.name, displayStyle: displayStyle)
@@ -2189,6 +2521,17 @@
            && (isHovered || isNavigationHighlighted)
        let shouldShadow = coordinator.displayStyle.usesCardSurface
            && ((coordinator.isColoredContainerMode && (isHovered || isNavigationHighlighted)) || isColorlessActive)
        if coordinator.appGridTheme.usesDarkGlass && coordinator.displayStyle.usesCardSurface {
            let tagColor = TagColor.nsColor(for: coordinator.tagColors[group?.name ?? ""] ?? 0)
            let active = isHovered || isNavigationHighlighted
            layer?.shadowColor = active
                ? tagColor.withAlphaComponent(0.82).cgColor
                : NSColor.black.withAlphaComponent(0.72).cgColor
            layer?.shadowOpacity = active ? 0.50 : 0.28
            layer?.shadowRadius = active ? 24 : 14
            layer?.shadowOffset = NSSize(width: 0, height: active ? -8 : -4)
            return
        }
        layer?.shadowColor = NSColor.black.cgColor
        layer?.shadowOpacity = shouldShadow ? 0.22 : 0
        layer?.shadowRadius = shouldShadow ? 8 : 0
@@ -2224,6 +2567,40 @@
        return NSColor.white.withAlphaComponent(0.62)
    }

    private func drawDarkCardSurface(
        path: NSBezierPath,
        tagColor: NSColor,
        isActive: Bool,
        isTinted: Bool
    ) {
        NSGraphicsContext.saveGraphicsState()
        if isActive {
            let glow = NSShadow()
            glow.shadowColor = tagColor.withAlphaComponent(0.36)
            glow.shadowBlurRadius = 28
            glow.shadowOffset = NSSize(width: 0, height: -8)
            glow.set()
        }
        NSColor(calibratedRed: 0.12, green: 0.18, blue: 0.25, alpha: 0.58).setFill()
        path.fill()
        NSGraphicsContext.restoreGraphicsState()

        if isTinted {
            tagColor.withAlphaComponent(isActive ? 0.18 : 0.10).setFill()
            path.fill()
        }

        NSColor.white.withAlphaComponent(isActive ? 0.08 : 0.045).setFill()
        path.fill()

        let strokeColor = isActive
            ? tagColor.withAlphaComponent(0.72)
            : NSColor.white.withAlphaComponent(0.18)
        strokeColor.setStroke()
        path.lineWidth = isActive ? 1.4 : 1.0
        path.stroke()
    }

    private func drawHeader(title: String, displayStyle: AppGridCollectionDisplayMode) {
        let horizontalInset = displayStyle.usesCardSurface ? AppGridCollectionMetrics.cardPadding : 0
        let verticalInset = displayStyle.usesCardSurface ? AppGridCollectionMetrics.cardPadding : 0
@@ -2233,9 +2610,13 @@
            width: max(1, bounds.width - horizontalInset * 2),
            height: AppGridCollectionMetrics.headerHeight
        )
        let isDarkGrid = coordinator?.appGridTheme.usesDarkGlass == true
        let headerTextColor = isDarkGrid
            ? NSColor.white.withAlphaComponent(0.74)
            : NSColor.secondaryLabelColor
        let attributes: [NSAttributedString.Key: Any] = [
            .font: NSFont.systemFont(ofSize: 18, weight: .semibold),
            .foregroundColor: NSColor.secondaryLabelColor,
            .foregroundColor: headerTextColor,
            .paragraphStyle: centeredParagraph(lineBreak: .byTruncatingMiddle)
        ]
        let titleSize = title.size(withAttributes: attributes)
@@ -2247,7 +2628,9 @@
            height: headerRect.height - 6
        )
        let lineY = headerRect.midY
        NSColor.secondaryLabelColor.withAlphaComponent(0.25).setStroke()
        (isDarkGrid ? NSColor.white : NSColor.secondaryLabelColor)
            .withAlphaComponent(isDarkGrid ? 0.16 : 0.25)
            .setStroke()
        let leftLine = NSBezierPath()
        leftLine.move(to: NSPoint(x: headerRect.minX, y: lineY))
        leftLine.line(to: NSPoint(x: max(headerRect.minX, titleRect.minX - 2), y: lineY))