Cloud: keep terminal creation targets and errors visible

Resources/Localizable.xcstrings

@@ -259926,6 +259926,65 @@
         }
       }
     },
+    "mobile.pairing.error.preparationFailed": {
+      "extractionState": "manual",
+      "localizations": {
+        "ar": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "تعذّر إكمال الاقتران. تحقق من الاتصال وحاول مرة أخرى."
+          }
+        },
+        "de": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Die Kopplung konnte nicht abgeschlossen werden. Überprüfe deine Verbindung und versuche es erneut."
+          }
+        },
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Pairing could not finish. Check your connection and try again."
+          }
+        },
+        "es": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "No se ha podido completar el enlace. Comprueba tu conexión e inténtalo de nuevo."
+          }
+        },
+        "fr": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Le jumelage n’a pas pu être terminé. Vérifiez votre connexion et réessayez."
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ペアリングを完了できませんでした。接続を確認して、もう一度お試しください。"
+          }
+        },
+        "ko": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "페어링을 완료하지 못했습니다. 연결을 확인하고 다시 시도하세요."
+          }
+        },
+        "zh-Hans": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "无法完成配对。请检查连接后重试。"
+          }
+        },
+        "zh-Hant": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "無法完成配對。請檢查連線後再試一次。"
+          }
+        }
+      }
+    },
     "mobile.pairing.error.noTicket": {
       "extractionState": "manual",
       "localizations": {
@@ -518601,6 +518660,20 @@
         }
       }
     },
+    "cloud.operation.failure.placement": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {"stringUnit": {"state": "translated", "value": "The Cloud terminal placement is unavailable. Refresh the machine, then retry."}},
+        "de": {"stringUnit": {"state": "translated", "value": "Die Cloud-Terminalplatzierung ist nicht verfügbar. Aktualisieren Sie die Maschine und versuchen Sie es erneut."}},
+        "fr": {"stringUnit": {"state": "translated", "value": "L’emplacement du terminal Cloud n’est pas disponible. Actualisez la machine, puis réessayez."}},
+        "ar": {"stringUnit": {"state": "translated", "value": "موضع طرفية Cloud غير متاح. حدّث الجهاز ثم أعد المحاولة."}},
+        "es": {"stringUnit": {"state": "translated", "value": "La ubicación del terminal de Cloud no está disponible. Actualiza la máquina y vuelve a intentarlo."}},
+        "zh-Hant": {"stringUnit": {"state": "translated", "value": "Cloud 終端機位置無法使用。請重新整理機器後再試一次。"}},
+        "zh-Hans": {"stringUnit": {"state": "translated", "value": "Cloud 终端位置不可用。请刷新机器后重试。"}},
+        "ko": {"stringUnit": {"state": "translated", "value": "Cloud 터미널 배치를 사용할 수 없습니다. 머신을 새로 고친 후 다시 시도하세요."}},
+        "ja": {"stringUnit": {"state": "translated", "value": "Cloud ターミナルの配置を利用できません。マシンを更新して、もう一度お試しください。"}}
+      }
+    },
     "cloud.operation.failure.unsupported": {
       "extractionState": "manual",
       "localizations": {

Sources/AppDelegate.swift

@@ -2542,16 +2542,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
         (settingsRuntime.hostActions as? HostSettingsActions)?.setRunComputerUseOnboardingAction { [weak self] startingPoint in
             self?.computerUseUXCoordinator.presentOnboardingFromSettings(startingAt: startingPoint)
         }
-        let cloudTunnel = makeCloudTunnelCoordinator()
-        cloudTunnelCoordinator = cloudTunnel
-        CmuxTuiSurfaceProviderRegistry.shared.portAccess.coordinator = cloudTunnel
         let cloudUploader = CloudTelemetryUploader(
             auth: auth.coordinator, baseURL: AuthEnvironment.vmAPIBaseURL, client: .current()
         )
         let cloudOperations = CloudOperationRecorder(uploader: cloudUploader, identity: { [weak coordinator = auth.coordinator] in
             coordinator?.authenticatedSessionIdentity
         })
         self.cloudOperations = cloudOperations
+        let cloudTunnel = makeCloudTunnelCoordinator()
+        cloudTunnelCoordinator = cloudTunnel
+        CmuxTuiSurfaceProviderRegistry.shared.portAccess.coordinator = cloudTunnel
         VMClient.bootstrap(auth: auth.coordinator, operations: cloudOperations)
         TerminalController.shared.cloudTunnel = cloudTunnel
         RemotesClient.bootstrap(auth: auth.coordinator)

Sources/Cloud/CloudDiagnosticFailure.swift

@@ -3,7 +3,7 @@ import Foundation
 enum CloudDiagnosticFailure: String, Codable, Sendable, Error {
     case authentication, sessionRefresh = "session_refresh", permission, plan
     case rateLimit = "rate_limit", conflict, network, timeout, server, response, unsupported
-    case process, `protocol`, notFound = "not_found", resourceLimit = "resource_limit"
+    case process, `protocol`, notFound = "not_found", placement, resourceLimit = "resource_limit"
     case storage, cancelled, unknown
 
     var label: String {
@@ -22,6 +22,8 @@ enum CloudDiagnosticFailure: String, Codable, Sendable, Error {
             return String(localized: "cloud.operation.failure.conflict", defaultValue: "Another operation changed this machine. Refresh its state.")
         case .notFound:
             return String(localized: "cloud.operation.failure.notFound", defaultValue: "The Cloud resource is no longer available. Refresh the machine list.")
+        case .placement:
+            return String(localized: "cloud.operation.failure.placement", defaultValue: "The Cloud terminal placement is unavailable. Refresh the machine, then retry.")
         case .unsupported:
             return String(localized: "cloud.operation.failure.unsupported", defaultValue: "This Cloud operation is not supported. Check for an update.")
         case .cancelled:
@@ -59,12 +61,13 @@ enum CloudDiagnosticFailure: String, Codable, Sendable, Error {
         if let error = error as? CmuxTuiSurfaceProvider.ProviderError {
             switch error {
             case .notSignedIn: return .authentication
-            case .machineAsleep, .remoteWorkspaceNotFound, .remoteTabNotFound,
-                 .noWorkspaceOnMachine, .remotePlacementUnavailable, .terminalExited: return .notFound
-            case .terminalNotCreated, .invalidSnapshot, .stateUnavailable,
-                 .invalidPreviewURL, .localForwardURLUnavailable: return .response
+            case .machineAsleep, .remoteWorkspaceNotFound, .remoteTabNotFound: return .notFound
+            case .noWorkspaceOnMachine, .remotePlacementUnavailable: return .placement
+            case .terminalNotCreated, .terminalExited: return .process
             case .terminalAttachTimedOut: return .timeout
+            case .invalidSnapshot, .stateUnavailable: return .response
             case .snapshotOnly, .hubUnavailable: return .unsupported
+            case .invalidPreviewURL, .localForwardURLUnavailable: return .response
             }
         }
         if error is CloudMachineLinkManager.ManagerError { return .connectFailure(error) }

Sources/Cloud/CloudTreeNodeActions.swift

@@ -1,6 +1,5 @@
 import AppKit
 import Foundation
-
 /// Closure bundle handed to Cloud outline rows for the nodes below a machine.
 struct CloudTreeNodeActions {
     /// Project a resource into the selected local workspace.
@@ -63,8 +62,11 @@ struct CloudTreeNodeActions {
         refresh: @escaping @MainActor () -> Void,
         refreshMachine: @escaping @MainActor (SurfaceMachineID) -> Void = { _ in }, operationController: CloudWorkspaceOperationController? = nil
     ) -> CloudTreeNodeActions {
-        @discardableResult
-        func run(_ label: String, _ operation: @escaping @MainActor (SurfaceCatalog) async throws -> Void) -> Task<Void, Never> {
+        @MainActor
+        func run(
+            _ label: String,
+            _ operation: @escaping @MainActor (SurfaceCatalog) async throws -> Void
+        ) -> Task<Void, Never> {
             onWillMutate(label)
             return Task { @MainActor in
                 defer { onDidMutate() }
@@ -387,7 +389,6 @@ struct CloudTreeNodeActions {
         actions.openRemoteTerminal = { navigation.open(machine: $0, group: $1, resource: $2, view: $3, openIn: $4) }
         return actions
     }
-
     /// The local workspace's title: the remote workspace's own name — what a
     /// person actually named it, or typed into its terminal — never the
     /// machine's raw provider id. `hostName` (the machine's friendly label)
@@ -396,7 +397,6 @@ struct CloudTreeNodeActions {
         let name = group.title.trimmingCharacters(in: .whitespacesAndNewlines)
         return name.isEmpty ? hostName : name
     }
-
     /// The machine's friendly label — `SurfaceMachineInfo.name` (the same
     /// preferred name its own sidebar row shows), never the raw provider VM
     /// id. Shared by every caller that needs a machine's name in

Sources/Cloud/VMClient.swift

@@ -43,10 +43,10 @@ func formattedCloudVMHTTPError(status: Int, body: String) -> String {
             Cloud VM request failed (HTTP \(status)).
 
             What to do:
-              Retry the command. If it keeps failing, copy the response body and contact support.
+              Retry the command. If it keeps failing, copy the HTTP status and contact support.
 
             Response body:
-              \(limitedSingleLine(trimmedBody.isEmpty ? "<empty>" : trimmedBody))
+              <unreadable response omitted>
             """
     }
 

Sources/CloudTerminalReconnectOverlayView.swift

@@ -9,10 +9,11 @@ final class CloudTerminalReconnectOverlayView: NSView {
     private let cardView = NSVisualEffectView(frame: .zero)
     private let iconView = NSImageView(frame: .zero)
     private let spinner = NSProgressIndicator(frame: .zero)
-    private let titleLabel = NSTextField(labelWithString: "")
+    private let titleLabel = NSTextField(wrappingLabelWithString: "")
     private let detailLabel = NSTextField(wrappingLabelWithString: "")
     private let reconnectButton = NSButton(frame: .zero)
     private let dismissButton = NSButton(frame: .zero)
+    private lazy var cardWidth = cardView.widthAnchor.constraint(equalToConstant: 360)
     private(set) var currentPresentation: CloudTerminalReconnectOverlayPolicy.Presentation?
 
     /// Creates a card whose controls are localized and hit-testable by AppKit.
@@ -46,6 +47,7 @@ final class CloudTerminalReconnectOverlayView: NSView {
         titleLabel.alignment = .center
         titleLabel.font = .systemFont(ofSize: 15, weight: .semibold)
         titleLabel.textColor = .labelColor
+        titleLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
 
         detailLabel.translatesAutoresizingMaskIntoConstraints = false
         detailLabel.alignment = .center
@@ -86,11 +88,13 @@ final class CloudTerminalReconnectOverlayView: NSView {
         cardView.addSubview(stack)
         cardView.addSubview(dismissButton)
 
+        // A Cloud split can be narrower than the standard card. The pane owns
+        // the maximum width; labels wrap within it and controls stay reachable.
+        updateCardWidth()
         NSLayoutConstraint.activate([
             cardView.centerXAnchor.constraint(equalTo: centerXAnchor),
             cardView.centerYAnchor.constraint(equalTo: centerYAnchor),
-            cardView.widthAnchor.constraint(lessThanOrEqualToConstant: 360),
-            cardView.widthAnchor.constraint(greaterThanOrEqualToConstant: 260),
+            cardWidth,
             stack.topAnchor.constraint(equalTo: cardView.topAnchor, constant: 22),
             stack.bottomAnchor.constraint(equalTo: cardView.bottomAnchor, constant: -22),
             stack.leadingAnchor.constraint(equalTo: cardView.leadingAnchor, constant: 24),
@@ -99,7 +103,9 @@ final class CloudTerminalReconnectOverlayView: NSView {
             iconView.heightAnchor.constraint(equalToConstant: 28),
             spinner.widthAnchor.constraint(equalToConstant: 24),
             spinner.heightAnchor.constraint(equalToConstant: 24),
-            detailLabel.widthAnchor.constraint(lessThanOrEqualToConstant: 300),
+            titleLabel.widthAnchor.constraint(equalTo: stack.widthAnchor),
+            detailLabel.widthAnchor.constraint(equalTo: stack.widthAnchor),
+            reconnectButton.widthAnchor.constraint(lessThanOrEqualTo: stack.widthAnchor),
             dismissButton.topAnchor.constraint(equalTo: cardView.topAnchor, constant: 7),
             dismissButton.trailingAnchor.constraint(equalTo: cardView.trailingAnchor, constant: -7),
             dismissButton.widthAnchor.constraint(equalToConstant: 22),
@@ -111,6 +117,16 @@ final class CloudTerminalReconnectOverlayView: NSView {
         fatalError("init(coder:) not implemented")
     }
 
+    override func layout() {
+        updateCardWidth()
+        super.layout()
+    }
+
+    private func updateCardWidth() {
+        let width = min(360, max(1, bounds.width - 24))
+        if cardWidth.constant != width { cardWidth.constant = width }
+    }
+
     /// Routes hits to the two controls while keeping the rest of the card passive.
     override func hitTest(_ point: NSPoint) -> NSView? {
         guard !isHidden, alphaValue > 0 else { return nil }

Sources/Mobile/Pairing/MobilePairingModel.swift

@@ -96,7 +96,9 @@ final class MobilePairingModel {
     }
 
     /// The current render state, observed by ``MobilePairingView``.
-    private(set) var state: State = .loading
+    private(set) var state: State = .loading {
+        didSet { updatePreparationDeadline() }
+    }
     /// The signed-in account email, shown in the checklist. `nil` when signed out.
     private(set) var signedInEmail: String?
     /// Exact iOS apps this Mac build can intentionally address.
@@ -114,6 +116,9 @@ final class MobilePairingModel {
     /// refresh from several places) can't overwrite a newer result with a stale
     /// ticket. Each run captures its value and bails after an `await` if superseded.
     private var refreshGeneration = 0
+    private let preparationClock: any Clock<Duration>
+    private let preparationTimeout: Duration
+    @ObservationIgnored var preparationTimeoutTask: Task<Void, Never>?
 
     /// Creates a pairing model.
     ///
@@ -126,9 +131,16 @@ final class MobilePairingModel {
     ///     to 600. Covers only the RPC/v1 fallback token the mint produces as a
     ///     side effect; the displayed Tailscale QR carries no token and never
     ///     expires.
-    init(host: MobileHostService? = nil, ticketTTL: TimeInterval = 600) {
+    init(
+        host: MobileHostService? = nil,
+        ticketTTL: TimeInterval = 600,
+        preparationClock: any Clock<Duration> = ContinuousClock(),
+        preparationTimeout: Duration = .seconds(30)
+    ) {
         self.host = host ?? .shared
         self.ticketTTL = ticketTTL
+        self.preparationClock = preparationClock
+        self.preparationTimeout = preparationTimeout
         let targetStore = MobileIOSPairingTargetStore()
         iosAppTargetStore = targetStore
         let targets = targetStore.availableNamespaces.map { namespace in
@@ -146,6 +158,8 @@ final class MobilePairingModel {
         } ?? targets[0]
     }
 
+    deinit { preparationTimeoutTask?.cancel() }
+
     private var coordinator: AuthCoordinator? { AppDelegate.shared?.auth?.coordinator }
 
     /// Selects one exact iOS app for legacy compatibility previews.
@@ -208,7 +222,7 @@ final class MobilePairingModel {
             return
         }
         guard generation == refreshGeneration else { return }
-        state = Self.v2StatusTransition(status, baselineConnectionCount: status.activeConnectionCount)
+        receiveHostStatus(status, baselineConnectionCount: status.activeConnectionCount)
         observeHostStatus()
     }
 
@@ -253,6 +267,8 @@ final class MobilePairingModel {
         refreshGeneration &+= 1
         connectionObservationTask?.cancel()
         connectionObservationTask = nil
+        preparationTimeoutTask?.cancel()
+        preparationTimeoutTask = nil
     }
 
     /// Watches the mobile host's status while the window is open and flips
@@ -272,10 +288,7 @@ final class MobilePairingModel {
                     self.state = .pairingDisabled
                     return
                 }
-                let next = Self.v2StatusTransition(status, baselineConnectionCount: baseline)
-                if next != self.state {
-                    self.state = next
-                }
+                self.receiveHostStatus(status, baselineConnectionCount: baseline)
             }
         }
     }
@@ -286,14 +299,50 @@ final class MobilePairingModel {
         _ status: MobileHostServiceStatus,
         baselineConnectionCount: Int
     ) -> State {
-        guard status.isRunning, status.isPairingReady else { return .preparing }
+        guard status.isRunning else { return .failed(preparationFailureMessage) }
+        guard status.isPairingReady else {
+            return status.lastErrorDescription?.isEmpty == false ? .failed(preparationFailureMessage) : .preparing
+        }
         let ready = State.ready(Ready(
             attachURL: "", tailscaleLines: [], manualEntry: nil,
             reachableViaIroh: true, v2Only: true
         ))
         return status.activeConnectionCount > baselineConnectionCount ? .connected(from: ready) : ready
     }
 
+    /// A retry starts in `refresh`; repeated pending status cannot hide an error.
+    func receiveHostStatus(_ status: MobileHostServiceStatus, baselineConnectionCount: Int) {
+        let next = Self.v2StatusTransition(status, baselineConnectionCount: baselineConnectionCount)
+        if case .failed = state, next == .preparing { return }
+        if next != state { state = next }
+    }
+
+    private static var preparationFailureMessage: String {
+        String(localized: "mobile.pairing.error.preparationFailed",
+               defaultValue: "Pairing could not finish. Check your connection and try again.")
+    }
+
+    private func updatePreparationDeadline() {
+        guard state == .preparing else {
+            preparationTimeoutTask?.cancel()
+            preparationTimeoutTask = nil
+            return
+        }
+        guard preparationTimeoutTask == nil else { return }
+        let clock = preparationClock
+        let timeout = preparationTimeout
+        let generation = refreshGeneration
+        // This deadline bounds the visible preparing state, including a bound
+        // endpoint whose authenticated registration has not completed.
+        preparationTimeoutTask = Task { @MainActor [weak self, clock] in
+            do { try await clock.sleep(for: timeout) } catch { return }
+            guard !Task.isCancelled, let self, self.refreshGeneration == generation,
+                  self.state == .preparing else { return }
+            self.preparationTimeoutTask = nil
+            self.state = .failed(Self.preparationFailureMessage)
+        }
+    }
+
     /// Computes the next render state from a host status event. Pure, so the
     /// transitions are unit tested without a live host.
     ///