Skip to content

👾 Open Computer Use – Open-Source Alternative to Codex Computer Use

Refine permission onboarding panel

ifuryst9bd2e4261214
diff --git a/apps/OpenComputerUse/Sources/OpenComputerUse/PermissionOnboardingApp.swift b/apps/OpenComputerUse/Sources/OpenComputerUse/PermissionOnboardingApp.swift
index a9bbd3e..d018cff 100644
--- a/apps/OpenComputerUse/Sources/OpenComputerUse/PermissionOnboardingApp.swift
+++ b/apps/OpenComputerUse/Sources/OpenComputerUse/PermissionOnboardingApp.swift
@@ -1,6 +1,7 @@
import AppKit
import ApplicationServices
import OpenComputerUseKit
+import QuartzCore
@MainActor
enum PermissionOnboardingApp {
@@ -38,7 +39,9 @@ final class PermissionOnboardingAppDelegate: NSObject, NSApplicationDelegate {
@MainActor
final class PermissionWindowController: NSWindowController {
private let contentController = PermissionContentController()
- private let accessoryPanelController = PermissionAccessoryPanelController()
+ private lazy var accessoryPanelController = PermissionAccessoryPanelController { [weak self] in
+ self?.handleAccessoryPanelBack()
+ }
init() {
let window = NSWindow(
@@ -73,13 +76,17 @@ final class PermissionWindowController: NSWindowController {
@MainActor
extension PermissionWindowController: PermissionContentControllerDelegate {
- func permissionContentController(_ controller: PermissionContentController, didRequestPermission permission: SystemPermissionKind) {
+ func permissionContentController(
+ _ controller: PermissionContentController,
+ didRequestPermission permission: SystemPermissionKind,
+ sourceFrameInScreen: CGRect?
+ ) {
if permission == .accessibility {
PermissionSupport.requestAccessibilityPrompt()
}
PermissionSupport.openSystemSettings(for: permission)
- accessoryPanelController.show(for: permission)
+ accessoryPanelController.show(for: permission, sourceFrameInScreen: sourceFrameInScreen)
contentController.setActiveGuidance(permission)
}
@@ -92,11 +99,23 @@ extension PermissionWindowController: PermissionContentControllerDelegate {
close()
NSApp.terminate(nil)
}
+
+ private func handleAccessoryPanelBack() {
+ accessoryPanelController.hide()
+ contentController.setActiveGuidance(nil)
+ showWindow(nil)
+ window?.makeKeyAndOrderFront(nil)
+ NSApp.activate(ignoringOtherApps: true)
+ }
}
@MainActor
protocol PermissionContentControllerDelegate: AnyObject {
- func permissionContentController(_ controller: PermissionContentController, didRequestPermission permission: SystemPermissionKind)
+ func permissionContentController(
+ _ controller: PermissionContentController,
+ didRequestPermission permission: SystemPermissionKind,
+ sourceFrameInScreen: CGRect?
+ )
func permissionContentControllerDidResolveGuidance(_ controller: PermissionContentController)
func permissionContentControllerDidCompleteAllPermissions(_ controller: PermissionContentController)
}
@@ -256,11 +275,15 @@ final class PermissionContentController: NSViewController {
}
let card = PermissionCardView(permission: permission, diagnostics: diagnostics)
- card.onAllow = { [weak self] requestedPermission in
+ card.onAllow = { [weak self] requestedPermission, sourceFrameInScreen in
guard let self else {
return
}
- self.delegate?.permissionContentController(self, didRequestPermission: requestedPermission)
+ self.delegate?.permissionContentController(
+ self,
+ didRequestPermission: requestedPermission,
+ sourceFrameInScreen: sourceFrameInScreen
+ )
}
cardsContainer.addArrangedSubview(card)
card.widthAnchor.constraint(equalToConstant: PermissionOnboardingLayout.cardWidth).isActive = true
@@ -272,10 +295,11 @@ final class PermissionContentController: NSViewController {
@MainActor
final class PermissionCardView: NSView {
- var onAllow: ((SystemPermissionKind) -> Void)?
+ var onAllow: ((SystemPermissionKind, CGRect?) -> Void)?
private let permission: SystemPermissionKind
private let diagnostics: PermissionDiagnostics
+ private weak var actionButton: PrimaryActionButton?
init(permission: SystemPermissionKind, diagnostics: PermissionDiagnostics) {
self.permission = permission
@@ -352,6 +376,7 @@ final class PermissionCardView: NSView {
content.addArrangedSubview(done)
} else {
let button = PrimaryActionButton(title: "Allow", target: self, action: #selector(handleAllow))
+ actionButton = button
content.addArrangedSubview(button)
button.widthAnchor.constraint(equalToConstant: PermissionOnboardingLayout.actionButtonWidth).isActive = true
button.heightAnchor.constraint(equalToConstant: PermissionOnboardingLayout.actionButtonHeight).isActive = true
@@ -376,7 +401,16 @@ final class PermissionCardView: NSView {
@objc
private func handleAllow() {
- onAllow?(permission)
+ onAllow?(permission, actionButtonScreenFrame())
+ }
+
+ private func actionButtonScreenFrame() -> CGRect? {
+ guard let actionButton, let window = actionButton.window else {
+ return nil
+ }
+
+ let frameInWindow = actionButton.convert(actionButton.bounds, to: nil)
+ return window.convertToScreen(frameInWindow)
}
}
@@ -425,18 +459,31 @@ final class GuidancePlaceholderView: NSView {
@MainActor
final class PermissionAccessoryPanelController {
- private let bootstrapRetryInterval: TimeInterval = 0.15
- private let bootstrapRetryLimit = 24
+ private let onBack: () -> Void
+ private let trackingInterval: TimeInterval = 0.15
+ private let launchAnimationDuration: TimeInterval = 0.72
+ private let launchAnimationResponse = 0.72
+ private let launchAnimationDampingFraction = 1.0
+ private let launchInitialAlpha: CGFloat = 0.9
private var panel: NSPanel?
private var currentPermission: SystemPermissionKind?
private var workspaceObserver: NSObjectProtocol?
private var globalDragMonitor: Any?
private var localDragMonitor: Any?
private var orderedWindowNumber: Int?
- private var bootstrapRetryTimer: Timer?
- private var bootstrapRetriesRemaining = 0
+ private var trackingTimer: Timer?
+ private var pendingSourceFrameInScreen: CGRect?
+ private var didPresentCurrentPanel = false
+ private var launchDisplayLink: CADisplayLink?
+ private var launchStartTime: CFTimeInterval = 0
+ private var launchFromFrame = NSRect.zero
+ private var launchToFrame = NSRect.zero
+ private var isAnimatingLaunch = false
+ private var launchSettleGeneration = 0
private enum Layout {
+ static let panelWidth: CGFloat = 530
+ static let panelHeight: CGFloat = 109
static let screenHorizontalInset: CGFloat = 16
static let screenBottomInset: CGFloat = 12
static let windowBottomOverlap: CGFloat = 6
@@ -457,8 +504,14 @@ final class PermissionAccessoryPanelController {
let windowNumber: Int
}
- func show(for permission: SystemPermissionKind) {
+ init(onBack: @escaping () -> Void) {
+ self.onBack = onBack
+ }
+
+ func show(for permission: SystemPermissionKind, sourceFrameInScreen: CGRect?) {
currentPermission = permission
+ pendingSourceFrameInScreen = sourceFrameInScreen
+ didPresentCurrentPanel = false
let panel = panel ?? makePanel()
self.panel = panel
@@ -468,22 +521,25 @@ final class PermissionAccessoryPanelController {
}
installObserversIfNeeded()
- position(panel: panel)
+ startTrackingTimer()
updatePanelVisibility()
- startBootstrapRetries()
}
func hide() {
- stopBootstrapRetries()
+ stopLaunchAnimation()
+ stopTrackingTimer()
removeObservers()
panel?.orderOut(nil)
+ panel?.alphaValue = 1
currentPermission = nil
orderedWindowNumber = nil
+ pendingSourceFrameInScreen = nil
+ didPresentCurrentPanel = false
}
private func makePanel() -> NSPanel {
let panel = NSPanel(
- contentRect: NSRect(x: 0, y: 0, width: 452, height: 102),
+ contentRect: NSRect(x: 0, y: 0, width: Layout.panelWidth, height: Layout.panelHeight),
styleMask: [.borderless, .nonactivatingPanel],
backing: .buffered,
defer: false
@@ -493,7 +549,8 @@ final class PermissionAccessoryPanelController {
panel.isOpaque = false
panel.hasShadow = true
panel.collectionBehavior = [.canJoinAllSpaces, .transient, .fullScreenAuxiliary]
- panel.contentView = PermissionAccessoryPanelView()
+ panel.animationBehavior = .none
+ panel.contentView = PermissionAccessoryPanelView(onBack: onBack)
return panel
}
@@ -546,41 +603,34 @@ final class PermissionAccessoryPanelController {
}
}
- private func startBootstrapRetries() {
- stopBootstrapRetries()
- bootstrapRetriesRemaining = bootstrapRetryLimit
- bootstrapRetryTimer = Timer.scheduledTimer(withTimeInterval: bootstrapRetryInterval, repeats: true) { [weak self] _ in
+ private func startTrackingTimer() {
+ stopTrackingTimer()
+ let timer = Timer(timeInterval: trackingInterval, repeats: true) { [weak self] _ in
Task { @MainActor [weak self] in
- self?.handleBootstrapRetryTick()
+ self?.handleTrackingTick()
}
}
- bootstrapRetryTimer?.tolerance = 0.03
+ timer.tolerance = 0.03
+ RunLoop.main.add(timer, forMode: .common)
+ trackingTimer = timer
}
- private func stopBootstrapRetries() {
- bootstrapRetryTimer?.invalidate()
- bootstrapRetryTimer = nil
- bootstrapRetriesRemaining = 0
+ private func stopTrackingTimer() {
+ trackingTimer?.invalidate()
+ trackingTimer = nil
}
- private func handleBootstrapRetryTick() {
+ private func handleTrackingTick() {
updatePanelVisibility()
refreshPosition()
-
- let shouldStop = bootstrapRetriesRemaining <= 0 || (panel?.isVisible ?? false)
- bootstrapRetriesRemaining -= 1
-
- if shouldStop {
- stopBootstrapRetries()
- }
}
private func refreshPosition() {
- guard let panel, currentPermission != nil, panel.isVisible else {
+ guard let panel, currentPermission != nil, panel.isVisible, let windowContext = systemSettingsWindowContext() else {
return
}
- position(panel: panel)
+ position(panel: panel, windowBounds: windowContext.bounds)
}
private func updatePanelVisibility() {
@@ -589,37 +639,200 @@ final class PermissionAccessoryPanelController {
}
guard isSystemSettingsFrontmost, let windowContext = systemSettingsWindowContext() else {
+ stopLaunchAnimation()
panel.orderOut(nil)
return
}
- if orderedWindowNumber != windowContext.windowNumber || panel.isVisible == false {
- panel.order(.above, relativeTo: windowContext.windowNumber)
+ let panelWasVisible = panel.isVisible
+
+ if didPresentCurrentPanel == false {
+ presentPanel(
+ panel: panel,
+ from: pendingSourceFrameInScreen,
+ relativeTo: windowContext
+ )
+ didPresentCurrentPanel = true
+ } else {
+ let previousOrderedWindowNumber = orderedWindowNumber
orderedWindowNumber = windowContext.windowNumber
+ position(panel: panel, windowBounds: windowContext.bounds)
+ if previousOrderedWindowNumber != windowContext.windowNumber || panelWasVisible == false {
+ panel.order(.above, relativeTo: windowContext.windowNumber)
+ }
}
- if panel.isVisible {
- stopBootstrapRetries()
- }
}
- private func position(panel: NSPanel) {
- guard let windowContext = systemSettingsWindowContext() else {
+ private func position(panel: NSPanel, windowBounds: CGRect) {
+ guard let origin = preferredPanelOrigin(
+ for: panel.frame.size,
+ windowBounds: windowBounds
+ ) else {
+ return
+ }
+
+ if isAnimatingLaunch {
+ launchToFrame.origin = origin
return
}
- guard let origin = preferredPanelOrigin(
+ if panel.frame.origin != origin {
+ panel.setFrameOrigin(origin)
+ }
+ }
+
+ private func presentPanel(
+ panel: NSPanel,
+ from sourceFrameInScreen: CGRect?,
+ relativeTo windowContext: SystemSettingsWindowContext
+ ) {
+ guard let targetOrigin = preferredPanelOrigin(
for: panel.frame.size,
windowBounds: windowContext.bounds
) else {
return
}
- if panel.frame.origin != origin {
- panel.setFrameOrigin(origin)
+ let targetFrame = NSRect(origin: targetOrigin, size: panel.frame.size)
+ orderedWindowNumber = windowContext.windowNumber
+
+ guard let sourceFrameInScreen, sourceFrameInScreen.isEmpty == false else {
+ stopLaunchAnimation()
+ panel.alphaValue = 1
+ panel.setFrame(targetFrame, display: false)
+ panel.order(.above, relativeTo: windowContext.windowNumber)
+ return
+ }
+
+ stopLaunchAnimation()
+ isAnimatingLaunch = true
+ launchFromFrame = sourceFrameInScreen
+ launchToFrame = targetFrame
+ launchStartTime = CACurrentMediaTime()
+ launchSettleGeneration += 1
+
+ panel.alphaValue = launchInitialAlpha
+ panel.setFrame(sourceFrameInScreen, display: false)
+ panel.order(.above, relativeTo: windowContext.windowNumber)
+ stepLaunchAnimation()
+
+ let displayLink = panel.displayLink(target: self, selector: #selector(displayLinkDidFire(_:)))
+ displayLink.add(to: .main, forMode: .common)
+ launchDisplayLink = displayLink
+ scheduleLaunchSettlePasses(for: launchSettleGeneration)
+ }
+
+ @objc
+ private func displayLinkDidFire(_ displayLink: CADisplayLink) {
+ stepLaunchAnimation()
+ }
+
+ private func stepLaunchAnimation() {
+ guard let panel else {
+ stopLaunchAnimation()
+ return
+ }
+
+ let elapsed = max(0, CACurrentMediaTime() - launchStartTime)
+ if elapsed >= launchAnimationDuration {
+ isAnimatingLaunch = false
+ stopLaunchAnimation()
+ panel.alphaValue = 1
+ updateLaunchTargetFrameIfNeeded()
+ panel.setFrame(launchToFrame, display: true)
+ if let orderedWindowNumber {
+ panel.order(.above, relativeTo: orderedWindowNumber)
+ }
+ return
+ }
+
+ let progress = springProgress(at: elapsed)
+ panel.alphaValue = launchInitialAlpha + ((1 - launchInitialAlpha) * progress)
+ panel.setFrame(curvedFrame(from: launchFromFrame, to: launchToFrame, progress: progress), display: true)
+ if let orderedWindowNumber {
+ panel.order(.above, relativeTo: orderedWindowNumber)
}
}
+ private func stopLaunchAnimation() {
+ isAnimatingLaunch = false
+ launchDisplayLink?.invalidate()
+ launchDisplayLink = nil
+ }
+
+ private func updateLaunchTargetFrameIfNeeded() {
+ guard
+ let panel,
+ let windowContext = systemSettingsWindowContext(),
+ let origin = preferredPanelOrigin(for: panel.frame.size, windowBounds: windowContext.bounds)
+ else {
+ return
+ }
+
+ orderedWindowNumber = windowContext.windowNumber
+ launchToFrame = NSRect(origin: origin, size: panel.frame.size)
+ }
+
+ private func scheduleLaunchSettlePasses(for generation: Int) {
+ let delays: [TimeInterval] = [0.18, 0.42, 0.84, 1.2]
+
+ for delay in delays {
+ DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
+ Task { @MainActor [weak self] in
+ guard let self, self.currentPermission != nil, self.launchSettleGeneration == generation else {
+ return
+ }
+ self.updatePanelVisibility()
+ self.refreshPosition()
+ }
+ }
+ }
+ }
+
+ private func springProgress(at elapsed: TimeInterval) -> CGFloat {
+ let omega = (2 * Double.pi) / launchAnimationResponse
+ let t = max(0, elapsed)
+ let progress: Double
+
+ if abs(launchAnimationDampingFraction - 1) < 0.0001 {
+ progress = 1 - exp(-omega * t) * (1 + (omega * t))
+ } else {
+ progress = min(1, t / launchAnimationDuration)
+ }
+
+ return min(max(progress, 0), 1)
+ }
+
+ private func curvedFrame(from: NSRect, to: NSRect, progress: CGFloat) -> NSRect {
+ let size = NSSize(
+ width: from.size.width + ((to.size.width - from.size.width) * progress),
+ height: from.size.height + ((to.size.height - from.size.height) * progress)
+ )
+
+ let startCenter = CGPoint(x: from.midX, y: from.midY)
+ let endCenter = CGPoint(x: to.midX, y: to.midY)
+ let midPoint = CGPoint(
+ x: (startCenter.x + endCenter.x) * 0.5,
+ y: max(startCenter.y, endCenter.y)
+ )
+ let distance = hypot(endCenter.x - startCenter.x, endCenter.y - startCenter.y)
+ let lift = min(140, max(44, distance * 0.18))
+ let controlPoint = CGPoint(x: midPoint.x, y: midPoint.y + lift)
+ let inverse = 1 - progress
+ let center = CGPoint(
+ x: (inverse * inverse * startCenter.x) + (2 * inverse * progress * controlPoint.x) + (progress * progress * endCenter.x),
+ y: (inverse * inverse * startCenter.y) + (2 * inverse * progress * controlPoint.y) + (progress * progress * endCenter.y)
+ )
+
+ return NSRect(
+ x: center.x - (size.width * 0.5),
+ y: center.y - (size.height * 0.5),
+ width: size.width,
+ height: size.height
+ )
+ }
+
private func preferredPanelOrigin(
for panelSize: CGSize,
windowBounds: CGRect
@@ -740,19 +953,45 @@ final class PermissionAccessoryPanelController {
@MainActor
final class PermissionAccessoryPanelView: NSView {
+ private let onBack: () -> Void
private let instructionLabel = NSTextField(labelWithString: "")
private let dragTileView = DraggableAppTileView()
- init() {
+ init(onBack: @escaping () -> Void) {
+ self.onBack = onBack
super.init(frame: .zero)
translatesAutoresizingMaskIntoConstraints = false
- wantsLayer = true
- layer?.cornerRadius = 20
- layer?.backgroundColor = NSColor(calibratedWhite: 0.98, alpha: 0.96).cgColor
- layer?.shadowColor = NSColor.black.withAlphaComponent(0.14).cgColor
- layer?.shadowOpacity = 1
- layer?.shadowRadius = 18
- layer?.shadowOffset = CGSize(width: 0, height: -5)
+ setup()
+ }
+
+ private func setup() {
+ let materialView = NSVisualEffectView()
+ materialView.translatesAutoresizingMaskIntoConstraints = false
+ materialView.material = .popover
+ materialView.blendingMode = .behindWindow
+ materialView.state = .active
+ materialView.wantsLayer = true
+ materialView.layer?.cornerRadius = 20
+ materialView.layer?.masksToBounds = true
+ materialView.layer?.borderWidth = 0.5
+ materialView.layer?.borderColor = NSColor.separatorColor.withAlphaComponent(0.18).cgColor
+ addSubview(materialView)
+
+ let tintView = NSView()
+ tintView.translatesAutoresizingMaskIntoConstraints = false
+ tintView.wantsLayer = true
+ tintView.layer?.backgroundColor = NSColor.windowBackgroundColor.withAlphaComponent(0.8).cgColor
+ materialView.addSubview(tintView)
+
+ let backChrome = NSView()
+ backChrome.translatesAutoresizingMaskIntoConstraints = false
+ backChrome.wantsLayer = true
+ backChrome.layer?.backgroundColor = NSColor.controlBackgroundColor.withAlphaComponent(0.95).cgColor
+ backChrome.layer?.cornerRadius = 16
+ materialView.addSubview(backChrome)
+
+ let backButton = AccessoryBackButton(target: self, action: #selector(handleBack))
+ backChrome.addSubview(backButton)
let arrow = NSImageView()
arrow.translatesAutoresizingMaskIntoConstraints = false
@@ -769,24 +1008,44 @@ final class PermissionAccessoryPanelView: NSView {
dragTileView.translatesAutoresizingMaskIntoConstraints = false
- addSubview(arrow)
- addSubview(instructionLabel)
- addSubview(dragTileView)
+ materialView.addSubview(arrow)
+ materialView.addSubview(instructionLabel)
+ materialView.addSubview(dragTileView)
NSLayoutConstraint.activate([
- arrow.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 18),
- arrow.topAnchor.constraint(equalTo: topAnchor, constant: 16),
- arrow.widthAnchor.constraint(equalToConstant: 32),
- arrow.heightAnchor.constraint(equalToConstant: 32),
-
- instructionLabel.leadingAnchor.constraint(equalTo: arrow.trailingAnchor, constant: 12),
+ materialView.leadingAnchor.constraint(equalTo: leadingAnchor),
+ materialView.trailingAnchor.constraint(equalTo: trailingAnchor),
+ materialView.topAnchor.constraint(equalTo: topAnchor),
+ materialView.bottomAnchor.constraint(equalTo: bottomAnchor),
+
+ tintView.leadingAnchor.constraint(equalTo: materialView.leadingAnchor),
+ tintView.trailingAnchor.constraint(equalTo: materialView.trailingAnchor),
+ tintView.topAnchor.constraint(equalTo: materialView.topAnchor),
+ tintView.bottomAnchor.constraint(equalTo: materialView.bottomAnchor),
+
+ backChrome.leadingAnchor.constraint(equalTo: materialView.leadingAnchor, constant: 18),
+ backChrome.topAnchor.constraint(equalTo: materialView.topAnchor, constant: 52),
+ backChrome.widthAnchor.constraint(equalToConstant: 32),
+ backChrome.heightAnchor.constraint(equalToConstant: 32),
+
+ backButton.centerXAnchor.constraint(equalTo: backChrome.centerXAnchor),
+ backButton.centerYAnchor.constraint(equalTo: backChrome.centerYAnchor),
+ backButton.widthAnchor.constraint(equalToConstant: 14),
+ backButton.heightAnchor.constraint(equalToConstant: 14),
+
+ arrow.leadingAnchor.constraint(equalTo: materialView.leadingAnchor, constant: 35),
+ arrow.topAnchor.constraint(equalTo: materialView.topAnchor, constant: 10),
+ arrow.widthAnchor.constraint(equalToConstant: 28),
+ arrow.heightAnchor.constraint(equalToConstant: 28),
+
+ instructionLabel.leadingAnchor.constraint(equalTo: arrow.trailingAnchor, constant: 10),
instructionLabel.centerYAnchor.constraint(equalTo: arrow.centerYAnchor),
- instructionLabel.trailingAnchor.constraint(lessThanOrEqualTo: trailingAnchor, constant: -18),
+ instructionLabel.trailingAnchor.constraint(equalTo: materialView.trailingAnchor, constant: -22),
- dragTileView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 54),
- dragTileView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -16),
- dragTileView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -12),
- dragTileView.heightAnchor.constraint(equalToConstant: 42),
+ dragTileView.leadingAnchor.constraint(equalTo: materialView.leadingAnchor, constant: 64),
+ dragTileView.trailingAnchor.constraint(equalTo: materialView.trailingAnchor, constant: -21),
+ dragTileView.topAnchor.constraint(equalTo: materialView.topAnchor, constant: 47),
+ dragTileView.heightAnchor.constraint(equalToConstant: 43)
])
}
@@ -798,6 +1057,11 @@ final class PermissionAccessoryPanelView: NSView {
func configure(permission: SystemPermissionKind) {
instructionLabel.stringValue = permission.dragInstruction
}
+
+ @objc
+ private func handleBack() {
+ onBack()
+ }
}
@MainActor
@@ -839,7 +1103,8 @@ final class DraggableAppTileView: NSView, NSDraggingSource {
let draggingItem = NSDraggingItem(pasteboardWriter: bundleURL as NSURL)
draggingItem.setDraggingFrame(bounds, contents: snapshotImage())
- beginDraggingSession(with: [draggingItem], event: event, source: self)
+ let session = beginDraggingSession(with: [draggingItem], event: event, source: self)
+ session.animatesToStartingPositionsOnCancelOrFail = true
}
func draggingSession(_ session: NSDraggingSession, sourceOperationMaskFor context: NSDraggingContext) -> NSDragOperation {
@@ -1069,3 +1334,35 @@ final class PrimaryActionButton: NSButton {
alphaValue = isEnabled ? 1 : 0.45
}
}
+
+@MainActor
+final class AccessoryBackButton: NSButton {
+ override var isHighlighted: Bool {
+ didSet {
+ alphaValue = isHighlighted ? 0.66 : 1
+ }
+ }
+
+ init(target: AnyObject?, action: Selector) {
+ super.init(frame: .zero)
+ self.target = target
+ self.action = action
+ translatesAutoresizingMaskIntoConstraints = false
+ isBordered = false
+ focusRingType = .none
+ image = NSImage(systemSymbolName: "chevron.left", accessibilityDescription: "Back")
+ contentTintColor = NSColor.labelColor.withAlphaComponent(0.72)
+ if let cell = cell as? NSButtonCell {
+ cell.imagePosition = .imageOnly
+ }
+ }
+
+ @available(*, unavailable)
+ required init?(coder: NSCoder) {
+ nil
+ }
+
+ override func acceptsFirstMouse(for event: NSEvent?) -> Bool {
+ true
+ }
+}
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 7219caa..af04fd5 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -32,7 +32,7 @@
- `OpenComputerUse` 默认 app 模式会拉起 `PermissionOnboardingApp`。
- app bundle 以 `LSUIElement` agent-style 形态运行,默认不在 Dock 暴露常驻图标,但仍可按需显示权限窗口。
- 主窗口负责渲染 `Accessibility` / `Screen & System Audio Recording` 两类权限卡片、`Allow` / `Done` 状态和 relaunch 后的状态收敛;当两项权限都已完成时会自动关闭,不再要求用户手动退出。
-- 辅助 drag panel 会跳转到对应的 `System Settings` 页面;默认保持在窗口右侧内容区下方居中并固定贴近窗口底边,不再依赖实时扫描权限页内部 `+ / -` 控件行;窗口层级上会显式排在当前 `System Settings` 窗口之上,避免被权限列表内容盖住,同时尽量减少对系统设置自身滚动区域的干扰。
+- 辅助 drag panel 会跳转到对应的 `System Settings` 页面;点击 `Allow` 后,panel 会从主窗口里的按钮位置做一段 spring + curved frame 的入场,再落到 `System Settings` 内容区下沿。panel 默认保持在窗口右侧内容区下方居中并固定贴近窗口底边,不再依赖实时扫描权限页内部 `+ / -` 控件行;窗口层级上会显式排在当前 `System Settings` 窗口之上,避免被权限列表内容盖住,同时尽量减少对系统设置自身滚动区域的干扰。panel 内也补了显式返回按钮,允许用户中断当前 guidance、回到 onboarding 主窗口重新选择权限步骤。
- 权限状态优先基于 TCC 持久授权记录判断,避免 CLI 子进程与 GUI app 对授权状态看到不一致的结果;同时会兼容 bundle-id 和路径型授权记录,并在源码启动场景下优先认 npm 全局安装后的稳定 `.app` 路径,仓库内 `dist/` 产物只作为开发兜底。
### 2. MCP 层
@@ -83,7 +83,7 @@
- 开源版当前不复刻官方闭源实现里的 caller signing、私有 IPC、完整 overlay choreography 和 plugin 自安装逻辑。
- 因为官方 `SkyComputerUseClient` 带有宿主侧 launch constraints,普通 stdio MCP client 在本机上可能被系统直接杀掉;如果要探测官方 bundled `computer-use`,默认应通过 `scripts/computer-use-cli` 的 app-server 模式走已签名的 Codex 宿主。
-- 当前权限引导已经具备可运行 app、深链和拖拽辅助;点击链路也已经补上独立 visual cursor、官方 asset fallback 和相对目标 window 的排序逻辑,但整体还没有完全复刻官方那套嵌入式 choreography / host 集成 / session approval 体验。
+- 当前权限引导已经具备可运行 app、深链、拖拽辅助,以及一版更接近官方的 accessory panel 入场动画和返回 affordance;点击链路也已经补上独立 visual cursor、官方 asset fallback 和相对目标 window 的排序逻辑,但整体还没有完全复刻官方那套嵌入式 choreography / host 集成 / session approval 体验。
- screenshot 当前使用系统窗口截图 API,但默认直接以 MCP `image` content block 的 base64 PNG 返回,不再把普通 app 截图落盘到仓库或临时目录。
- 会话状态现在是进程内内存态,保存每个 app 最近一次 snapshot 和 element index 映射。
diff --git a/docs/exec-plans/active/20260417-permission-onboarding-app.md b/docs/exec-plans/active/20260417-permission-onboarding-app.md
index 7033eaa..dd5578c 100644
--- a/docs/exec-plans/active/20260417-permission-onboarding-app.md
+++ b/docs/exec-plans/active/20260417-permission-onboarding-app.md
@@ -75,9 +75,11 @@
- 2026-04-17:权限状态判定加入对 TCC 持久授权记录的读取,避免 dev 环境里 CLI 子进程与 GUI app 对同一 bundle 权限状态看到不一致的结果。
- 2026-04-17:drag panel 仍然只在 `System Settings` 前台时显示;水平位置维持窗口右侧内容区居中,垂直位置优先跟随当前权限页的 `+ / -` 控制行,只有拿不到控件几何时才回退到窗口底边,避免在 `Screen & System Audio Recording` 这类长页面里被吸到屏幕最下方。
- 2026-04-17:app 模式改成 `LSUIElement` + `.accessory` agent-style 运行,保证权限窗口可见,但执行过程中不再额外在 Dock 暴露前台 app 图标。
+- 2026-04-19:accessory panel 的第一次出现改成从主窗口 `Allow` 按钮 source frame 飞入 `System Settings` 内容区下沿,使用 spring + curved frame 过渡;同时 panel 内补显式返回按钮,把中断 guidance 的动作收回到 app 内。
## 当前结论
- app 模式、System Settings 深链、drag tile、`.app` 打包和主窗口 `Done` 状态已经可用。
+- accessory panel 现在具备一次性的 source-to-target 入场动画和显式返回按钮,权限切换时不再只能依赖硬切和手动切回主窗口。
- `swift test`、`./scripts/run-tool-smoke-tests.sh`、`doctor` 和真实 `System Settings snapshot` 都已通过。
- 官方那种“像嵌入在 `System Settings` 里的 accessory UI” 仍然是后续 UI 收敛项,不作为这轮功能验证阻塞。
diff --git a/docs/histories/2026-04/20260419-2135-refine-permission-panel-transition-and-back-button.md b/docs/histories/2026-04/20260419-2135-refine-permission-panel-transition-and-back-button.md
new file mode 100644
index 0000000..048418f
--- /dev/null
+++ b/docs/histories/2026-04/20260419-2135-refine-permission-panel-transition-and-back-button.md
@@ -0,0 +1,28 @@
+## [2026-04-19 21:35] | Task: 收紧权限浮窗出场动画和返回交互
+
+### 🤖 Execution Context
+* **Agent ID**: `codex`
+* **Base Model**: `gpt-5`
+* **Runtime**: `Codex CLI`
+
+### 📥 User Query
+> 参考一下 permiso。我们提升一下权限浮窗相关的,主要是点击 allow 后的出现动画,还有浮窗里的返回按钮。
+
+### 🛠 Changes Overview
+**Scope:** `apps/OpenComputerUse`、`docs/`
+
+**Key Actions:**
+- **[Allow Source Tracking]**: 把主 onboarding 卡片里的 `Allow` 按钮屏幕坐标沿着 delegate 链路传到 accessory panel controller,让浮窗第一次出现时能拿到明确的 source frame。
+- **[Launch Transition]**: 给权限浮窗补了一段参考 `permiso` 的 spring + curved frame 入场动画;当 `System Settings` 冷启动或窗口稍后才 ready 时,仍然会在第一次真正挂到目标窗口时执行这段 transition。
+- **[Post-Launch Reanchor]**: 把 panel 定位从“冷启动重试几次后停止”改成 guidance 期间持续按 `.common` run loop timer 跟踪 `System Settings` 的窗口 frame,并在 launch 结束前后额外做几次 settle pass,修正动画结束后系统窗口再 settle 一次时 panel 会停在旧位置、必须手动点一下才归位的问题。
+- **[Back Affordance]**: 给 accessory panel 加入 material 风格的返回按钮,并把点击动作接回 onboarding 主窗口:隐藏当前 guidance、恢复卡片列表、重新激活 app。
+- **[Drag Polish]**: 拖拽 tile 现在在取消或失败时会回弹到初始位置,减少和新浮窗过渡割裂的感觉。
+- **[Docs Sync]**: 更新架构文档,记录权限 panel 现在具备 source-to-target 入场和显式返回按钮。
+
+### 🧠 Design Intent (Why)
+这轮不是再扩权限功能边界,而是收紧交互质感。现有实现虽然已经能跳页、跟窗和拖拽,但 `Allow` 之后的 panel 还是“硬切”出来,和官方/`permiso` 那种从触发点飞入 `System Settings` 的引导感差一截;同时 panel 内缺少返回 affordance,用户一旦想中断当前步骤,只能自己切回主窗口。把 source-tracked transition 和返回按钮补齐后,权限引导的节奏会更连贯,也更容易在两项权限之间来回切换。
+
+### 📁 Files Modified
+- `apps/OpenComputerUse/Sources/OpenComputerUse/PermissionOnboardingApp.swift`
+- `docs/ARCHITECTURE.md`
+- `docs/histories/2026-04/20260419-2135-refine-permission-panel-transition-and-back-button.md`