[fix] restore Linux Dock icons in packaged builds

[fix] hide macOS Dock icon when closing to the tray
[release] prepare v1.5.0 release notes and iOS version
2026-10-15 08:19:44 +08:00 · 2026-09-08 15:03:32 +08:00 · 2026-09-08 00:22:08 +08:00 · 2026-09-07 23:24:53 +08:00 · 2026-09-07 23:13:49 +08:00 · 2026-09-07 22:53:30 +08:00
112 changed files with 5407 additions and 2881 deletions
@@ -311,6 +311,8 @@ jobs:
    name: Build on iOS (arm64)
    runs-on: macos-26
    timeout-minutes: 120
+    outputs:
+      version: ${{ steps.ios_version.outputs.version }}
    env:
      IOS_DEPLOYMENT_TARGET: "16.0"
      EXPECTED_IOS_SDK: "26.5"
@@ -369,6 +371,26 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v5

+      - name: Read independent iOS version
+        id: ios_version
+        shell: bash
+        run: |
+          IOS_VERSION_BASE="$(xcodebuild \
+            -project apps/ios/CrossDeskMobile.xcodeproj \
+            -scheme CrossDeskMobile \
+            -configuration Release \
+            -destination 'generic/platform=iOS' \
+            -showBuildSettings CODE_SIGNING_ALLOWED=NO | \
+            awk '$1 == "MARKETING_VERSION" && $2 == "=" { print $3 }')"
+          if [[ ! "${IOS_VERSION_BASE}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Invalid iOS marketing version: ${IOS_VERSION_BASE}" >&2
+            exit 1
+          fi
+          VERSION_NUM="v${IOS_VERSION_BASE}-${VERSION_NUM##*-}"
+          echo "IOS_VERSION_BASE=${IOS_VERSION_BASE}" >> "${GITHUB_ENV}"
+          echo "VERSION_NUM=${VERSION_NUM}" >> "${GITHUB_ENV}"
+          echo "version=${VERSION_NUM}" >> "${GITHUB_OUTPUT}"
+
      - name: Initialize submodules
        run: git submodule update --init --recursive

@@ -439,6 +461,11 @@ jobs:
          fi

          xcrun lipo "${EXECUTABLE_PATH}" -verify_arch arm64
+          APP_VERSION=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' "${INFO_PLIST}")
+          if [[ "${APP_VERSION}" != "${IOS_VERSION_BASE}" ]]; then
+            echo "Unexpected iOS app version: expected ${IOS_VERSION_BASE}, got ${APP_VERSION}" >&2
+            exit 1
+          fi
          MINIMUM_OS=$(/usr/libexec/PlistBuddy -c 'Print :MinimumOSVersion' "${INFO_PLIST}")
          if [[ "${MINIMUM_OS}" != "${IOS_DEPLOYMENT_TARGET}" ]]; then
            echo "Unexpected minimum iOS version: expected ${IOS_DEPLOYMENT_TARGET}, got ${MINIMUM_OS}" >&2
@@ -749,6 +776,25 @@ jobs:
          echo "BUILD_DATE_ISO=${BUILD_DATE_ISO}" >> $GITHUB_OUTPUT
          echo "PATCH_NUMBER=${PATCH_NUMBER}" >> $GITHUB_OUTPUT

+      - name: Prepare release notes
+        env:
+          RELEASE_TAG: ${{ steps.version.outputs.VERSION_WITH_V }}
+          VERSION_BASE: ${{ steps.version.outputs.VERSION_BASE }}
+        run: |
+          if [[ -f "docs/releases/${RELEASE_TAG}.md" ]]; then
+            cp "docs/releases/${RELEASE_TAG}.md" release-notes.md
+          elif [[ -f "docs/releases/v${VERSION_BASE}.md" ]]; then
+            cp "docs/releases/v${VERSION_BASE}.md" release-notes.md
+          else
+            cat > release-notes.md << 'EOF'
+          Binary release only. Source code is not included.
+
+          ## Code signing policy
+
+          Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/).
+          EOF
+          fi
+
      - name: Rename artifacts
        run: |
          mkdir -p release
@@ -756,7 +802,7 @@ jobs:
          cp artifacts/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg
          cp artifacts/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb
          cp artifacts/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb
-          cp artifacts/crossdesk-ios-arm64-unsigned-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-ios-arm64-unsigned-${{ steps.version.outputs.VERSION_WITH_V }}.zip
+          cp artifacts/crossdesk-ios-arm64-unsigned-${{ needs.build-ios.outputs.version }}/* release/crossdesk-ios-arm64-unsigned-${{ needs.build-ios.outputs.version }}.zip
          cp artifacts/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe
          cp artifacts/crossdesk-win-x64-portable-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-win-x64-portable-${{ steps.version.outputs.VERSION_WITH_V }}.zip

@@ -767,17 +813,13 @@ jobs:
        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ steps.version.outputs.VERSION_WITH_V }}
+          target_commitish: ${{ github.sha }}
          name: Release ${{ steps.version.outputs.VERSION_WITH_V }}
          draft: false
          prerelease: false
          files: release/*
          generate_release_notes: false
-          body: |
-            Binary release only. Source code is not included.
-
-            ## Code signing policy
-
-            Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/).
+          body_path: release-notes.md

      - name: Create or update 'latest' tag
        run: |
@@ -795,12 +837,7 @@ jobs:
          prerelease: false
          files: release/*
          generate_release_notes: false
-          body: |
-            Binary release only. Source code is not included.
-
-            ## Code signing policy
-
-            Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/).
+          body_path: release-notes.md

      - name: Upload artifacts to server
        uses: burnett01/rsync-deployments@5.2
@@ -851,6 +888,11 @@ jobs:
            }
          }
          EOF
+          jq --arg release_name "Release ${{ steps.version.outputs.VERSION_WITH_V }}" \
+            --rawfile release_notes release-notes.md \
+            '.releaseName = $release_name | .releaseNotes = $release_notes' \
+            version.json > version-with-notes.json
+          mv version-with-notes.json version.json
          cat version.json

      - name: Upload version.json to server
@@ -1,429 +1,211 @@
-# CrossDesk
+<div align="center">
+  <img src="apps/desktop/resources/linux/crossdesk_128x128.png" width="80" alt="CrossDesk 标志" />
+  <h1>CrossDesk</h1>
+  <p>轻量、跨平台的远程桌面，让电脑、浏览器和 iPhone / iPad 连接到同一张桌面。</p>
+  <p><a href="https://www.crossdesk.cn/">官方网站</a> · <a href="https://github.com/kunkundi/crossdesk/releases">下载客户端</a> · <a href="https://web.crossdesk.cn/">打开 Web 客户端</a> · <a href="README_EN.md">English</a></p>
+</div>

-<a href="https://hellogithub.com/repository/kunkundi/crossdesk" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=55d41367570345f1838e02fd12be7961&claim_uid=cb0OpZRrBuGVAfL&theme=small" alt="Featured｜HelloGitHub" /></a>
+<div align="center">

-[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-brightgreen.svg)](https://www.crossdesk.cn/)
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-[![GitHub last commit](https://img.shields.io/github/last-commit/kunkundi/crossdesk)](https://github.com/kunkundi/crossdesk/commits/web-client)
-[![Build Status](https://github.com/kunkundi/crossdesk/actions/workflows/build.yml/badge.svg)](https://github.com/kunkundi/crossdesk/actions)  
-[![Docker Pulls](https://img.shields.io/docker/pulls/crossdesk/crossdesk-server)](https://hub.docker.com/r/crossdesk/crossdesk-server/tags)
-[![GitHub issues](https://img.shields.io/github/issues/kunkundi/crossdesk.svg)](https://github.com/kunkundi/crossdesk/issues)
-[![GitHub stars](https://img.shields.io/github/stars/kunkundi/crossdesk.svg?style=social)](https://github.com/kunkundi/crossdesk/stargazers)
-[![GitHub forks](https://img.shields.io/github/forks/kunkundi/crossdesk.svg?style=social)](https://github.com/kunkundi/crossdesk/forks)
+[![Platforms](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux%20%7C%20iOS-blue)](#download)
+[![Release](https://img.shields.io/github/v/release/kunkundi/crossdesk)](https://github.com/kunkundi/crossdesk/releases)
+[![Build](https://github.com/kunkundi/crossdesk/actions/workflows/build.yml/badge.svg)](https://github.com/kunkundi/crossdesk/actions/workflows/build.yml)
+[![License: GPL v3](https://img.shields.io/badge/license-GPL--3.0-blue)](LICENSE)
+[![Stars](https://img.shields.io/github/stars/kunkundi/crossdesk?style=social)](https://github.com/kunkundi/crossdesk/stargazers)

-[ [English](README_EN.md) / 中文 ]
+</div>

---
+CrossDesk 支持 Windows、macOS、Linux 之间的远程访问，也可从浏览器或原生 iOS 客户端控制电脑。项目基于 [MiniRTC](https://github.com/kunkundi/minirtc)，提供实时音视频传输、键鼠控制、文件传输与自托管能力，仍在持续开发中。
+
+> 本文按当前仓库代码整理。截图展示当前 Slint 桌面界面，使用演示 ID、密码、在线状态和连接记录；缩略图来自公开页面；下载包的功能与系统要求请同时核对对应 Release 说明。原生 iOS 客户端的构建、签名方式见下文。
+
+[界面预览](#preview) · [下载与安装](#download) · [快速连接](#quick-start) · [会话操作](#session) · [设置](#settings) · [iOS](#ios) · [自托管](#self-hosting) · [源码构建](docs/BUILD.md) · [常见问题](docs/FAQ.md)
+
+<a id="preview"></a>

 ## 界面预览

-### PC 客户端
+### 桌面客户端

-![sup_example](https://github.com/user-attachments/assets/eeb64fbe-1f07-4626-be1c-b77396beb905)
+主窗口集中展示本机 ID、连接密码、远程连接入口和近期连接记录。
+
+<p align="center">
+  <img src="docs/images/desktop-main-zh.png" width="800" alt="当前桌面客户端示例：已连接服务器，三台在线设备均显示页面缩略图" />
+</p>

 ### Web 客户端

+在浏览器中输入远程设备 ID 和密码，无需在控制端安装桌面客户端。
+
 <p align="center">
-  <img width="850" height="550" alt="6bddcbed47ffd4b9988a4037c7f4f524" src="https://github.com/user-attachments/assets/e44f73f9-24ac-46a3-a189-b7f8b6669881" />
+  <img src="docs/images/web-client.png" width="800" alt="CrossDesk Web 客户端当前连接首页" />
 </p>

---
+图片来源与更新方式见 [截图说明](docs/images/README.md)。

-## 简介
+## 主要功能

-CrossDesk 是一个轻量级的跨平台远程桌面软件，支持 Web 端控制远程设备。
-
-CrossDesk 是 [MiniRTC](https://github.com/kunkundi/minirtc.git) 实时音视频传输库的实验性应用。MiniRTC 是一个轻量级的跨平台实时音视频传输库。它具有网络透传（[RFC5245](https://datatracker.ietf.org/doc/html/rfc5245)），视频软硬编解码（H264/AV1），音频编解码（[Opus](https://github.com/xiph/opus)），信令交互，网络拥塞控制，传输加密（[SRTP](https://tools.ietf.org/html/rfc3711)）等基础能力。
-
---
-
-## 系统要求
-
-| 平台 | 最低版本 |
+| 能力 | 当前支持 |
 | --- | --- |
-| **Windows** | Windows 10 及以上 (64 位) |
-| **macOS** | macOS Intel 15.0 及以上 ( 大于 14.0 小于 15.0 的版本可自行编译实现兼容 )<br> macOS Apple Silicon 14.0 及以上 |
-| **Linux** | Ubuntu 20.04 及以上 |
+| 跨平台控制 | Windows / macOS / Linux 桌面互控；浏览器与原生 iOS 作为控制端 |
+| 实时画面与声音 | H.264 / AV1、30 / 60 fps 设置、硬件编解码选项、远端声音播放；实际能力取决于设备与构建配置 |
+| 多设备与多显示器 | 近期连接、设备别名、会话标签与远端显示器切换 |
+| 输入与协作 | 键鼠输入、远端光标同步、组合键、文本剪贴板同步、文件传输 |
+| 网络与部署 | P2P 直连、TURN 中继、SRTP 加密选项、自托管信令与中继服务 |
+| Windows 锁屏控制 | 通过 CrossDesk Service 支持锁屏、登录界面及安全桌面的输入转发 |

---
+各客户端的入口和能力有所不同；桌面会话操作见下文，iOS 的具体功能见 [开发说明](apps/ios/README.md)。

-## 使用
+<a id="download"></a>

-在菜单栏“对端ID”处输入远端桌面的ID，点击“→”即可发起远程连接。
+## 下载与安装

-![usage1](https://github.com/user-attachments/assets/3a4bb59f-c84c-44d2-9a20-11790aac510e)
+前往 [GitHub Releases](https://github.com/kunkundi/crossdesk/releases) 或 [官方网站](https://www.crossdesk.cn/)，按系统与 CPU 架构选择安装包。

-如果远端桌面设置了连接密码，则本端需填写正确的连接密码才能成功发起远程连接。
+| 平台 | 当前源码 / CI 基线 | 安装方式 |
+| --- | --- | --- |
+| Windows | Windows 10+，x64 | `.exe` 安装包；便携构建也受支持 |
+| macOS | macOS 14.0+，Intel / Apple Silicon | 选择 x64 或 arm64 的 `.pkg` |
+| Linux | Ubuntu 20.04+，amd64 / arm64，glibc 2.31 基线 | `.deb` 安装包 |
+| iOS / iPadOS | iOS 16.0+，arm64 真机 | 原生客户端；使用 Xcode 构建并签名，CI 产物为未签名应用 |
+| Web | 支持 WebRTC 的浏览器 | 访问 [web.crossdesk.cn](https://web.crossdesk.cn/) |

-![password](https://github.com/user-attachments/assets/1beadcce-640d-4f5c-8e77-51917b5294d5)
+Linux 下载后，在下载目录中将文件名替换为实际安装包名称：

-发起连接前，可在设置中自定义配置项，如语言、视频编码格式等。
-![settings](https://github.com/user-attachments/assets/8bc5468d-7bbb-4e30-95bd-da1f352ac08c)
+```bash
+sudo apt install "./crossdesk-linux-amd64-<version>.deb"
+```

-### 使用 Web 客户端
+**macOS 首次运行：** 按应用提示，在“系统设置 → 隐私与安全性”中授予 CrossDesk **屏幕录制**（新系统可能显示为“屏幕与系统音频录制”）及 **辅助功能**权限，再按系统提示重新打开应用。前者用于捕获桌面，后者用于远程键鼠输入。

-浏览器访问 [CrossDesk Web Client](https://web.crossdesk.cn/)。
-输入 **远程设备 ID** 与 **密码**，点击连接即可接入远程设备。如图，**iOS Safari 远程控制 Win11**：
+<a id="quick-start"></a>

-<img width="645" height="300" alt="_cgi-bin_mmwebwx-bin_webwxgetmsgimg__ MsgID=932911462648581698 skey=@crypt_1f5153b1_b550ca7462b5009ce03c991cca2a92a7 mmweb_appid=wx_webfilehelper" src="https://github.com/user-attachments/assets/a5109e6f-752c-4654-9f4e-7e161bddf43e" />
+## 快速连接

-### Windows 服务（CrossDesk Service）
+### 从另一台电脑连接

-CrossDesk 在 Windows 平台提供本地辅助服务 **CrossDesk Service**，服务名为 `CrossDeskService`。该服务用于锁屏、登录界面和安全桌面等受保护场景下的远程控制增强能力，包括：
+1. **准备被控电脑。** 安装并运行 CrossDesk，等待底部显示“已连接服务器”。在左侧“本桌面”查看 **本机 ID** 和 **密码**，提供给控制端。
+2. **输入对端 ID。** 在控制端右侧“远程桌面 → 对端 ID”输入被控电脑的 ID，点击 **→**。
+3. **完成密码验证。** 按弹窗输入被控电脑当前的连接密码，确认后等待远程画面出现。需要保存密码时勾选“记住密码”。
+4. **再次连接。** 成功连接过的设备会出现在“近期连接”中，可通过卡片重连，也可编辑别名或删除记录。

- 上报远端当前是否处于锁屏、登录、凭据输入或安全桌面状态；
- 支持从控制端发送 `Ctrl+Alt+Del`（SAS）；
- 在锁屏、登录和安全桌面阶段转发键盘、鼠标输入。
+本机密码旁的眼睛按钮用于显示 / 隐藏密码，铅笔按钮用于修改密码。修改时使用 **6 位数字或英文字母**，并保持连接服务器；等待修改成功、客户端重新连接后，再复制当前密码。已保存旧密码的控制端需重新输入。

-Windows 安装包会自动打包 `crossdesk_service.exe` 和 `crossdesk_session_helper.exe`，并在安装时注册为按需启动的 Windows 服务。CrossDesk 客户端启动时会尝试启动已安装的服务；当本机没有 CrossDesk 客户端进程运行时，服务会自动退出。卸载客户端时会同步停止并移除该服务。
+### 从浏览器连接

-如果是手动编译或手动部署 Windows 版本，请确保 `CrossDesk.exe`、`crossdesk_service.exe` 和 `crossdesk_session_helper.exe` 位于同一目录。安装或卸载服务需要使用管理员权限打开 PowerShell：
+1. 保持被控电脑上的 CrossDesk 运行，并确认已连接服务器；在被控端“设置”中保持 **启用 SRTP** 开启。
+2. 打开 [Web 客户端](https://web.crossdesk.cn/)，输入 **远程设备 ID** 和 **密码**，点击“连接”。
+3. 连接后使用页面提供的显示器、鼠标模式和键盘控件操作远端；手机和平板也可通过浏览器访问。
+
+如果使用自建服务器，需要让控制端与被控端接入同一服务；Web 部署配置见 [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)。
+
+<a id="session"></a>
+
+## 会话中的常用操作
+
+远程窗口通过会话标签切换设备，控制栏提供以下操作；控制栏收起时先点击展开按钮。将鼠标悬停在图标上可查看提示。
+
+| 入口 | 用途 |
+| --- | --- |
+| 显示器 | 切换远端显示器 |
+| 键盘 | 发送组合键；Windows 的 `Ctrl+Alt+Del` 依赖远端服务 |
+| 鼠标 | 控制 / 释放远端鼠标 |
+| 扬声器 | 播放声音 / 静音 |
+| 文件夹 | 选择文件发送到远端，并查看传输进度 |
+| 网络状态 | 查看流量、丢包率、帧率、分辨率及直连 / 中继状态 |
+| 全屏 | 进入 / 退出全屏 |
+| 断开连接 | 结束当前远程会话 |
+
+桌面端可同步文本剪贴板。接收文件的位置可在“设置 → 文件保存路径”调整。关闭主窗口会隐藏窗口并保持程序运行；需要完全退出时使用系统托盘或菜单栏中的退出入口。
+
+<a id="settings"></a>
+
+## 调整画面与连接设置
+
+点击主窗口右上角 **☰ → 设置**，修改后点击“确认”保存。建议在建立连接前调整；会话进行中部分选项不可修改。设置列表可向下滚动，查看自托管、启动方式与文件保存路径。
+
+<p align="center">
+  <img src="docs/images/desktop-settings-zh.png" width="720" alt="当前设置界面：画质、帧率、画面偏好、编解码、中继与 SRTP" />
+</p>
+
+| 设置 | 说明 |
+| --- | --- |
+| 画面质量 / 帧率 | 选择低、中、高画质与 30 / 60 fps；实际帧率取决于网络和设备 |
+| 画面偏好 | 在帧率优先、画质优先、平衡之间选择 |
+| 视频编码格式 | H.264 / AV1；硬件编解码是否可用取决于平台、硬件与构建选项 |
+| 启用中继服务 | 允许借助 TURN 中继建立连接；P2P 连接失败时先检查此项 |
+| 启用 SRTP | 媒体传输加密选项，两端配置需兼容 |
+| 自托管配置 | 设置服务器地址、信令端口与中继端口，并勾选启用 |
+| 开机自启 / 启用守护进程 | 调整启动与进程守护行为，按界面提示重启后生效 |
+| 文件保存路径 | 选择接收文件的目录 |
+
+<a id="ios"></a>
+
+## 原生 iOS / iPadOS 客户端
+
+仓库的 [`apps/ios`](apps/ios/README.md) 提供原生控制端，与桌面端使用同一套 MiniRTC 协议。它可以控制远端电脑；当前不提供将 iPhone / iPad 作为被控桌面的功能。
+
+1. 按 [iOS 开发说明](apps/ios/README.md) 使用 Xcode 构建并签名，安装到 iOS 16+ 的真机。
+2. 在首页输入对端 ID，点击连接并填写密码；成功连接后可从“最近连接”中重连。
+3. 在设置中选择鼠标模式：**相对位置**像触控板一样移动光标，**绝对位置**将触摸位置直接映射到远端画面。
+4. 点击悬浮图标展开菜单，可切换显示器、显示键盘、控制声音或发送文件。收到的文件位于应用的 `Documents/Received`，可通过传输状态旁的分享按钮导出。
+
+当前支持接收远端文本到 iOS 剪贴板；界面暂未提供主动发送本机剪贴板的按钮。
+
+当前支持单指点击、双指右键、长按拖动与捏合缩放；缩放后的双指平移用于移动视图。原生端与浏览器端分别维护，使用入口和手势可能不同。
+
+<a id="windows-service"></a>
+
+## Windows 锁屏与登录界面
+
+**CrossDesk Service**（服务名 `CrossDeskService`）提供锁屏、登录、凭据输入及安全桌面的状态上报、`Ctrl+Alt+Del` 发送和键鼠输入转发。
+
+安装版会注册按需启动的服务，客户端启动时尝试启动它；本机没有 CrossDesk 客户端进程后服务会自动退出。便携版可在提示窗口或“设置 → 锁屏控制服务”中安装服务，需要管理员权限。该服务依赖客户端运行。
+
+<details>
+<summary>手动部署与服务管理命令</summary>
+
+保留完整安装目录；自行部署构建产物时，将 `CrossDesk.exe`、`crossdesk_service.exe`、`crossdesk_session_helper.exe` 及同次构建输出的全部 `.dll` 放在同一目录。在该目录打开管理员 PowerShell，按需执行：

 ```powershell
-# 安装
 .\CrossDesk.exe --service-install
-# 启动
 .\CrossDesk.exe --service-start
-# 查看状态
 .\CrossDesk.exe --service-status
-# 停止
+.\CrossDesk.exe --service-ping
+# 停止或卸载服务
 .\CrossDesk.exe --service-stop
-# 卸载
 .\CrossDesk.exe --service-uninstall
 ```

-如果远端 Windows 服务未安装、未启动或暂时不可用，基础远程桌面连接仍可使用，但锁屏、登录界面和安全桌面阶段的控制能力会受限，客户端会提示“远端Windows服务不可用”。
+</details>

---
+出现“远端 Windows 服务不可用”时，检查被控电脑的安装和服务状态；普通桌面连接仍可使用，受保护界面的控制能力会受限。

-## 如何编译
-
-### 构建依赖
-
- [xmake](https://xmake.io/#/guide/installation)
- [cmake](https://cmake.org/download/) 3.21 及以上（系统版本过低时由 xmake 自动安装）
-
-### Linux
-
-Linux 构建支持 Ubuntu 20.04 及以上版本的 amd64 和 arm64。发布安装包以
-Ubuntu 20.04/glibc 2.31 为兼容基线。先安装基础编译依赖：
-
-```bash
-sudo apt-get update
-sudo apt-get install -y \
-  git curl unzip build-essential gcc-10 g++-10 python3-pip \
-  pkg-config binutils dpkg-dev \
-  libx11-dev libxext-dev libxrender-dev libxft-dev libxrandr-dev \
-  libxinerama-dev libxcursor-dev libxi-dev libxfixes-dev libxv-dev \
-  libxtst-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev \
-  libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxcb-shm0-dev \
-  libasound2-dev libsndio-dev libpulse-dev \
-  libgl1-mesa-dev
-```
-
-Ubuntu 20.04 自带的 CMake 3.16 不满足要求时，xmake 会自动下载并使用
-CMake 3.21 或更高版本，无需手动替换系统 CMake。
-
-Ubuntu 20.04 默认的 GCC 9 缺少 Slint C++ API 所需的部分 C++20 标准库，
-因此上述命令同时安装并在后续配置中指定 GCC 10。
-
-需要启用 Wayland 捕获或 DRM 捕获时，再安装对应依赖：
-
-```bash
-sudo apt-get install -y libdbus-1-dev libdrm-dev
-
-# Ubuntu 22.04 及以上也可以直接安装系统开发包
-# sudo apt-get install -y libpipewire-0.3-dev libspa-0.2-dev
-```
-
-下载子模块并编译 Release 版本：
-
-```bash
-git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
-cd crossdesk
-
-# 已经克隆过仓库时执行这一行
-git submodule update --init --recursive
-
-# Ubuntu 20.04 没有 PipeWire 0.3 开发包，安装仅用于编译的头文件 SDK。
-# 已安装发行版 PipeWire 0.3 开发包时可跳过此步骤。
-sudo ./docker/linux-build/install-pipewire-sdk.sh
-
-xmake f -c -m release --USE_CUDA=false --toolchain=gcc-10 -y
-xmake b -vy crossdesk
-```
-
-这里应使用 `--toolchain=gcc-10`，以确保 CrossDesk 及 xmake 在配置阶段构建的
-libyuv 等第三方包都使用 GCC 10。只指定 `--cc`/`--cxx` 时，依赖安装可能仍回退到
-系统默认的 `/bin/cc` 和 `/bin/c++`。`-c` 会清除旧配置，切换编译器时必须保留。
-
-amd64 构建结果位于 `build/linux/x86_64/release/crossdesk`，arm64 构建结果位于 `build/linux/arm64/release/crossdesk`。
-
-启用 Wayland 和 DRM 的配置示例：
-
-```bash
-xmake f -c -m release --USE_WAYLAND=true --USE_DRM=true --USE_CUDA=false \
-  --toolchain=gcc-10 -y
-xmake b -vy crossdesk
-```
-
-生成 Debian 安装包（必须在对应架构上先完成 Release 编译）：
-
-```bash
-# amd64
-./apps/desktop/scripts/linux/pkg_amd64.sh 1.0.0
-
-# arm64
-./apps/desktop/scripts/linux/pkg_arm64.sh 1.0.0
-```
-
-打包脚本会将 Slint 共享运行库安装到软件包私有目录 `/usr/lib/crossdesk`，无需用户另外安装 `libslint_cpp.so`。
-PipeWire 不属于强制运行时依赖：程序在运行时检测宿主系统的 PipeWire 0.3，
-没有该运行库时仍可使用 X11（以及构建时启用的 DRM）捕获。
-
-### 通用编译选项
-
-```text
--USE_CUDA=true/false: 启用 CUDA 硬件编解码，默认不启用
--USE_WAYLAND=true/false: 在 Linux 上启用 Wayland/PipeWire 捕获，默认不启用
--USE_DRM=true/false: 在 Linux 上启用 DRM 捕获，默认不启用
--CROSSDESK_PORTABLE=true/false: 构建便携版本，默认不启用
--CROSSDESK_VERSION=xxx: 指定 CrossDesk 的版本
-
-# 示例
-xmake f --CROSSDESK_VERSION=1.0.0 --USE_CUDA=true
-```
-
-运行：
-
-```bash
-xmake r crossdesk
-```
-
-### 无 CUDA 环境下的开发支持
-
-对于**未安装 CUDA 环境的 Linux 开发者，如果希望编译后的成果物拥有硬件编解码能力**，这里提供了预配置的 [Ubuntu 20.04 兼容构建镜像](https://hub.docker.com/r/crossdesk/ubuntu20.04)。该镜像内置必要的构建依赖，可生成兼容 glibc 2.31 的单一 Linux 安装包。
-
-进入容器，下载工程后执行：
-
-```bash
-export CUDA_PATH=/usr/local/cuda
-export XMAKE_GLOBALDIR=/data
-
-xmake f --USE_CUDA=true
-xmake b --root -vy crossdesk
-```
-
-对于**未安装 CUDA 环境的 Windows 开发者**，执行下面的命令安装 CUDA 编译环境：
-
-```powershell
-xmake require -vy "cuda 12.6.3"
-```
-
-安装完成后执行:
-
-```powershell
-xmake require --info "cuda 12.6.3"
-```
-
-输出如下:
-
-<img width="860" height="226" alt="Image" src="https://github.com/user-attachments/assets/999ac365-581a-4b9a-806e-05eb3e4cf44d" />
-
-根据上述输出获取到 CUDA 的安装目录，即 installdir 指向的位置。将 CUDA_PATH 加入系统环境变量，或在终端中输入：
-
-```powershell
-set CUDA_PATH=path_to_cuda_installdir
-```
-
-重新执行：
-
-```powershell
-xmake f --USE_CUDA=true
-xmake b -vy crossdesk
-```
-
-#### 注意
-
-运行时如果客户端状态栏显示 **未连接服务器**，请先在 [CrossDesk 官方网站](https://www.crossdesk.cn/) 安装客户端，以便在环境中安装所需的证书文件。
-
-<img width="256" height="120" alt="image" src="https://github.com/user-attachments/assets/1812f7d6-516b-4b4f-8a3d-98bee505cc5a" />
-
-### 关于 Xmake
-
-#### 安装 Xmake
-
-使用 curl：
-
-```bash
-curl -fsSL https://xmake.io/shget.text | bash
-```
-
-使用 wget：
-
-```bash
-wget https://xmake.io/shget.text -O - | bash
-```
-
-使用 powershell：
-
-```powershell
-irm https://xmake.io/psget.text | iex
-```
-
-#### 编译选项
-
-```text
-# 切换编译模式
-xmake f -m debug/release
-
-# 可选编译参数
-r ：重新构建目标
-v ：显示详细的构建日志
-y ：自动确认提示
-
-# 示例
-xmake b -vy crossdesk
-```
-
-#### 运行选项
-
-```bash
-# 使用调试模式运行
-xmake r -d crossdesk
-```
-
-更多使用方法可参考 [Xmake 官方文档](https://xmake.io/guide/quick-start.html)。
-
---
+<a id="self-hosting"></a>

 ## 自托管服务器

-### 服务端
+可自行部署信令服务与 TURN 中继，并在桌面客户端 **☰ → 设置 → 自托管配置** 中填写连接信息。控制端与被控端都需要启用同一套配置。

-推荐使用 Docker 部署 CrossDesk Server。
+- [自托管指南](docs/SELF_HOSTING.md)：当前 Compose 部署入口、客户端设置、证书信任与排查。
+- [CrossDesk Server](https://github.com/kunkundi/crossdesk-server)：服务端源码与发布配置。
+- [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)：浏览器端源码与自托管说明。

-```bash
-sudo docker run -d \
-  --name crossdesk_server \
-  --network host \
-  -e EXTERNAL_IP=xxx.xxx.xxx.xxx \
-  -e INTERNAL_IP=xxx.xxx.xxx.xxx \
-  -e CROSSDESK_SERVER_PORT=xxxx \
-  -e COTURN_PORT=xxxx \
-  -e MIN_PORT=xxxxx \
-  -e MAX_PORT=xxxxx \
-  -v /var/lib/crossdesk:/var/lib/crossdesk \
-  -v /var/log/crossdesk:/var/log/crossdesk \
-  crossdesk/crossdesk-server:v1.1.6
-```
+## 开发与反馈

-上述命令中，用户需注意的参数如下：
+- [源码构建](docs/BUILD.md)：Windows、macOS、Linux、可选编译参数与打包。
+- [iOS 开发说明](apps/ios/README.md)：原生端构建和真机验证。
+- [GUI 架构](docs/gui-architecture.md)：桌面 UI、平台实现与工程结构。
+- [常见问题](docs/FAQ.md)：连接失败、黑屏、文件位置与编译问题。
+- [提交问题](https://github.com/kunkundi/crossdesk/issues)：请附上两端系统、客户端版本、连接方式和可复现步骤。

-#### 配置参数
+## 致谢与许可

- EXTERNAL_IP：服务器公网 IP , 对应 CrossDesk 客户端**自托管服务器配置**中填写的**服务器地址**
- INTERNAL_IP：服务器内网 IP
- CROSSDESK_SERVER_PORT：自托管服务使用的端口，对应 CrossDesk 客户端**自托管服务器配置**中填写的**服务器端口**
- COTURN_PORT: COTURN 服务使用的端口, 对应 CrossDesk 客户端**自托管服务器配置**中填写的**中继服务端口**
- MIN_PORT/MAX_PORT：COTURN 服务使用的端口范围，例如：MIN_PORT=50000, MAX_PORT=60000，范围可根据客户端数量调整。
- `-v /var/lib/crossdesk:/var/lib/crossdesk`：持久化数据库和证书文件到宿主机
- `-v /var/log/crossdesk:/var/log/crossdesk`：持久化日志文件到宿主机
+感谢 [HelloGitHub](https://hellogithub.com/)、[阮一峰的科技爱好者周刊](https://github.com/ruanyf/weekly) 与 [LinuxDo](https://linux.do) 社区的推荐、交流与支持。

-#### 部署示例
+CrossDesk 使用 [GPL-3.0](LICENSE) 许可。隐私说明见 [隐私政策](PRIVACY.md#中文)。

-```bash
-sudo docker run -d \
-  --name crossdesk_server \
-  --network host \
-  -e EXTERNAL_IP=114.114.114.114 \
-  -e INTERNAL_IP=10.0.0.1 \
-  -e CROSSDESK_SERVER_PORT=9099 \
-  -e COTURN_PORT=3478 \
-  -e MIN_PORT=50000 \
-  -e MAX_PORT=60000 \
-  -v /var/lib/crossdesk:/var/lib/crossdesk \
-  -v /var/log/crossdesk:/var/log/crossdesk \
-  crossdesk/crossdesk-server:v1.1.6
-```
-
-#### 注意事项
-
- **服务器需开放端口：COTURN_PORT/udp，COTURN_PORT/tcp，MIN_PORT-MAX_PORT/udp，CROSSDESK_SERVER_PORT/tcp。**
- 如果不挂载 volume，容器删除后数据会丢失
- 证书文件会在首次启动时自动生成并持久化到宿主机的 `/var/lib/crossdesk/certs` 路径下。由于默认使用的是自签证书，无法保障安全性，建议在云服务商申请正式证书放到该目录下并重启服务。
- 数据库文件会自动创建并持久化到宿主机的 `/var/lib/crossdesk/db/crossdesk-server.db` 路径下
- 日志文件会自动创建并持久化到宿主机的 `/var/log/crossdesk/` 路径下
-
-#### 目录权限
-
-如果 Docker 自动创建的目录权限不足（属于 root），容器内用户无法写入，会导致：
-
- 证书生成失败，容器启动脚本会报错退出
- 数据库目录创建失败，程序会抛出异常并崩溃
- 日志目录创建失败，日志文件无法写入（但程序可能继续运行）
-
-在启动容器前手动设置权限：
-
-```bash
-sudo mkdir -p /var/lib/crossdesk /var/log/crossdesk
-sudo chown -R $(id -u):$(id -g) /var/lib/crossdesk /var/log/crossdesk
-```
-
-### 客户端
-
-1. 点击右上角设置进入设置页面。<br><br>
-<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br>
-
-2. 点击`自托管服务器配置`按钮。<br><br>
-<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/24c761a3-1985-4d7e-84be-787383c2afb8" /><br>
-
-3. 输入`服务器地址`(**EXTERNAL_IP**)、`信令服务端口`(**CROSSDESK_SERVER_PORT**)、`中继服务端口`(**COTURN_PORT**)，点击确认按钮。
-
-4. 勾选`自托管服务器配置`选项，点击确认按钮保存设置。如果服务端使用的是正式证书，则到此步骤为止，客户端即可显示已连接服务器。
-
-5. 如果使用默认证书（正式证书忽略此步骤），则需要将服务端`/var/lib/crossdesk/certs/`目录下的`api.crossdesk.cn_root.crt`自签根证书下载到运行客户端的机器，并执行下述命令安装证书：
-
-**Windows：** 使用管理员权限打开 PowerShell 执行：
-
-```powershell
-certutil -addstore "Root" "C:\path\to\api.crossdesk.cn_root.crt"
-```
-
-**Linux：**
-
-```bash
-sudo cp /path/to/api.crossdesk.cn_root.crt /usr/local/share/ca-certificates/api.crossdesk.cn_root.crt
-sudo update-ca-certificates
-```
-
-**macOS：**
-
-```bash
-sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain path/to/api.crossdesk.cn_root.crt
-```
-
-### 自托管 Web 客户端
-
-详情见项目 [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)。
-
---
-
-## 常见问题
-
-见 [常见问题](https://github.com/kunkundi/crossdesk/blob/self-hosted-server/docs/FAQ.md)。
-
---
-
-## 致谢
-
- 感谢 [HelloGitHub](https://hellogithub.com/) 的推荐与关注。
- 感谢 [阮一峰的科技爱好者周刊](https://github.com/ruanyf/weekly) 的收录与推荐。
- 感谢 [LinuxDo](https://linux.do) 社区的关注、交流与支持，为 CrossDesk 项目的完善提供了帮助。
-
---
-
-## Code signing policy
+### Code signing policy

 CrossDesk 使用 SignPath.io 为本仓库构建的官方 Windows 发布包提供代码签名。

@@ -431,4 +213,3 @@ CrossDesk 使用 SignPath.io 为本仓库构建的官方 Windows 发布包提供

 - **Committers and reviewers（代码提交与审核）：** [kunkundi](https://github.com/kunkundi)
 - **Approvers（签名审批）：** [kunkundi](https://github.com/kunkundi)
- **隐私政策：** [查看 CrossDesk 隐私政策](PRIVACY.md#中文)
@@ -1,451 +1,215 @@
-# CrossDesk
+<div align="center">
+  <img src="apps/desktop/resources/linux/crossdesk_128x128.png" width="80" alt="CrossDesk logo" />
+  <h1>CrossDesk</h1>
+  <p>A lightweight, cross-platform remote desktop for computers, browsers, and iPhone / iPad.</p>
+  <p><a href="https://www.crossdesk.cn/">Website</a> · <a href="https://github.com/kunkundi/crossdesk/releases">Download</a> · <a href="https://web.crossdesk.cn/">Open Web Client</a> · <a href="README.md">中文</a></p>
+</div>

-<a href="https://hellogithub.com/repository/kunkundi/crossdesk" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=55d41367570345f1838e02fd12be7961&claim_uid=cb0OpZRrBuGVAfL&theme=small" alt="Featured｜HelloGitHub" /></a>
+<div align="center">

-[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-brightgreen.svg)](https://www.crossdesk.cn/)
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-[![GitHub last commit](https://img.shields.io/github/last-commit/kunkundi/crossdesk)](https://github.com/kunkundi/crossdesk/commits/web-client)
-[![Build Status](https://github.com/kunkundi/crossdesk/actions/workflows/build.yml/badge.svg)](https://github.com/kunkundi/crossdesk/actions)  
-[![Docker Pulls](https://img.shields.io/docker/pulls/crossdesk/crossdesk-server)](https://hub.docker.com/r/crossdesk/crossdesk-server/tags)
-[![GitHub issues](https://img.shields.io/github/issues/kunkundi/crossdesk.svg)](https://github.com/kunkundi/crossdesk/issues)
-[![GitHub stars](https://img.shields.io/github/stars/kunkundi/crossdesk.svg?style=social)](https://github.com/kunkundi/crossdesk/stargazers)
-[![GitHub forks](https://img.shields.io/github/forks/kunkundi/crossdesk.svg?style=social)](https://github.com/kunkundi/crossdesk/forks)
+[![Platforms](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux%20%7C%20iOS-blue)](#download)
+[![Release](https://img.shields.io/github/v/release/kunkundi/crossdesk)](https://github.com/kunkundi/crossdesk/releases)
+[![Build](https://github.com/kunkundi/crossdesk/actions/workflows/build.yml/badge.svg)](https://github.com/kunkundi/crossdesk/actions/workflows/build.yml)
+[![License: GPL v3](https://img.shields.io/badge/license-GPL--3.0-blue)](LICENSE)
+[![Stars](https://img.shields.io/github/stars/kunkundi/crossdesk?style=social)](https://github.com/kunkundi/crossdesk/stargazers)

-[ [中文](README.md) / English ]
+</div>

---
+CrossDesk connects Windows, macOS, and Linux desktops, with browser and native iOS clients for controlling computers. Built on [MiniRTC](https://github.com/kunkundi/minirtc), it supports real-time video and audio, keyboard and mouse control, file transfer, and self-hosting. The project is under active development.
+
+> This guide follows the current repository source. Desktop screenshots render the current Slint UI with sample IDs, passwords, online statuses, and recent devices; thumbnails show public pages. Check each release's notes for the features and requirements of its binaries. Native iOS build and signing instructions are below.
+
+[Preview](#preview) · [Download](#download) · [Quick start](#quick-start) · [Session controls](#session) · [Settings](#settings) · [iOS](#ios) · [Self-hosting](#self-hosting) · [Build](docs/BUILD_EN.md) · [FAQ](docs/FAQ.md#english)
+
+<a id="preview"></a>

 ## Preview

-### PC Client
+### Desktop client

-![sup_example](https://github.com/user-attachments/assets/3f17d8f3-7c4a-4b63-bae4-903363628687)
-
-### Web Client
+The main window brings together your device ID, connection password, remote connection entry, and recent devices.

 <p align="center">
-  <img width="850" height="550" alt="6bddcbed47ffd4b9988a4037c7f4f524" src="https://github.com/user-attachments/assets/e44f73f9-24ac-46a3-a189-b7f8b6669881" />
+  <img src="docs/images/desktop-main-en.png" width="800" alt="Current desktop UI example showing a connected server and three online devices with page thumbnails" />
 </p>

---
+### Web client

-## Introduction
+Enter a remote device ID and password in your browser without installing the desktop app on the controlling device.

-CrossDesk is a lightweight cross-platform remote desktop software.
+<p align="center">
+  <img src="docs/images/web-client.png" width="800" alt="Current CrossDesk Web Client connection page in Chinese" />
+</p>

-CrossDesk is an experimental application of [MiniRTC](https://github.com/kunkundi/minirtc.git), a lightweight cross-platform real-time audio and video transmission library. MiniRTC provides fundamental capabilities including network traversal ([RFC5245](https://datatracker.ietf.org/doc/html/rfc5245)), video software/hardware encoding and decoding (H264/AV1), audio encoding/decoding ([Opus](https://github.com/xiph/opus)), signaling interaction, network congestion control, and transmission encryption ([SRTP](https://tools.ietf.org/html/rfc3711)).
+See the [screenshot notes](docs/images/README.md) for image sources and refresh instructions.

---
+## Features

-## System Requirements
-
-| Platform | Minimum Version |
+| Capability | Current support |
 | --- | --- |
-| **Windows** | Windows 10 or later (64-bit) |
-| **macOS** | macOS Intel 15.0 or later *(versions between 14.0 and 15.0 can be built manually for compatibility)*<br>macOS Apple Silicon 14.0 or later |
-| **Linux** | Ubuntu 20.04 or later |
+| Cross-platform control | Windows / macOS / Linux desktop control; browser and native iOS controllers |
+| Live video and audio | H.264 / AV1, 30 / 60 fps settings, hardware codec options, and remote audio; availability depends on hardware and build configuration |
+| Devices and displays | Recent connections, device aliases, session tabs, and remote display switching |
+| Input and sharing | Keyboard/mouse input, remote cursor synchronization, shortcuts, text clipboard synchronization, and file transfer |
+| Networking and deployment | Direct P2P connections, TURN relay, an SRTP encryption option, and self-hosted signaling/relay services |
+| Windows protected desktops | CrossDesk Service forwards input on lock screens, sign-in screens, and secure desktops |

---
+Controls and capabilities vary by client. Desktop controls are described below; see the [iOS guide](apps/ios/README.md) for native mobile features.

-## Usage
+<a id="download"></a>

-Enter the remote desktop ID in the menu bar’s “Remote ID” field and click “→” to initiate a remote connection.
+## Download and install

-![usage1](https://github.com/user-attachments/assets/3a4bb59f-c84c-44d2-9a20-11790aac510e)
+Choose a package matching your OS and CPU architecture from [GitHub Releases](https://github.com/kunkundi/crossdesk/releases) or the [website](https://www.crossdesk.cn/).

-If the remote desktop requires a connection password, you must enter the correct password on your side to successfully establish the connection.
+| Platform | Current source / CI baseline | Installation |
+| --- | --- | --- |
+| Windows | Windows 10+, x64 | `.exe` installer; portable builds are also supported |
+| macOS | macOS 14.0+, Intel / Apple Silicon | x64 or arm64 `.pkg` |
+| Linux | Ubuntu 20.04+, amd64 / arm64, glibc 2.31 baseline | `.deb` package |
+| iOS / iPadOS | iOS 16.0+, arm64 physical device | Native controller; build and sign with Xcode, or sign the unsigned CI app |
+| Web | A WebRTC-capable browser | Open [web.crossdesk.cn](https://web.crossdesk.cn/) |

-![password](https://github.com/user-attachments/assets/1beadcce-640d-4f5c-8e77-51917b5294d5)
+On Linux, replace the example filename with the downloaded package name:

-Before connecting, you can customize configuration options in the settings, such as language and video encoding format.
+```bash
+sudo apt install "./crossdesk-linux-amd64-<version>.deb"
+```

-![settings](https://github.com/user-attachments/assets/8bc5468d-7bbb-4e30-95bd-da1f352ac08c)
+**First launch on macOS:** follow the app prompts to grant **Screen Recording** (called **Screen & System Audio Recording** on newer systems) and **Accessibility** under **System Settings → Privacy & Security**. Reopen the app if prompted. These permissions allow desktop capture and remote keyboard/mouse input respectively.

-### Using the Web Client
+<a id="quick-start"></a>

-Visit [CrossDesk Web Client](https://web.crossdesk.cn/).
-Enter the **Remote Device ID** and **Password**, then click Connect to access the remote device. As shown, **iOS Safari remotely controlling Windows 11**:
+## Quick start

-<img width="645" height="300" alt="_cgi-bin_mmwebwx-bin_webwxgetmsgimg__ MsgID=932911462648581698 skey=@crypt_1f5153b1_b550ca7462b5009ce03c991cca2a92a7 mmweb_appid=wx_webfilehelper" src="https://github.com/user-attachments/assets/a5109e6f-752c-4654-9f4e-7e161bddf43e" />
+### Connect from another computer

-### Windows Service (CrossDesk Service)
+1. **Prepare the host.** Install and run CrossDesk on the computer to control. Wait for the bottom status bar to show that the server is connected. Share the **Local ID** and **Password** shown under **Local Desktop** with the controller.
+2. **Enter the remote ID.** On the controlling computer, enter the host's ID in **Remote Desktop → Remote ID**, then click **→**.
+3. **Verify the password.** Enter the host's current connection password when prompted and confirm. Select **Remember password** if you want to save it.
+4. **Reconnect later.** Previously connected devices appear under **Recent Connections**. Reconnect from a card, edit its alias, or remove its record.

-CrossDesk provides a local helper service on Windows named **CrossDesk Service**. Its service name is `CrossDeskService`. The service improves remote control in protected Windows states such as the lock screen, sign-in UI, credential UI, and secure desktop. It provides:
+The eye button shows or hides the local password; the pencil button changes it. Use **6 ASCII letters or digits** and stay connected to the server while changing it. Wait for the change to succeed and the client to reconnect, then copy the current password. Controllers that saved the old password must enter it again.

- Remote status reporting for lock screen, sign-in, credential, and secure desktop states.
- Remote `Ctrl+Alt+Del` (SAS) delivery.
- Keyboard and mouse input forwarding while the remote Windows device is on the lock screen, sign-in UI, or secure desktop.
+### Connect from a browser

-The Windows installer bundles `crossdesk_service.exe` and `crossdesk_session_helper.exe`, then registers the service as an on-demand Windows service during installation. When the CrossDesk client starts, it tries to start the installed service automatically. When no CrossDesk client process is running on the machine, the service exits automatically. Uninstalling the client also stops and removes the service.
+1. Keep CrossDesk running and connected to the server on the host computer, with **Enable SRTP** enabled in its Settings.
+2. Open the [Web Client](https://web.crossdesk.cn/), enter the **Remote Device ID** and **Password**, and click **Connect**.
+3. Use the page's display, mouse-mode, and keyboard controls during the session. Phone and tablet browsers can also connect.

-For manual Windows builds or deployments, make sure `CrossDesk.exe`, `crossdesk_service.exe`, and `crossdesk_session_helper.exe` are placed in the same directory. Open PowerShell with administrator privileges to install or uninstall the service:
+For self-hosting, connect both sides to the same service. Browser deployment is documented in [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client).
+
+<a id="session"></a>
+
+## Session controls
+
+Switch devices using session tabs. Expand the control bar if it is collapsed, and hover over icons to see their tooltips.
+
+| Control | Action |
+| --- | --- |
+| Display | Switch the remote monitor |
+| Keyboard | Send shortcuts; Windows `Ctrl+Alt+Del` requires the remote service |
+| Mouse | Enable / release remote mouse control |
+| Speaker | Play / mute remote audio |
+| Folder | Select a file to send and view transfer progress |
+| Network statistics | Inspect traffic, packet loss, frame rate, resolution, and direct / relay mode |
+| Fullscreen | Enter / exit fullscreen |
+| Disconnect | End the current remote session |
+
+Desktop clients synchronize text clipboard contents. Configure the receiving directory under **Settings → File Save Path**. Closing the main window hides it and keeps the app running; use the system tray or menu-bar exit command to quit completely.
+
+<a id="settings"></a>
+
+## Video and connection settings
+
+Open **☰ → Settings** in the top-right corner and click **OK** to save. Configure the session before connecting; some settings are disabled during an active session. Scroll down for self-hosting, startup behavior, and the file save path.
+
+<p align="center">
+  <img src="docs/images/desktop-settings-en.png" width="720" alt="Current settings for quality, frame rate, video preference, codecs, relay, and SRTP" />
+</p>
+
+| Setting | Purpose |
+| --- | --- |
+| Video Quality / Video Capture Frame Rate | Low, medium, or high quality and 30 / 60 fps; actual performance depends on the connection and device |
+| Video Preference | Choose frame-rate priority, quality priority, or balanced adaptation |
+| Video Encode Format | H.264 / AV1; hardware codec availability depends on the platform, device, and build options |
+| Enable TURN Service | Allow relay-assisted connections; check this setting if P2P fails |
+| SRTP | Media encryption option; configurations on both ends must be compatible |
+| Self-Hosted Config | Set the host, signaling port, and TURN port, then enable the checkbox |
+| Auto Start / Enable Daemon | Configure startup and process supervision; restart as indicated by the UI |
+| File Save Path | Choose where received files are saved |
+
+<a id="ios"></a>
+
+## Native iOS / iPadOS client
+
+[`apps/ios`](apps/ios/README.md) contains a native controller using the same MiniRTC protocol as the desktop client. It controls remote computers; it does not expose an iPhone or iPad as a remotely controlled desktop.
+
+1. Follow the [iOS guide](apps/ios/README.md) to build and sign the app with Xcode, then install it on an iOS 16+ physical device.
+2. Enter a remote ID on the home screen, connect, and enter its password. Successful connections become available in the recent devices list.
+3. Choose a mouse mode in Settings: **Relative Position** works like a trackpad; **Absolute Position** maps touches directly to the remote screen.
+4. Tap the floating icon to expand the menu, then switch displays, open the keyboard, toggle audio, or send files. Received files are stored in `Documents/Received` and can be exported using the share button beside the transfer status.
+
+The app currently receives remote text into the iOS clipboard. Its UI does not yet expose a button to send the local clipboard.
+
+Gestures include one-finger click, two-finger right-click, long-press drag, and pinch-to-zoom. When zoomed in, two-finger panning moves the viewport. The native and browser clients are maintained separately, so their controls and gestures may differ. The current native UI uses Chinese labels.
+
+<a id="windows-service"></a>
+
+## Windows lock screens and sign-in
+
+**CrossDesk Service** (`CrossDeskService`) reports protected desktop states and forwards `Ctrl+Alt+Del`, keyboard, and mouse input on lock screens, sign-in screens, credential prompts, and secure desktops.
+
+The installer registers an on-demand service. CrossDesk tries to start it on launch, and the service exits when no local CrossDesk client is running. Portable builds offer service installation in the prompt or **Settings → Lock Screen Service**, with administrator privileges. The service depends on a running client.
+
+<details>
+<summary>Manual deployment and service commands</summary>
+
+Keep the complete installation directory. For manual deployment, place `CrossDesk.exe`, `crossdesk_service.exe`, `crossdesk_session_helper.exe`, and all `.dll` files from the same build together. Open an administrator PowerShell in that directory and run the commands you need:

 ```powershell
-# install
 .\CrossDesk.exe --service-install
-# start
 .\CrossDesk.exe --service-start
-# check status
 .\CrossDesk.exe --service-status
 .\CrossDesk.exe --service-ping
-# stop
+# Stop or uninstall the service
 .\CrossDesk.exe --service-stop
-# uninstall
 .\CrossDesk.exe --service-uninstall
 ```

-If the remote Windows service is not installed, not running, or temporarily unavailable, the basic remote desktop connection still works, but remote control on the lock screen, sign-in UI, and secure desktop is limited. The client will show “Remote Windows service unavailable”.
+</details>

---
+If **Remote Windows service unavailable** appears, check installation and service status on the host. Ordinary desktop connections remain available, while control of protected screens is limited.

-## How to build
+<a id="self-hosting"></a>

-### Build requirements
+## Self-hosting

- [xmake](https://xmake.io/#/guide/installation)
- [cmake](https://cmake.org/download/) 3.21 or later (installed automatically by xmake when the system version is too old)
+Host your own signaling and TURN services, then enter their connection details under **☰ → Settings → Self-Hosted Config**. Enable the same server configuration on both the controller and host.

-### Linux
+- [Self-hosting guide](docs/SELF_HOSTING_EN.md): current Compose deployment, client settings, certificate trust, and troubleshooting.
+- [CrossDesk Server](https://github.com/kunkundi/crossdesk-server): server source and release configuration.
+- [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client): browser source and deployment instructions.

-Linux builds support Ubuntu 20.04 or later on amd64 and arm64. Release packages
-use Ubuntu 20.04/glibc 2.31 as their compatibility baseline. Install the base
-build dependencies first:
+## Development and feedback

-```bash
-sudo apt-get update
-sudo apt-get install -y \
-  git curl unzip build-essential gcc-10 g++-10 python3-pip \
-  pkg-config binutils dpkg-dev \
-  libx11-dev libxext-dev libxrender-dev libxft-dev libxrandr-dev \
-  libxinerama-dev libxcursor-dev libxi-dev libxfixes-dev libxv-dev \
-  libxtst-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev \
-  libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxcb-shm0-dev \
-  libasound2-dev libsndio-dev libpulse-dev \
-  libgl1-mesa-dev
-```
+- [Build from source](docs/BUILD_EN.md): Windows, macOS, Linux, optional flags, and packaging.
+- [iOS development](apps/ios/README.md): native build and physical-device checks.
+- [GUI architecture](docs/gui-architecture.md): desktop UI and platform organization.
+- [FAQ](docs/FAQ.md#english): connection failures, blank video, received files, and build issues.
+- [Report an issue](https://github.com/kunkundi/crossdesk/issues): include both operating systems, client versions, connection mode, and reproduction steps.

-When Ubuntu 20.04's bundled CMake 3.16 is too old, xmake automatically
-downloads and uses CMake 3.21 or later; replacing the system CMake manually is
-not required.
+## Acknowledgements and license

-Ubuntu 20.04's default GCC 9 lacks parts of the C++20 standard library needed
-by Slint's C++ API, so the commands above install GCC 10 and the configuration
-below selects it explicitly.
+Thanks to [HelloGitHub](https://hellogithub.com/), [Ruanyf Weekly](https://github.com/ruanyf/weekly), and the [LinuxDo](https://linux.do) community for featuring CrossDesk and contributing feedback.

-Install the optional dependencies when Wayland capture or DRM capture is enabled:
+CrossDesk is licensed under [GPL-3.0](LICENSE). See the [Privacy Policy](PRIVACY.md#english).

-```bash
-sudo apt-get install -y libdbus-1-dev libdrm-dev
+### Code signing policy

-# Ubuntu 22.04 and later can alternatively use the distribution packages.
-# sudo apt-get install -y libpipewire-0.3-dev libspa-0.2-dev
-```
-
-Clone the submodules and build a release binary:
-
-```bash
-git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
-cd crossdesk
-
-# Run this when the repository has already been cloned
-git submodule update --init --recursive
-
-# Ubuntu 20.04 has no PipeWire 0.3 development package. Install the
-# header-only SDK used during compilation. Skip this when the distribution's
-# PipeWire 0.3 development packages are already installed.
-sudo ./docker/linux-build/install-pipewire-sdk.sh
-
-xmake f -c -m release --USE_CUDA=false --toolchain=gcc-10 -y
-xmake b -vy crossdesk
-```
-
-Use `--toolchain=gcc-10` so that both CrossDesk and third-party packages such
-as libyuv, which xmake builds during configuration, use GCC 10. Specifying only
-`--cc`/`--cxx` may still let dependency builds fall back to the system
-`/bin/cc` and `/bin/c++`. Keep `-c` when switching compilers to clear the old
-configuration.
-
-The amd64 binary is written to `build/linux/x86_64/release/crossdesk`; the arm64 binary is written to `build/linux/arm64/release/crossdesk`.
-
-Example configuration with Wayland and DRM capture enabled:
-
-```bash
-xmake f -c -m release --USE_WAYLAND=true --USE_DRM=true --USE_CUDA=false \
-  --toolchain=gcc-10 -y
-xmake b -vy crossdesk
-```
-
-Build a Debian package after compiling a release binary on the matching architecture:
-
-```bash
-# amd64
-./apps/desktop/scripts/linux/pkg_amd64.sh 1.0.0
-
-# arm64
-./apps/desktop/scripts/linux/pkg_arm64.sh 1.0.0
-```
-
-The package scripts install the shared Slint runtime in the private `/usr/lib/crossdesk` directory, so users do not need to install `libslint_cpp.so` separately.
-PipeWire is not a mandatory runtime dependency. CrossDesk detects the host's
-PipeWire 0.3 runtime dynamically and can still use X11 capture (and DRM when
-enabled at build time) when it is unavailable.
-
-### Common build options
-
-```text
--USE_CUDA=true/false: Enable CUDA hardware codec acceleration, disabled by default
--USE_WAYLAND=true/false: Enable Wayland/PipeWire capture on Linux, disabled by default
--USE_DRM=true/false: Enable DRM capture on Linux, disabled by default
--CROSSDESK_PORTABLE=true/false: Build the portable variant, disabled by default
--CROSSDESK_VERSION=xxx: Set the CrossDesk version
-
-# Example
-xmake f --CROSSDESK_VERSION=1.0.0 --USE_CUDA=true
-```
-
-Run:
-
-```bash
-xmake r crossdesk
-```
-
-### Development Without CUDA Environment
-
-For **Linux developers who do not have a CUDA environment installed and want to enable hardware codec feature**, a preconfigured [Ubuntu 20.04 compatibility build image](https://hub.docker.com/r/crossdesk/ubuntu20.04) is provided.
-This image contains the required build dependencies and produces a single Linux package compatible with the glibc 2.31 baseline.
-
-After entering the container, download the project and run:
-
-```bash
-export CUDA_PATH=/usr/local/cuda
-export XMAKE_GLOBALDIR=/data
-
-xmake f --USE_CUDA=true
-xmake b --root -vy crossdesk
-```
-
-For **Windows developers without a CUDA environment** installed, run the following command to install the CUDA build environment:
-
-```powershell
-xmake require -vy "cuda 12.6.3"
-```
-
-After the installation is complete, execute:
-
-```powershell
-xmake require --info "cuda 12.6.3"
-```
-
-The output will look like this:
-
-<img width="860" height="226" alt="Image" src="https://github.com/user-attachments/assets/999ac365-581a-4b9a-806e-05eb3e4cf44d" />
-
-From the output above, locate the CUDA installation directory — this is the path pointed to by installdir.
-Add this path to your system environment variable CUDA_PATH, or set it in the terminal using:
-
-```powershell
-set CUDA_PATH=path_to_cuda_installdir
-```
-
-Then re-run:
-
-```powershell
-xmake f --USE_CUDA=true
-xmake b -vy crossdesk
-```
-
-#### Notice
-
-If the client status bar shows **Disconnected** during runtime, please first install the client from the [CrossDesk official website](https://www.crossdesk.cn/) to ensure the required certificate files are available in the environment.
-
-<img width="256" height="120" alt="image" src="https://github.com/user-attachments/assets/1812f7d6-516b-4b4f-8a3d-98bee505cc5a" />
-
-### About Xmake
-
-#### Installing Xmake
-
-You can install Xmake using one of the following methods:
-
-Using curl:
-
-```bash
-curl -fsSL https://xmake.io/shget.text | bash
-```
-
-Using wget:
-
-```bash
-wget https://xmake.io/shget.text -O - | bash
-```
-
-Using powershell:
-
-```powershell
-irm https://xmake.io/psget.text | iex
-```
-
-#### Build Options
-
-```text
-# Switch build mode
-xmake f -m debug/release
-
-# Optional build parameters
-r : Rebuild the target
-v : Show detailed build logs
-y : Automatically confirm prompts
-
-# Example
-xmake b -vy crossdesk
-```
-
-#### Run Options
-
-```bash
-# Run in debug mode
-xmake r -d crossdesk
-```
-
-For more information, please refer to the [official Xmake documentation](https://xmake.io/guide/quick-start.html).
-
---
-
-## Self-Hosted Server
-
-### Server
-
-It is recommended to deploy CrossDesk Server using Docker.
-
-```bash
-sudo docker run -d \
-  --name crossdesk_server \
-  --network host \
-  -e EXTERNAL_IP=xxx.xxx.xxx.xxx \
-  -e INTERNAL_IP=xxx.xxx.xxx.xxx \
-  -e CROSSDESK_SERVER_PORT=xxxx \
-  -e COTURN_PORT=xxxx \
-  -e MIN_PORT=xxxxx \
-  -e MAX_PORT=xxxxx \
-  -v /var/lib/crossdesk:/var/lib/crossdesk \
-  -v /var/log/crossdesk:/var/log/crossdesk \
-  crossdesk/crossdesk-server:v1.1.6
-```
-
-The parameters you need to pay attention to are as follows:
-
-#### Parameters
-
- **EXTERNAL_IP**: The server’s public IP. This corresponds to **Server Address** in the CrossDesk client’s **Self-Hosted Server Configuration**.
- **INTERNAL_IP**: The server’s internal IP.
- **CROSSDESK_SERVER_PORT**: The port used by the self-hosted service. This corresponds to **Server Port** in the CrossDesk client’s **Self-Hosted Server Configuration**.
- **COTURN_PORT**: The port used by the COTURN service. This corresponds to **Relay Service Port** in the CrossDesk client’s **Self-Hosted Server Configuration**.
- **MIN_PORT / MAX_PORT**: The port range used by the COTURN service. Example: `MIN_PORT=50000`, `MAX_PORT=60000`. Adjust the range depending on the number of clients.
- `-v /var/lib/crossdesk:/var/lib/crossdesk`: Persists database and certificate files on the host machine.
- `-v /var/log/crossdesk:/var/log/crossdesk`: Persists log files on the host machine.
-
-#### Example
-
-```bash
-sudo docker run -d \
-  --name crossdesk_server \
-  --network host \
-  -e EXTERNAL_IP=114.114.114.114 \
-  -e INTERNAL_IP=10.0.0.1 \
-  -e CROSSDESK_SERVER_PORT=9099 \
-  -e COTURN_PORT=3478 \
-  -e MIN_PORT=50000 \
-  -e MAX_PORT=60000 \
-  -v /var/lib/crossdesk:/var/lib/crossdesk \
-  -v /var/log/crossdesk:/var/log/crossdesk \
-  crossdesk/crossdesk-server:v1.1.6
-```
-
-#### Notes
-
- **The server must open the following ports: COTURN_PORT/udp, COTURN_PORT/tcp, MIN_PORT–MAX_PORT/udp, and CROSSDESK_SERVER_PORT/tcp.**
- If you don’t mount volumes, all data will be lost when the container is removed.
- Certificate files will be automatically generated on first startup and persisted to the host at `/var/lib/crossdesk/certs`. As the default certificates are self-signed and cannot guarantee security, it is strongly recommended to apply for a trusted certificate from a cloud provider, deploy it to this directory, and restart the service.
- The database file will be automatically created and stored at `/var/lib/crossdesk/db/crossdesk-server.db`.
- Log files will be created and stored at `/var/log/crossdesk/`.
-
-#### Directory permissions
-
-If the directories automatically created by Docker belong to root and have insufficient write permissions, the container user may not be able to write to them. This can cause:
-
- Certificate generation failure, leading to startup script errors and container exit.
- Database directory creation failure, causing the program to throw exceptions and crash.
- Log directory creation failure, preventing logs from being written (though the program may continue running).
-
-Manually set permissions before starting the container:
-
-```bash
-sudo mkdir -p /var/lib/crossdesk /var/log/crossdesk
-sudo chown -R $(id -u):$(id -g) /var/lib/crossdesk /var/log/crossdesk
-```
-
-#### TLS certificate
-
-Place **crossdesk.cn.key** and **crossdesk.cn_bundle.crt** into the **/path/to/your/certs** directory.
-
-### Client
-
-1. Click the settings icon in the top-right corner to enter the settings page.<br><br>
-<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br>
-
-2. Click `Self-Hosted Server Configuration` button.<br><br>
-<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/24c761a3-1985-4d7e-84be-787383c2afb8" /><br>
-
-3. Enter the `Server Address` (**EXTERNAL_IP**), `Signaling Service Port` (**CROSSDESK_SERVER_PORT**), and `Relay Service Port` (**COTURN_PORT**) and click OK button.
-
-4. Check the `Self-hosted server configuration` option and click the OK button to save the settings. If the server is using a valid (official) certificate, the process ends here and the client will show that it is connected to the server.
-
-5. If the default certificate is used (skip this step if an official certificate is used), download the self-signed root certificate `api.crossdesk.cn_root.crt` from the server directory /var/lib/crossdesk/certs/ to the machine running the client, and install the certificate by executing the following command:
-
-**Windows:** Open PowerShell with administrator privileges and execute:
-
-```powershell
-certutil -addstore "Root" "C:\path\to\api.crossdesk.cn_root.crt"
-```
-
-**Linux:**
-
-```bash
-sudo cp /path/to/api.crossdesk.cn_root.crt /usr/local/share/ca-certificates/api.crossdesk.cn_root.crt
-sudo update-ca-certificates
-```
-
-**macOS:**
-
-```bash
-sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain path/to/api.crossdesk.cn_root.crt
-```
-
-### Self-Hosted Web Client
-
-See [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client).
-
---
-
-## FAQ
-
-See [FAQ](https://github.com/kunkundi/crossdesk/blob/self-hosted-server/docs/FAQ.md).
-
---
-
-## Acknowledgements
-
- Thanks to [HelloGitHub](https://hellogithub.com/) for the recommendation and exposure.
- Thanks to [Ruanyf Weekly](https://github.com/ruanyf/weekly) for featuring CrossDesk.
- Thanks to the [LinuxDo](https://linux.do) community for the attention, discussions, and support that helped improve CrossDesk.
-
---
-
-## Code signing policy
-
-CrossDesk uses SignPath.io to code-sign official Windows releases built from this repository.
+CrossDesk uses SignPath.io to sign official Windows releases built from this repository.

 **Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/).**

 - **Committers and reviewers:** [kunkundi](https://github.com/kunkundi)
 - **Approvers:** [kunkundi](https://github.com/kunkundi)
- **Privacy policy:** [Read the CrossDesk Privacy Policy](PRIVACY.md#english)
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail

+# Keep readelf and ldd output stable for the runtime dependency checks below.
+export LC_ALL=C
+
 if [[ $# -lt 3 || $# -gt 4 ]]; then
    echo "Usage: $0 <debian-arch> <xmake-arch> <version> [extra-recommendation]" >&2
    exit 2
@@ -169,11 +172,12 @@ EOF

 cat > "$DESKTOP_DIR/$PKG_NAME.desktop" <<EOF
 [Desktop Entry]
-Version=$DEB_VERSION
+Version=1.0
 Name=$APP_NAME
 Comment=$DESCRIPTION
 Exec=/usr/bin/$PKG_NAME
 Icon=$PKG_NAME
+StartupWMClass=$PKG_NAME
 Terminal=false
 Type=Application
 Categories=Utility;
@@ -15,6 +15,7 @@
 #ifdef _WIN32
 #include <cstdio>

+#include "platform/windows/gui/slint_backend.h"
 #include "service_host.h"
 #endif

@@ -175,6 +176,10 @@ int HandleServiceCliCommand(const std::string& command) {

 int main(int argc, char* argv[]) {
 #ifdef _WIN32
+  if (argc == 2 &&
+      std::strcmp(argv[1], crossdesk::kSlintRendererProbeArgument) == 0) {
+    return crossdesk::RunSlintRendererProbe();
+  }
  if (argc > 1 && IsServiceCliCommand(argv[1])) {
    return HandleServiceCliCommand(argv[1]);
  }
@@ -0,0 +1,79 @@
+#include "task_queue_lock_free.h"
+
+#include <exception>
+#include <new>
+#include <stdexcept>
+#include <utility>
+
+namespace crossdesk {
+
+TaskQueueLockFree::TaskQueueLockFree()
+    : producer_(task_queue_), worker_([this] { WorkerThread(); }) {}
+
+TaskQueueLockFree::~TaskQueueLockFree() { Stop(); }
+
+std::future<void> TaskQueueLockFree::PostTask(std::function<void()> task) {
+  TaskItem item;
+  item.run = std::move(task);
+  auto result = item.completion.get_future();
+  {
+    std::lock_guard lock(mutex_);
+    if (stopping_) {
+      throw std::runtime_error("Cannot post to a stopped task queue");
+    }
+
+    // Count before publishing: the worker may dequeue as soon as enqueue returns.
+    ++pending_tasks_;
+    if (!task_queue_.enqueue(producer_, std::move(item))) {
+      --pending_tasks_;
+      throw std::bad_alloc();
+    }
+  }
+  wake_.notify_one();
+  return result;
+}
+
+void TaskQueueLockFree::Stop() {
+  // Concurrent Stop callers all wait for the same worker shutdown to finish.
+  std::call_once(stop_once_, [this] {
+    {
+      std::lock_guard lock(mutex_);
+      stopping_ = true;
+    }
+    wake_.notify_all();
+    worker_.join();
+  });
+}
+
+void TaskQueueLockFree::WorkerThread() {
+  while (true) {
+    TaskItem item;
+    while (task_queue_.try_dequeue(item)) {
+      --pending_tasks_;
+
+      std::exception_ptr error;
+      try {
+        item.run();
+      } catch (...) {
+        error = std::current_exception();
+      }
+
+      // Release captured resources before marking the task complete.
+      item.run = nullptr;
+      if (error) {
+        item.completion.set_exception(error);
+      } else {
+        item.completion.set_value();
+      }
+    }
+
+    std::unique_lock lock(mutex_);
+    wake_.wait(lock, [this] { return stopping_ || pending_tasks_ > 0; });
+    // A stop request must not discard tasks submitted while the worker was idle.
+    if (stopping_ && pending_tasks_ == 0) {
+      return;
+    }
+  }
+}
+
+}  // namespace crossdesk
@@ -0,0 +1,57 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _TASK_QUEUE_LOCK_FREE_H_
+#define _TASK_QUEUE_LOCK_FREE_H_
+
+#include <atomic>
+#include <condition_variable>
+#include <cstddef>
+#include <functional>
+#include <future>
+#include <mutex>
+#include <thread>
+
+#include <concurrentqueue.h>
+
+namespace crossdesk {
+
+// A single worker executes tasks in submission order. The concurrent queue
+// stores tasks; a mutex coordinates submissions, worker wakeups and shutdown.
+class TaskQueueLockFree {
+ public:
+  TaskQueueLockFree();
+  ~TaskQueueLockFree();
+
+  // Returns completion or the task's exception. Throws if the queue is stopped.
+  std::future<void> PostTask(std::function<void()> task);
+
+  // Rejects new tasks, finishes accepted tasks and joins the worker.
+  // May be called repeatedly, but never from the queue's own tasks.
+  void Stop();
+
+ private:
+  struct TaskItem {
+    std::function<void()> run;
+    std::promise<void> completion;
+  };
+
+  void WorkerThread();
+
+  moodycamel::ConcurrentQueue<TaskItem> task_queue_;
+  // All submissions share one producer so different caller threads keep FIFO.
+  moodycamel::ProducerToken producer_;
+  std::atomic<std::size_t> pending_tasks_{0};
+  std::mutex mutex_;
+  std::condition_variable wake_;
+  bool stopping_ = false;
+  std::once_flag stop_once_;
+  std::thread worker_;
+};
+
+}  // namespace crossdesk
+
+#endif
@@ -1,5 +1,11 @@
-#ifndef CROSSDESK_GUI_APPLICATION_STATE_H_
-#define CROSSDESK_GUI_APPLICATION_STATE_H_
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _APPLICATION_STATE_H_
+#define _APPLICATION_STATE_H_

 #include <atomic>
 #include <chrono>
@@ -192,4 +198,4 @@ struct ApplicationState : MainWindowState,

 }  // namespace crossdesk::gui_detail

-#endif  // CROSSDESK_GUI_APPLICATION_STATE_H_
+#endif
@@ -37,6 +37,7 @@
 #if _WIN32
 #include <windows.h>

+#include "platform/windows/gui/slint_backend.h"
 #include "platform/windows/gui/tray/win_tray.h"
 #elif defined(__APPLE__)
 #include "platform/macos/gui/tray/mac_tray.h"
@@ -47,6 +48,7 @@
 #include <X11/Xlib.h>
 #include <unistd.h>

+#include "platform/linux/gui/cuda_graphics.h"
 #include "platform/linux/gui/tray/linux_tray.h"
 #endif
 #include "rd_log.h"
@@ -992,6 +994,15 @@ int GuiApplication::Run() {
  if (!InitializeSDL()) {
    return -1;
  }
+#if _WIN32
+  const auto backend = ConfigureWindowsSlintBackend();
+  if (!backend.success) {
+    LOG_ERROR("{}", backend.diagnostic);
+    SDL_Quit();
+    return -1;
+  }
+  LOG_INFO("Slint backend: {}; {}", backend.backend, backend.diagnostic);
+#endif
  InitializeModules();
  InitializeUi();

@@ -1020,6 +1031,7 @@ void GuiApplication::InitializeSettings() {

 bool GuiApplication::InitializeSDL() {
 #if defined(__linux__) && !defined(__APPLE__)
+  ConfigureLinuxCudaGraphics(config_center_->IsHardwareVideoCodec());
  // Standard Wayland top-level windows cannot choose an absolute screen
  // position. Use the session's XWayland compatibility server for the GUI so
  // auxiliary windows such as the controlled-side status window can be
@@ -1099,6 +1111,9 @@ void GuiApplication::InitializeUi() {
    wayland_display_guard.emplace("WAYLAND_DISPLAY");
    wayland_socket_guard.emplace("WAYLAND_SOCKET");
  }
+  // Match crossdesk.desktop even when the Debian launcher runs crossdesk-bin.
+  // Set this before creating any windows so X11 and Wayland share the same id.
+  slint::set_xdg_app_id("crossdesk");
 #endif
  ui_ = std::make_unique<SlintUi>();
  ui_->video_presenter =
@@ -1139,6 +1154,7 @@ void GuiApplication::InitializeSystemTray() {
    ui_->main->show();
    ui_->main->window().set_minimized(false);
 #if defined(__APPLE__)
+    MacActivateWindow(ui_->main->window().appkit_view());
    // A window restored from the tray may only obtain its NSWindow after the
    // callback returns, so let the regular UI tick configure it.
    ui_->main_native_titlebar_attempts = 30;
@@ -1149,16 +1165,12 @@ void GuiApplication::InitializeSystemTray() {
      ui_->main->hide();
    }
  };
-  auto open_settings = [this] {
+  auto open_settings = [this, show_window] {
    if (!ui_) {
      return;
    }
-    ui_->main->show();
-    ui_->main->window().set_minimized(false);
+    show_window();
    ui_->main->set_settings_open(true);
-#if defined(__APPLE__)
-    ui_->main_native_titlebar_attempts = 30;
-#endif
  };
  auto exit_app = [this] {
    exit_ = true;
@@ -1728,7 +1740,7 @@ void GuiApplication::BindServerCallbacks() {
  });
  server->on_disconnect_controller([this] {
    if (peer_ && !selected_server_remote_id_.empty()) {
-      LeaveConnection(peer_, selected_server_remote_id_.c_str());
+      CloseServerController(selected_server_remote_id_);
    }
  });
 }
@@ -1738,6 +1750,7 @@ void GuiApplication::Tick() {
    slint::quit_event_loop();
    return;
  }
+  HandleSessionCleanup();
  HandlePasswordChangeResult();
  HandleCredentialRecovery();
  if (!peer_) {
@@ -1998,8 +2011,7 @@ void GuiApplication::HandlePasswordChangeResult() {
    }
    show_offline_warning_window_ = true;
    if (uncertain && peer_) {
-      LeaveConnection(peer_, client_id_);
-      DestroyPeer(&peer_);
+      CloseConnectionPeer();
    }
    return;
  }
@@ -2012,8 +2024,7 @@ void GuiApplication::HandlePasswordChangeResult() {

  LOG_INFO("Password changed successfully for [{}]", client_id_);
  if (peer_) {
-    LeaveConnection(peer_, client_id_);
-    DestroyPeer(&peer_);
+    CloseConnectionPeer();
  }
 }

@@ -2037,7 +2048,7 @@ void GuiApplication::HandleCredentialRecovery() {
  if (retry_active) {
    LOG_INFO("Pending credential was not accepted; retrying active credential");
    if (peer_) {
-      DestroyPeer(&peer_);
+      CloseConnectionPeer();
    }
    return;
  }
@@ -3073,9 +3084,6 @@ void GuiApplication::CloseStreamTab(const std::string& remote_id) {
  }
  keyboard_.ReleaseRemotePressedKeys(remote_id, "stream_tab_closed");
  CloseRemoteSession(props);
-  WaitForThumbnailSaveTasks();
-  reload_recent_connections_ = true;
-  recent_connection_image_save_time_ = 0;
  ResetRemoteSessionResources(props);
  {
    std::unique_lock lock(remote_sessions_mutex_);
@@ -3280,7 +3288,7 @@ void GuiApplication::Cleanup() {
  devices_.DestroyDevices();
  devices_.DestroyFactories();
  CloseAllRemoteSessions();
-  WaitForThumbnailSaveTasks();
+  WaitForSessionCleanup();
  devices_.DestroyAudioOutput();
  if (ui_->stream) {
 #if defined(__APPLE__)
@@ -1,3 +1,9 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
 #ifndef _GUI_APPLICATION_H_
 #define _GUI_APPLICATION_H_

@@ -94,4 +100,4 @@ private:

 } // namespace crossdesk

-#endif
+#endif
@@ -1,4 +1,11 @@
-#pragma once
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _SERVER_WINDOW_STATE_H_
+#define _SERVER_WINDOW_STATE_H_

 #include <algorithm>
 #include <iterator>
@@ -24,5 +31,6 @@ inline int ReconcileSelectedController(const std::vector<std::string>& ids,
  }
  return static_cast<int>(std::distance(ids.begin(), selected));
 }
+} // namespace crossdesk::server_window_state

-}  // namespace crossdesk::server_window_state
+#endif
@@ -1,4 +1,11 @@
-#pragma once
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _WINDOW_GEOMETRY_H_
+#define _WINDOW_GEOMETRY_H_

 #include <algorithm>

@@ -38,3 +45,5 @@ constexpr PhysicalPosition BottomRightPosition(const PhysicalRect& bounds,
 }

 }  // namespace crossdesk::window_geometry
+
+#endif
@@ -74,7 +74,8 @@ int SessionDeviceManager::InitializeScreenCapturer() {

  const int init_ret = screen_capturer_->Init(
      fps, [this, fps](unsigned char *data, int size, int width, int height,
-                       const char *display_name) {
+                       const char *display_name,
+                       const MiniRtcNativeVideoFrame *native_frame) {
        const auto now_time = std::chrono::steady_clock::now();
        if (!ShouldSendCapturedFrame(now_time, fps)) {
          return;
@@ -136,12 +137,13 @@ int SessionDeviceManager::InitializeScreenCapturer() {
          }
        }

-        XVideoFrame frame{};
+        MiniRtcVideoFrame frame{};
        frame.data = reinterpret_cast<const char *>(data);
        frame.size = size;
        frame.width = width;
        frame.height = height;
        frame.captured_timestamp = GetSystemTimeMicros(owner_.peer_);
+        frame.native_frame = native_frame;
        for (const std::string &remote_id : connected_remote_ids) {
          SendVideoFrameToPeer(owner_.peer_, &frame, stream_id.c_str(),
                               remote_id.data(), remote_id.size());
@@ -204,8 +206,11 @@ int SessionDeviceManager::StartSpeakerCapturer() {
        static_cast<SpeakerCapturer *>(speaker_capturer_factory_->Create());
    const int init_ret = speaker_capturer_->Init(
        [this](unsigned char *data, size_t size, const char *audio_name) {
-          SendAudioFrame(owner_.peer_, reinterpret_cast<const char *>(data),
-                         size, owner_.audio_label_.c_str());
+          MiniRtcAudioFrame frame{};
+          frame.data = reinterpret_cast<const char *>(data);
+          frame.size = size;
+          frame.captured_timestamp = GetSystemTimeMicros(owner_.peer_);
+          SendAudioFrame(owner_.peer_, &frame, owner_.audio_label_.c_str());
        });

    if (init_ret != 0) {
@@ -20,6 +20,16 @@ namespace crossdesk {

 FileTransferManager::FileTransferManager(GuiRuntime &owner) : owner_(owner) {}

+FileTransferManager::~FileTransferManager() {
+  std::vector<std::future<void>> workers;
+  {
+    std::lock_guard lock(workers_mutex_);
+    stopping_ = true;
+    workers.swap(workers_);
+  }
+  for (auto& worker : workers) worker.wait();
+}
+
 FileTransferManager::FileTransferState &FileTransferManager::global_state() {
  return global_state_;
 }
@@ -92,8 +102,16 @@ void FileTransferManager::Start(
    std::shared_ptr<RemoteSession> props,
    const std::filesystem::path &file_path, const std::string &file_label,
    const std::string &remote_id) {
+  if (props && props->closing_) return;
  const bool is_global = !props;
-  PeerPtr *peer = is_global ? owner_.peer_ : props->peer_;
+  PeerPtr* peer = nullptr;
+  std::shared_ptr<PeerEventHandler> peer_events;
+  {
+    std::shared_lock lock(owner_.remote_sessions_mutex_);
+    if (props && props->closing_) return;
+    peer = is_global ? owner_.peer_ : props->peer_;
+    peer_events = is_global ? owner_.peer_events_ : props->peer_events_;
+  }
  if (!peer) {
    LOG_ERROR("StartFileTransfer: invalid peer");
    return;
@@ -108,7 +126,14 @@ void FileTransferManager::Start(
  }

  const auto props_weak = std::weak_ptr<RemoteSession>(props);
-  std::thread([this, peer, file_path, file_label, props_weak, remote_id,
+  std::lock_guard workers_lock(workers_mutex_);
+  if (stopping_) return;
+  // Reap finished senders without blocking the UI.
+  std::erase_if(workers_, [](auto& worker) {
+    return worker.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
+  });
+  workers_.push_back(std::async(std::launch::async,
+      [this, peer, peer_events, file_path, file_label, props_weak, remote_id,
               is_global]() {
    auto props_locked = props_weak.lock();
    FileTransferState *state = nullptr;
@@ -166,7 +191,11 @@ void FileTransferManager::Start(

    const int ret = sender.SendFile(
        file_path, file_path.filename().string(),
-        [peer, file_label, remote_id](const char *buffer, size_t size) {
+        [peer, peer_events, file_label, remote_id, props_locked](const char *buffer, size_t size) {
+          // Close drains each in-flight send before detaching the peer.
+          if (props_locked && props_locked->closing_) return -1;
+          auto callback = peer_events->EnterCallback();
+          if (!callback) return -1;
          if (remote_id.empty()) {
            return SendReliableDataFrame(peer, buffer, size,
                                         file_label.c_str());
@@ -200,12 +229,13 @@ void FileTransferManager::Start(
    }
    LOG_ERROR("FileSender::SendFile failed for [{}], ret={}",
              file_path.string().c_str(), ret);
-    ProcessQueue(props_locked);
-  }).detach();
+    if (peer_events->IsActive()) ProcessQueue(props_locked);
+  }));
 }

 void FileTransferManager::ProcessQueue(
    std::shared_ptr<RemoteSession> props) {
+  if (props && props->closing_) return;
  FileTransferState &state = state_for(props);
  if (state.file_sending_.load()) {
    return;
@@ -4,6 +4,9 @@
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
+#include <future>
+#include <mutex>
+#include <vector>
 #include <memory>
 #include <shared_mutex>
 #include <string>
@@ -21,6 +24,7 @@ public:
  using RemoteSession = gui_detail::RemoteSession;

  explicit FileTransferManager(GuiRuntime &owner);
+  ~FileTransferManager();

  FileTransferState &global_state();
  FileTransferState &
@@ -40,6 +44,9 @@ private:
  void ProcessQueue(std::shared_ptr<RemoteSession> props);
  void Unregister(uint32_t file_id, bool per_peer);

+  std::mutex workers_mutex_;
+  std::vector<std::future<void>> workers_;
+  bool stopping_ = false;
  GuiRuntime &owner_;
  FileTransferState global_state_;
  std::unordered_map<uint32_t, std::weak_ptr<RemoteSession>>
@@ -150,6 +150,7 @@ void KeyboardController::SendHeartbeat(bool force) {
  const std::string target_id = owner_.controlled_remote_id_.empty()
                                    ? owner_.focused_remote_id_
                                    : owner_.controlled_remote_id_;
+  std::shared_lock sessions_lock(owner_.remote_sessions_mutex_);
  const auto props_it = owner_.remote_sessions_.find(target_id);
  if (target_id.empty() || props_it == owner_.remote_sessions_.end() ||
      props_it->second->connection_status_.load() !=
@@ -189,6 +190,7 @@ int KeyboardController::SendKeyCommand(int key_code, bool is_down,
  const std::string target_id = owner_.controlled_remote_id_.empty()
                                    ? owner_.focused_remote_id_
                                    : owner_.controlled_remote_id_;
+  std::shared_lock sessions_lock(owner_.remote_sessions_mutex_);
  const auto props_it = owner_.remote_sessions_.find(target_id);
  if (!target_id.empty() && props_it != owner_.remote_sessions_.end() &&
      props_it->second->connection_status_.load() ==
@@ -1,5 +1,11 @@
-#ifndef CROSSDESK_GUI_RENDER_H_
-#define CROSSDESK_GUI_RENDER_H_
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _RENDER_H_
+#define _RENDER_H_

 #include <memory>

@@ -25,4 +31,4 @@ private:

 } // namespace crossdesk

-#endif // CROSSDESK_GUI_RENDER_H_
+#endif
@@ -119,21 +119,9 @@ struct SlintVideoPresenter::Impl {
            return;
          }

+          std::lock_guard lock(gl_mutex);
          auto* opengl_renderer =
              dynamic_cast<OpenGlVideoRenderer*>(&renderer);
-          if (state == slint::RenderingState::AfterRendering && stream &&
-              opengl_renderer &&
-              (*stream)->get_native_video_enabled() &&
-              opengl_renderer->ShouldContinueRendering()) {
-            // Queue the next frame directly from the display callback. A
-            // 16/17 ms polling timer can drift across vsync and make Windows
-            // coalesce every second request, effectively capping video near
-            // 30 fps even when decode and submission stay near 60 fps.
-            (*stream)->window().request_redraw();
-            return;
-          }
-
-          std::lock_guard lock(gl_mutex);
          if (state == slint::RenderingState::RenderingSetup) {
            GLuint texture = 0;
            glGenTextures(1, &texture);
@@ -1,5 +1,11 @@
-#ifndef CROSSDESK_GUI_RENDERING_SLINT_VIDEO_PRESENTER_H_
-#define CROSSDESK_GUI_RENDERING_SLINT_VIDEO_PRESENTER_H_
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _SLINT_VIDEO_PRESENTER_H_
+#define _SLINT_VIDEO_PRESENTER_H_

 #include <cstddef>
 #include <cstdint>
@@ -72,4 +78,4 @@ private:

 }  // namespace crossdesk

-#endif  // CROSSDESK_GUI_RENDERING_SLINT_VIDEO_PRESENTER_H_
+#endif
@@ -6,6 +6,7 @@
 #include <shared_mutex>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>

 #include <display_stream_id.h>
@@ -13,42 +14,39 @@
 #include "platform.h"
 #include "platform/video_renderer.h"
 #include "rd_log.h"
+#include "runtime/device_presence_request.h"
 #include "runtime/gui_runtime.h"

 namespace crossdesk {

 namespace {
 constexpr auto kPresenceProbeTimeout = std::chrono::seconds(5);
+constexpr auto kPresenceRefreshInterval = std::chrono::seconds(30);
+constexpr auto kPresenceRetryInterval = std::chrono::seconds(1);
 }  // namespace

 void GuiRuntime::HandleConnectionStatusChange() {
-  if (signal_connected_ && peer_ && need_to_send_recent_connections_) {
-    if (!recent_connection_ids_.empty()) {
-      nlohmann::json j;
-      j["type"] = "recent_connections_presence";
-      j["user_id"] = client_id_;
-      j["devices"] = nlohmann::json::array();
-      for (const auto& id : recent_connection_ids_) {
-        std::string pure_id = id;
-        size_t pos_y = pure_id.find('Y');
-        size_t pos_n = pure_id.find('N');
-        size_t pos = std::string::npos;
-        if (pos_y != std::string::npos &&
-            (pos_n == std::string::npos || pos_y < pos_n)) {
-          pos = pos_y;
-        } else if (pos_n != std::string::npos) {
-          pos = pos_n;
-        }
-        if (pos != std::string::npos) {
-          pure_id = pure_id.substr(0, pos);
-        }
-        j["devices"].push_back(pure_id);
-      }
-      auto s = j.dump();
-      SendSignalMessage(peer_, s.data(), s.size());
-    }
+  if (!signal_connected_ || !peer_) {
+    return;
+  }
+  const auto now = std::chrono::steady_clock::now();
+  if (now - last_presence_request_attempt_at_ < kPresenceRetryInterval) {
+    return;
+  }
+  // Consume the flag before sending so a concurrent reconnect cannot lose its
+  // refresh request. Keep it pending while disconnected or after a send error.
+  const bool requested = need_to_send_recent_connections_.exchange(false);
+  if (!requested && now < next_presence_refresh_at_) {
+    return;
+  }
+  last_presence_request_attempt_at_ = now;
+  const auto message =
+      BuildDevicePresenceRequest(client_id_, recent_connection_ids_, true).dump();
+  if (SendSignalMessage(peer_, message.data(), message.size()) == 0) {
+    next_presence_refresh_at_ = now + kPresenceRefreshInterval;
+  } else {
+    need_to_send_recent_connections_ = true;
  }
-  need_to_send_recent_connections_ = false;
 }

 void GuiRuntime::HandlePendingPresenceProbe() {
@@ -199,11 +197,9 @@ int GuiRuntime::RequestSingleDevicePresence(const std::string& remote_id,
    pending_presence_remember_password_ = remember_password;
  }

-  nlohmann::json j;
-  j["type"] = "recent_connections_presence";
-  j["user_id"] = client_id_;
-  j["devices"] = nlohmann::json::array({remote_id});
-  auto s = j.dump();
+  const auto s = BuildDevicePresenceRequest(
+                     client_id_, recent_connection_ids_, false, remote_id)
+                     .dump();

  int ret = SendSignalMessage(peer_, s.data(), s.size());
  if (ret != 0) {
@@ -220,6 +216,11 @@ int GuiRuntime::RequestSingleDevicePresence(const std::string& remote_id,
 }

 void GuiRuntime::CloseRemoteSession(std::shared_ptr<RemoteSession> props) {
+  if (!props || props->closing_.exchange(true)) return;
+  if (props->peer_events_) props->peer_events_->Deactivate();
+  props->connection_established_ = false;
+  props->streaming_ = false;
+  props->connection_status_.store(ConnectionStatus::Closed);
  std::shared_ptr<std::vector<unsigned char>> frame_snapshot;
  int video_width = 0;
  int video_height = 0;
@@ -245,85 +246,161 @@ void GuiRuntime::CloseRemoteSession(std::shared_ptr<RemoteSession> props) {
    }
  }

-  if (frame_snapshot && !frame_snapshot->empty() && video_width > 0 &&
-      video_height > 0) {
-    std::vector<unsigned char> buffer_copy(*frame_snapshot);
-    std::string remote_id = props->remote_id_;
-    std::string remote_host_name = props->remote_host_name_;
-    std::string password =
-        props->remember_password_ ? props->remote_password_ : "";
-
-    std::thread save_thread([buffer_copy, video_width, video_height, remote_id,
-                             remote_host_name, password,
-                             thumbnail = thumbnail_]() {
-      thumbnail->SaveToThumbnail((char*)buffer_copy.data(), video_width,
-                                 video_height, remote_id, remote_host_name,
-                                 password);
-    });
-
-    {
-      std::lock_guard<std::mutex> lock(thumbnail_save_threads_mutex_);
-      thumbnail_save_threads_.emplace_back(std::move(save_thread));
-    }
-  }
-
  if (native_renderer) {
    native_renderer->DiscardStream(props->remote_id_);
    video_frame_dirty_.store(true, std::memory_order_release);
  }

-  if (props->peer_) {
-    LOG_INFO("[{}] Leave connection [{}]", props->local_id_, props->remote_id_);
-    LeaveConnection(props->peer_, props->remote_id_.c_str());
-    LOG_INFO("Destroy peer [{}]", props->local_id_);
-    DestroyPeer(&props->peer_);
+  PeerPtr* peer = nullptr;
+  {
+    // Audio/clipboard senders hold a shared map lock while using this pointer.
+    std::unique_lock lock(remote_sessions_mutex_);
+    peer = std::exchange(props->peer_, nullptr);
  }
+  const auto queued_at = std::chrono::steady_clock::now();
+  session_cleanup_tasks_[props->remote_id_] = session_cleanup_queue_.PostTask(
+      [props, peer, frame_snapshot, video_width, video_height,
+       thumbnail = thumbnail_, queued_at]() mutable {
+        if (peer) {
+          LOG_INFO("[{}] Background leave connection [{}]", props->local_id_,
+                   props->remote_id_);
+          LeaveConnection(peer, props->remote_id_.c_str());
+          DestroyPeer(&peer);
+        }
+        if (thumbnail && frame_snapshot && !frame_snapshot->empty() &&
+            video_width > 0 && video_height > 0) {
+          thumbnail->SaveToThumbnail(
+              reinterpret_cast<char*>(frame_snapshot->data()), video_width,
+              video_height, props->remote_id_, props->remote_host_name_,
+              props->remember_password_ ? props->remote_password_ : "");
+        }
+        const auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::steady_clock::now() - queued_at).count();
+        LOG_INFO("[{}] Session cleanup completed in {} ms", props->remote_id_,
+                 elapsed);
+      });
+}
+
+void GuiRuntime::CloseServerController(const std::string& remote_id) {
+  if (!peer_ || remote_id.empty() || controller_cleanup_tasks_.count(remote_id))
+    return;
+  controller_cleanup_tasks_[remote_id] = session_cleanup_queue_.PostTask(
+      [peer = peer_, remote_id] { LeaveConnection(peer, remote_id.c_str()); });
+}
+
+void GuiRuntime::CloseConnectionPeer() {
+  if (!peer_) return;
+  peer_events_->Deactivate();
+  std::vector<std::string> controllers;
+  {
+    std::shared_lock lock(connection_status_mutex_);
+    for (const auto& [id, status] : connection_status_) controllers.push_back(id);
+  }
+  for (const auto& id : controllers)
+    HandleServerControllerDisconnected(id, "peer_closed");
+  devices_.StopMouseController();
+  devices_.StopScreenCapturer();
+  devices_.StopSpeakerCapturer();
+  devices_.StopKeyboardCapturer();
+  signal_connected_ = false;
+  device_presence_cache_.SetSignalConnected(false);
+  signal_status_ = SignalStatus::SignalClosed;
+  PeerPtr* peer;
+  {
+    std::unique_lock lock(remote_sessions_mutex_);
+    peer = std::exchange(peer_, nullptr);
+  }
+  // The same serial queue also owns outstanding controller disconnects, so
+  // these finish before the shared peer is destroyed.
+  connection_peer_cleanup_ = session_cleanup_queue_.PostTask(
+      [peer, handler = peer_events_, id = std::string(client_id_)]() mutable {
+        LOG_INFO("[{}] Background connection peer cleanup", id);
+        LeaveConnection(peer, id.c_str());
+        DestroyPeer(&peer);
+      });
 }

 void GuiRuntime::CloseAllRemoteSessions() {
-  if (peer_) {
-    LOG_INFO("[{}] Leave connection [{}]", client_id_, client_id_);
-    LeaveConnection(peer_, client_id_);
-    is_client_mode_ = false;
-    devices_.StopMouseController();
-    devices_.StopScreenCapturer();
-    devices_.StopSpeakerCapturer();
-    devices_.StopKeyboardCapturer();
-    LOG_INFO("Destroy peer [{}]", client_id_);
-    DestroyPeer(&peer_);
-  }
-
+  CloseConnectionPeer();
+  is_client_mode_ = false;
+  pending_reconnects_.clear();
+  std::vector<std::shared_ptr<RemoteSession>> sessions;
  {
-    // std::shared_lock lock(remote_sessions_mutex_);
-    for (auto& it : remote_sessions_) {
-      auto props = it.second;
-      CloseRemoteSession(props);
-    }
+    std::shared_lock lock(remote_sessions_mutex_);
+    for (const auto& [id, props] : remote_sessions_) sessions.push_back(props);
  }
-
+  for (const auto& props : sessions) CloseRemoteSession(props);
  {
-    // std::unique_lock lock(remote_sessions_mutex_);
+    std::unique_lock lock(remote_sessions_mutex_);
    remote_sessions_.clear();
  }
 }

-void GuiRuntime::WaitForThumbnailSaveTasks() {
-  std::vector<std::thread> threads_to_join;
-
-  {
-    std::lock_guard<std::mutex> lock(thumbnail_save_threads_mutex_);
-    threads_to_join.swap(thumbnail_save_threads_);
+void GuiRuntime::HandleSessionCleanup() {
+  auto completed = [](std::future<void>& task) {
+    if (!task.valid() || task.wait_for(std::chrono::seconds(0)) !=
+                             std::future_status::ready) return false;
+    try {
+      task.get();
+    } catch (const std::exception& error) {
+      LOG_ERROR("Connection cleanup failed: {}", error.what());
+    }
+    return true;
+  };
+  completed(connection_peer_cleanup_);
+  for (auto it = controller_cleanup_tasks_.begin();
+       it != controller_cleanup_tasks_.end();) {
+    if (completed(it->second)) it = controller_cleanup_tasks_.erase(it);
+    else ++it;
  }
-
-  if (threads_to_join.empty()) {
-    return;
+  std::vector<std::pair<std::string, PendingReconnect>> reconnects;
+  for (auto it = session_cleanup_tasks_.begin();
+       it != session_cleanup_tasks_.end();) {
+    if (it->second.wait_for(std::chrono::seconds(0)) !=
+        std::future_status::ready) {
+      ++it;
+      continue;
+    }
+    try {
+      it->second.get();
+    } catch (const std::exception& error) {
+      LOG_ERROR("[{}] Session cleanup failed: {}", it->first, error.what());
+    }
+    if (auto pending = pending_reconnects_.find(it->first);
+        pending != pending_reconnects_.end()) {
+      reconnects.emplace_back(pending->first, std::move(pending->second));
+      pending_reconnects_.erase(pending);
+    }
+    it = session_cleanup_tasks_.erase(it);
+    reload_recent_connections_ = true;
+    recent_connection_image_save_time_ = 0;
  }
+  for (const auto& [id, request] : reconnects) {
+    ConnectTo(id, request.password.c_str(), request.remember_password);
+  }
+}

-  for (auto& thread : threads_to_join) {
-    if (thread.joinable()) {
-      thread.join();
+void GuiRuntime::WaitForSessionCleanup() {
+  pending_reconnects_.clear();
+  auto drain = [](std::future<void>& task) {
+    if (!task.valid()) return;
+    try {
+      task.get();
+    } catch (const std::exception& error) {
+      LOG_ERROR("Connection cleanup failed: {}", error.what());
+    }
+  };
+  drain(connection_peer_cleanup_);
+  for (auto& [id, task] : controller_cleanup_tasks_) drain(task);
+  controller_cleanup_tasks_.clear();
+  for (auto& [id, task] : session_cleanup_tasks_) {
+    try {
+      task.get();
+    } catch (const std::exception& error) {
+      LOG_ERROR("[{}] Session cleanup failed: {}", id, error.what());
    }
  }
+  session_cleanup_tasks_.clear();
 }

 void GuiRuntime::ResetRemoteSessionResources(
@@ -365,6 +442,11 @@ std::shared_ptr<GuiRuntime::RemoteSession> GuiRuntime::FindRemoteSession(

 int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
                          bool remember_password, bool bypass_presence_check) {
+  if (session_cleanup_tasks_.count(remote_id)) {
+    pending_reconnects_[remote_id] = {password ? password : "", remember_password};
+    LOG_INFO("[{}] Reconnect queued until previous peer is destroyed", remote_id);
+    return 0;
+  }
  if (!bypass_presence_check && !device_presence_cache_.IsOnline(remote_id)) {
    int ret =
        RequestSingleDevicePresence(remote_id, password, remember_password);
@@ -382,16 +464,14 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
  LOG_INFO("Connect to [{}]", remote_id);
  focused_remote_id_ = remote_id;

-  // std::shared_lock shared_lock(remote_sessions_mutex_);
-  bool exists = (remote_sessions_.find(remote_id) != remote_sessions_.end());
-  // shared_lock.unlock();
+  bool exists = FindRemoteSession(remote_id) != nullptr;

  if (!exists) {
    PeerPtr* peer_to_init = nullptr;
    std::string local_id;

    {
-      // std::unique_lock unique_lock(remote_sessions_mutex_);
+      std::unique_lock unique_lock(remote_sessions_mutex_);
      if (remote_sessions_.find(remote_id) == remote_sessions_.end()) {
        remote_sessions_[remote_id] = std::make_shared<RemoteSession>();
        auto props = remote_sessions_[remote_id];
@@ -399,6 +479,8 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
        props->remote_id_ = remote_id;
        memcpy(&props->params_, &params_, sizeof(Params));
        props->params_.user_id = props->local_id_.c_str();
+        props->peer_events_ = std::make_shared<PeerEventHandler>(*this);
+        props->params_.user_data = props->peer_events_.get();
        props->peer_ = CreatePeer(&props->params_);

        props->control_window_width_ = title_bar_height_ * 10.0f;
@@ -445,8 +527,8 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
  }

  int ret = -1;
-  // std::shared_lock read_lock(remote_sessions_mutex_);
-  auto props = remote_sessions_[remote_id];
+  auto props = FindRemoteSession(remote_id);
+  if (!props || props->closing_) return -1;
  if (!props->connection_established_) {
    props->connection_status_.store(ConnectionStatus::Connecting);
    show_connection_status_window_ = true;
@@ -470,7 +552,6 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
      }
    }
  }
-  // read_lock.unlock();

  return 0;
 }
@@ -1,3 +1,9 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
 #ifndef _CURSOR_POSITION_H_
 #define _CURSOR_POSITION_H_

@@ -64,4 +70,4 @@ inline bool NormalizeCursorPosition(

 }  // namespace crossdesk

-#endif
+#endif
@@ -1,3 +1,9 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
 #ifndef _CURSOR_STATE_PROVIDER_H_
 #define _CURSOR_STATE_PROVIDER_H_

@@ -30,4 +36,4 @@ class CursorStateProvider {

 }  // namespace crossdesk

-#endif
+#endif
@@ -1,12 +1,13 @@
 /*
 * @Author: DI JUNKUN
- * @Date: 2026-02-28
+ * @Date: 2026-09-04
 * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
 */

-#ifndef CROSSDESK_GUI_DEVICE_PRESENCE_CACHE_H_
-#define CROSSDESK_GUI_DEVICE_PRESENCE_CACHE_H_
+#ifndef _DEVICE_PRESENCE_CACHE_H_
+#define _DEVICE_PRESENCE_CACHE_H_

+#include <chrono>
 #include <mutex>
 #include <string>
 #include <unordered_map>
@@ -15,15 +16,29 @@ namespace crossdesk {

 class DevicePresenceCache {
 public:
-  void SetOnline(const std::string &device_id, bool online) {
+  using Clock = std::chrono::steady_clock;
+  static constexpr auto kMaxAge = std::chrono::seconds(60);
+
+  void SetSignalConnected(bool connected) {
    std::lock_guard<std::mutex> lock(mutex_);
-    cache_[device_id] = online;
+    signal_connected_ = connected;
+    cache_.clear();
  }

-  bool IsOnline(const std::string &device_id) const {
+  void SetOnline(const std::string &device_id, bool online,
+                 Clock::time_point now = Clock::now()) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    if (signal_connected_) {
+      cache_[device_id] = {online, now};
+    }
+  }
+
+  bool IsOnline(const std::string &device_id,
+                Clock::time_point now = Clock::now()) const {
    std::lock_guard<std::mutex> lock(mutex_);
    const auto it = cache_.find(device_id);
-    return it != cache_.end() && it->second;
+    return signal_connected_ && it != cache_.end() && it->second.online &&
+           now - it->second.updated_at < kMaxAge;
  }

  void Clear() {
@@ -32,10 +47,15 @@ public:
  }

 private:
-  std::unordered_map<std::string, bool> cache_;
+  struct Entry {
+    bool online;
+    Clock::time_point updated_at;
+  };
+  bool signal_connected_ = false;
+  std::unordered_map<std::string, Entry> cache_;
  mutable std::mutex mutex_;
 };

 } // namespace crossdesk

-#endif // CROSSDESK_GUI_DEVICE_PRESENCE_CACHE_H_
+#endif
@@ -0,0 +1,43 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _DEVICE_PRESENCE_REQUEST_H_
+#define _DEVICE_PRESENCE_REQUEST_H_
+
+#include <algorithm>
+#include <nlohmann/json.hpp>
+#include <string>
+#include <vector>
+
+namespace crossdesk {
+
+inline nlohmann::json BuildDevicePresenceRequest(
+    const std::string& client_id, const std::vector<std::string>& recent_ids,
+    bool subscribe, const std::string& probe_id = {}) {
+  std::vector<std::string> devices;
+  for (const auto& id : recent_ids) {
+    // Recent connection keys contain Y/N plus display settings after the ID.
+    const std::string pure_id = id.substr(0, id.find_first_of("YN"));
+    if (!pure_id.empty() &&
+        std::find(devices.begin(), devices.end(), pure_id) == devices.end()) {
+      devices.push_back(pure_id);
+    }
+  }
+  if (!probe_id.empty() &&
+      std::find(devices.begin(), devices.end(), probe_id) == devices.end()) {
+    devices.push_back(probe_id);
+  }
+  // Include recent devices even in a one-shot probe: older servers ignore
+  // subscribe=false and replace their subscriptions with this device list.
+  return {{"type", "recent_connections_presence"},
+          {"user_id", client_id},
+          {"devices", devices},
+          {"subscribe", subscribe}};
+}
+
+}  // namespace crossdesk
+
+#endif
@@ -19,11 +19,17 @@ namespace crossdesk {

 GuiRuntime::GuiRuntime()
    : clipboard_(*this), devices_(*this), transfers_(*this), settings_(*this),
-      keyboard_(*this), peer_events_(*this) {}
+      keyboard_(*this) {}

-GuiRuntime::~GuiRuntime() = default;
+GuiRuntime::~GuiRuntime() { WaitForSessionCleanup(); }

 int GuiRuntime::CreateConnectionPeer() {
+  // Tick retries after the old peer's leave notification and socket shutdown.
+  if (connection_peer_cleanup_.valid()) return 0;
+  {
+    std::unique_lock lock(remote_sessions_mutex_);
+    peer_events_ = std::make_shared<PeerEventHandler>(*this);
+  }
  params_.use_cfg_file = false;

  std::string signal_server_ip;
@@ -141,9 +147,10 @@ int GuiRuntime::CreateConnectionPeer() {
          sizeof(params_.log_path) - 1);
  params_.log_path[sizeof(params_.log_path) - 1] = '\0';
  params_.hardware_acceleration = config_center_->IsHardwareVideoCodec();
-#if defined(_WIN32)
-  // Windows accepts ref-counted CPU NV12 and CUDA device NV12. The OpenGL
-  // renderer retains the decoded frame until the UI thread has uploaded it.
+#if defined(_WIN32) || defined(__linux__) || defined(__APPLE__)
+  // Windows and Linux retain pooled CPU NV12 frames or CUDA device frames;
+  // macOS retains VideoToolbox CVPixelBuffers for direct Metal sampling. All
+  // platforms fall back to a packed CPU copy when native upload is unavailable.
  params_.native_video_output = true;
 #else
  params_.native_video_output = false;
@@ -188,14 +195,19 @@ int GuiRuntime::CreateConnectionPeer() {
  params_.on_connection_status = PeerEventHandler::OnConnectionStatus;
  params_.on_net_status_report = PeerEventHandler::OnNetStatusReport;

-  params_.user_data = &peer_events_;
+  params_.user_data = peer_events_.get();

  // The previous peer may have left a terminal status behind. Reset it before
  // Init() starts emitting callbacks for the newly selected server.
  signal_connected_ = false;
+  device_presence_cache_.SetSignalConnected(false);
+  need_to_send_recent_connections_ = true;
  signal_status_ = SignalStatus::SignalConnecting;

-  peer_ = CreatePeer(&params_);
+  {
+    std::unique_lock lock(remote_sessions_mutex_);
+    peer_ = CreatePeer(&params_);
+  }
  if (peer_) {
    LOG_INFO("Create peer instance [{}] successful", client_id_);
    Init(peer_);
@@ -239,7 +251,7 @@ void GuiRuntime::UpdateLabels() {


 void GuiRuntime::HandleRecentConnections() {
-  if (reload_recent_connections_ && thumbnail_) {
+  if (session_cleanup_tasks_.empty() && reload_recent_connections_ && thumbnail_) {
    uint32_t now_time = SDL_GetTicks();
    if (now_time - recent_connection_image_save_time_ >= 50) {
      int ret = thumbnail_->LoadThumbnail(recent_connections_,
@@ -268,11 +280,22 @@ void GuiRuntime::SdlCaptureAudioIn(void *userdata, Uint8 *stream, int len) {

  if (1) {
    std::shared_lock lock(runtime->remote_sessions_mutex_);
+    uint64_t captured_timestamp = 0;
    for (const auto &it : runtime->remote_sessions_) {
      auto props = it.second;
      if (props->connection_status_.load() == ConnectionStatus::Connected) {
        if (props->peer_) {
-          SendAudioFrame(props->peer_, (const char *)stream, len,
+          if (captured_timestamp == 0) {
+            const int64_t timestamp_us = GetSystemTimeMicros(props->peer_);
+            if (timestamp_us > 0) {
+              captured_timestamp = static_cast<uint64_t>(timestamp_us);
+            }
+          }
+          MiniRtcAudioFrame frame{};
+          frame.data = reinterpret_cast<const char *>(stream);
+          frame.size = static_cast<size_t>(len);
+          frame.captured_timestamp = captured_timestamp;
+          SendAudioFrame(props->peer_, &frame,
                         runtime->audio_label_.c_str());
        }
      }
@@ -289,29 +312,6 @@ void GuiRuntime::SdlCaptureAudioIn(void *userdata, Uint8 *stream, int len) {
 void GuiRuntime::SdlCaptureAudioOut([[maybe_unused]] void *userdata,
                                    [[maybe_unused]] Uint8 *stream,
                                    [[maybe_unused]] int len) {
-  // GuiApplication *runtime = (GuiApplication *)userdata;
-  // for (auto it : runtime->remote_sessions_) {
-  //   auto props = it.second;
-  //   if (props->connection_status_ == SignalStatus::SignalConnected) {
-  //     SendAudioFrame(props->peer_, (const char *)stream, len);
-  //   }
-  // }
-
-  // if (!runtime->audio_buffer_fresh_) {
-  //   return;
-  // }
-
-  // SDL_memset(stream, 0, len);
-
-  // if (runtime->audio_len_ == 0) {
-  //   return;
-  // } else {
-  // }
-
-  // len = (len > runtime->audio_len_ ? runtime->audio_len_ : len);
-  // SDL_MixAudioFormat(stream, runtime->audio_buffer_, AUDIO_S16LSB, len,
-  //                    SDL_MIX_MAXVOLUME);
-  // runtime->audio_buffer_fresh_ = false;
 }

 } // namespace crossdesk
@@ -1,5 +1,11 @@
-#ifndef CROSSDESK_GUI_RUNTIME_H_
-#define CROSSDESK_GUI_RUNTIME_H_
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _GUI_RUNTIME_H_
+#define _GUI_RUNTIME_H_

 #include <atomic>
 #include <memory>
@@ -55,8 +61,11 @@ class GuiRuntime : protected gui_detail::GuiState {

  void CloseRemoteSession(std::shared_ptr<RemoteSession> props);
  void CloseAllRemoteSessions();
+  void CloseConnectionPeer();
+  void CloseServerController(const std::string& remote_id);
  void ResetRemoteSessionResources(std::shared_ptr<RemoteSession> props);
-  void WaitForThumbnailSaveTasks();
+  void HandleSessionCleanup();
+  void WaitForSessionCleanup();
  std::shared_ptr<RemoteSession> FindRemoteSession(
      const std::string& remote_id);

@@ -83,7 +92,7 @@ class GuiRuntime : protected gui_detail::GuiState {
  FileTransferManager transfers_;
  SettingsManager settings_;
  KeyboardController keyboard_;
-  PeerEventHandler peer_events_;
+  std::shared_ptr<PeerEventHandler> peer_events_;
  std::atomic<bool> video_frame_dirty_{false};
  std::unique_ptr<VideoRenderer> video_renderer_;

@@ -98,4 +107,4 @@ class GuiRuntime : protected gui_detail::GuiState {

 }  // namespace crossdesk

-#endif  // CROSSDESK_GUI_RUNTIME_H_
+#endif
@@ -1,13 +1,11 @@
 /*
- * Aggregate state visible to GuiRuntime and GuiApplication.
- *
- * Definitions live beside their owners: SDL/window state in application and
- * connection/session state in runtime. This header is intentionally only the
- * composition point.
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
 */

-#ifndef CROSSDESK_GUI_STATE_H_
-#define CROSSDESK_GUI_STATE_H_
+#ifndef _GUI_STATE_H_
+#define _GUI_STATE_H_

 #include "application/application_state.h"
 #include "runtime/runtime_state.h"
@@ -18,4 +16,4 @@ struct GuiState : ApplicationState, RuntimeState {};

 } // namespace crossdesk::gui_detail

-#endif // CROSSDESK_GUI_STATE_H_
+#endif
@@ -79,6 +79,9 @@ void PeerEventHandler::OnReceiveDataBuffer(
    const char *data, size_t size, const char *user_id, size_t user_id_size,
    const char *src_id, size_t src_id_size, void *user_data) {
  auto *handler = static_cast<PeerEventHandler *>(user_data);
+  if (!handler) return;
+  auto callback = handler->EnterCallback();
+  if (!callback) return;
  GuiRuntime *runtime = handler ? &handler->owner_ : nullptr;
  if (!runtime) {
    return;
@@ -145,9 +148,8 @@ void PeerEventHandler::OnReceiveDataBuffer(

  std::string remote_id(user_id, user_id_size);
  if (remote_action.type == ControlType::service_status) {
-    auto props_it = runtime->remote_sessions_.find(remote_id);
-    if (props_it != runtime->remote_sessions_.end()) {
-      runtime->ApplyRemoteServiceStatus(*props_it->second, remote_action.ss);
+    if (auto props = runtime->FindRemoteSession(remote_id)) {
+      runtime->ApplyRemoteServiceStatus(*props, remote_action.ss);
    }
    return;
  }
@@ -60,6 +60,9 @@ PeerEventHandler::PeerEventHandler(GuiRuntime& owner) : owner_(owner) {}
 void PeerEventHandler::OnSignalMessage(const char* message, size_t size,
                                       void* user_data) {
  auto* handler = static_cast<PeerEventHandler*>(user_data);
+  if (!handler) return;
+  auto callback = handler->EnterCallback();
+  if (!callback) return;
  GuiRuntime* runtime = handler ? &handler->owner_ : nullptr;
  if (!runtime || !message || size == 0) {
    return;
@@ -153,6 +156,9 @@ void PeerEventHandler::OnSignalMessage(const char* message, size_t size,
 void PeerEventHandler::OnSignalStatus(SignalStatus status, const char* user_id,
                                      size_t user_id_size, void* user_data) {
  auto* handler = static_cast<PeerEventHandler*>(user_data);
+  if (!handler) return;
+  auto callback = handler->EnterCallback();
+  if (!callback) return;
  GuiRuntime* runtime = handler ? &handler->owner_ : nullptr;
  if (!runtime) {
    return;
@@ -161,6 +167,8 @@ void PeerEventHandler::OnSignalStatus(SignalStatus status, const char* user_id,
  std::string client_id(user_id, user_id_size);
  if (client_id == runtime->client_id_) {
    runtime->signal_status_ = status;
+    runtime->device_presence_cache_.SetSignalConnected(
+        status == SignalStatus::SignalConnected);
    if (SignalStatus::SignalConnecting == status) {
      runtime->signal_connected_ = false;
    } else if (SignalStatus::SignalConnected == status) {
@@ -198,12 +206,8 @@ void PeerEventHandler::OnSignalStatus(SignalStatus status, const char* user_id,
    }

    std::string remote_id(client_id.begin() + 2, client_id.end());
-    // std::shared_lock lock(runtime->remote_sessions_mutex_);
-    if (runtime->remote_sessions_.find(remote_id) ==
-        runtime->remote_sessions_.end()) {
-      return;
-    }
-    auto props = runtime->remote_sessions_.find(remote_id)->second;
+    auto props = runtime->FindRemoteSession(remote_id);
+    if (!props) return;
    props->signal_status_ = status;
    if (SignalStatus::SignalConnecting == status) {
      props->signal_connected_ = false;
@@ -230,6 +234,9 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,
                                          const size_t user_id_size,
                                          void* user_data) {
  auto* handler = static_cast<PeerEventHandler*>(user_data);
+  if (!handler) return;
+  auto callback = handler->EnterCallback();
+  if (!callback) return;
  GuiRuntime* runtime = handler ? &handler->owner_ : nullptr;
  if (!runtime) return;

@@ -304,8 +311,7 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,
          remote_action_codec::Free(remote_action);
        }

-        if (!runtime->need_to_create_stream_window_ &&
-            !runtime->remote_sessions_.empty()) {
+        if (!runtime->need_to_create_stream_window_) {
          runtime->need_to_create_stream_window_ = true;
        }
        props->connection_established_ = true;
@@ -493,9 +499,12 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,

 void PeerEventHandler::OnNetStatusReport(
    const char* client_id, size_t client_id_size, TraversalMode mode,
-    const XNetTrafficStats* net_traffic_stats, const char* user_id,
+    const MiniRtcNetTrafficStats* net_traffic_stats, const char* user_id,
    const size_t user_id_size, void* user_data) {
  auto* handler = static_cast<PeerEventHandler*>(user_data);
+  if (!handler) return;
+  auto callback = handler->EnterCallback();
+  if (!callback) return;
  GuiRuntime* runtime = handler ? &handler->owner_ : nullptr;
  if (!runtime) {
    return;
@@ -556,12 +565,8 @@ void PeerEventHandler::OnNetStatusReport(
  }

  std::string remote_id(user_id, user_id_size);
-  // std::shared_lock lock(runtime->remote_sessions_mutex_);
-  if (runtime->remote_sessions_.find(remote_id) ==
-      runtime->remote_sessions_.end()) {
-    return;
-  }
-  auto props = runtime->remote_sessions_.find(remote_id)->second;
+  auto props = runtime->FindRemoteSession(remote_id);
+  if (!props) return;
  if (props->traversal_mode_ != mode) {
    props->traversal_mode_ = mode;
    LOG_INFO("Net mode: [{}]", int(props->traversal_mode_));
@@ -1,10 +1,17 @@
-#ifndef CROSSDESK_GUI_PEER_EVENT_HANDLER_H_
-#define CROSSDESK_GUI_PEER_EVENT_HANDLER_H_
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _PEER_EVENT_HANDLER_H_
+#define _PEER_EVENT_HANDLER_H_

 #include <cstddef>
 #include <string>

 #include "minirtc.h"
+#include "runtime/session_lifecycle.h"

 namespace crossdesk {

@@ -15,7 +22,11 @@ class PeerEventHandler {
 public:
  explicit PeerEventHandler(GuiRuntime &owner);

-  static void OnReceiveVideoBuffer(const XVideoFrame *video_frame,
+  bool IsActive() const { return callbacks_.IsActive(); }
+  auto EnterCallback() { return callbacks_.Enter(); }
+  void Deactivate() { callbacks_.Close(); }
+
+  static void OnReceiveVideoBuffer(const MiniRtcVideoFrame *video_frame,
                                   const char *user_id, size_t user_id_size,
                                   const char *src_id, size_t src_id_size,
                                   void *user_data);
@@ -35,7 +46,7 @@ public:
                                 size_t user_id_size, void *user_data);
  static void OnNetStatusReport(const char *client_id, size_t client_id_size,
                                TraversalMode mode,
-                                const XNetTrafficStats *net_traffic_stats,
+                                const MiniRtcNetTrafficStats *net_traffic_stats,
                                const char *user_id, size_t user_id_size,
                                void *user_data);

@@ -43,8 +54,9 @@ private:
  static void SendClientInfo(PeerPtr *peer, const std::string &client_id);

  GuiRuntime &owner_;
+  gui_detail::SessionCallbackGate callbacks_;
 };

 } // namespace crossdesk

-#endif // CROSSDESK_GUI_PEER_EVENT_HANDLER_H_
+#endif
@@ -14,42 +14,35 @@ namespace {

 constexpr auto kBackgroundSnapshotInterval = std::chrono::seconds(1);

-#if defined(_WIN32)
-const XWindowsVideoFrame* GetWindowsNativeFrame(const XVideoFrame* frame) {
-  if (!frame ||
-      frame->native_handle_type != XVideoFrameNativeHandleWindowsNv12 ||
-      !frame->native_handle) {
+const MiniRtcNativeVideoFrame* GetNativeVideoFrame(const MiniRtcVideoFrame* frame) {
+  if (!frame || !frame->native_frame) {
    return nullptr;
  }
-  const auto* native =
-      static_cast<const XWindowsVideoFrame*>(frame->native_handle);
+  const auto* native = frame->native_frame;
  return native->struct_size >=
-                     static_cast<uint32_t>(sizeof(XWindowsVideoFrame)) &&
-                 native->owner && native->copy_to_cpu
+                     static_cast<uint32_t>(sizeof(MiniRtcNativeVideoFrame)) &&
+                 native->owner && native->copy_to_nv12
             ? native
             : nullptr;
 }
-#endif

 }  // namespace

 void PeerEventHandler::OnReceiveVideoBuffer(
-    const XVideoFrame* video_frame, const char* user_id, size_t user_id_size,
+    const MiniRtcVideoFrame* video_frame, const char* user_id, size_t user_id_size,
    const char* src_id, size_t src_id_size, void* user_data) {
  auto* handler = static_cast<PeerEventHandler*>(user_data);
+  if (!handler) return;
+  auto callback = handler->EnterCallback();
+  if (!callback) return;
  GuiRuntime* runtime = handler ? &handler->owner_ : nullptr;
  if (!runtime) {
    return;
  }

  std::string remote_id(user_id, user_id_size);
-  // std::shared_lock lock(runtime->remote_sessions_mutex_);
-  if (runtime->remote_sessions_.find(remote_id) ==
-      runtime->remote_sessions_.end()) {
-    return;
-  }
-  GuiRuntime::RemoteSession* props =
-      runtime->remote_sessions_.find(remote_id)->second.get();
+  auto props = runtime->FindRemoteSession(remote_id);
+  if (!props) return;

  if (props->connection_established_) {
    bool background_snapshot_only = false;
@@ -57,12 +50,10 @@ void PeerEventHandler::OnReceiveVideoBuffer(
    if (native_renderer && native_renderer->IsActive()) {
      VideoRenderer::SubmitResult submit_result =
          VideoRenderer::SubmitResult::failed;
-#if defined(_WIN32)
-      if (GetWindowsNativeFrame(video_frame)) {
-        submit_result =
-            native_renderer->SubmitNativeFrame(remote_id, *video_frame);
+      if (GetNativeVideoFrame(video_frame)) {
+        submit_result = native_renderer->SubmitNativeFrame(
+            remote_id, *video_frame->native_frame);
      } else
-#endif
      {
        submit_result = native_renderer->SubmitNv12(
            remote_id, reinterpret_cast<const uint8_t*>(video_frame->data),
@@ -116,14 +107,12 @@ void PeerEventHandler::OnReceiveVideoBuffer(
      }

      size_t frame_size = video_frame->size;
-#if defined(_WIN32)
-      const XWindowsVideoFrame* windows_native_frame =
-          GetWindowsNativeFrame(video_frame);
-      if (windows_native_frame) {
-        frame_size = static_cast<size_t>(windows_native_frame->width) *
-                     windows_native_frame->height * 3U / 2U;
+      const MiniRtcNativeVideoFrame* native_frame =
+          GetNativeVideoFrame(video_frame);
+      if (native_frame) {
+        frame_size = static_cast<size_t>(native_frame->width) *
+                     native_frame->height * 3U / 2U;
      }
-#endif
      if (frame_size == 0) {
        return;
      }
@@ -137,15 +126,13 @@ void PeerEventHandler::OnReceiveVideoBuffer(
        props->back_frame_->resize(frame_size);
      }

-#if defined(_WIN32)
-      if (windows_native_frame) {
-        if (windows_native_frame->copy_to_cpu(
-                windows_native_frame->owner, props->back_frame_->data(),
+      if (native_frame) {
+        if (native_frame->copy_to_nv12(
+                native_frame->owner, props->back_frame_->data(),
                props->back_frame_->size()) != 0) {
          return;
        }
      } else
-#endif
      {
        if (!video_frame->data || video_frame->size < frame_size) {
          return;
@@ -185,6 +172,9 @@ void PeerEventHandler::OnReceiveAudioBuffer(
    const char* data, size_t size, const char* user_id, size_t user_id_size,
    const char* src_id, size_t src_id_size, void* user_data) {
  auto* handler = static_cast<PeerEventHandler*>(user_data);
+  if (!handler) return;
+  auto callback = handler->EnterCallback();
+  if (!callback) return;
  GuiRuntime* runtime = handler ? &handler->owner_ : nullptr;
  if (!runtime) {
    return;
@@ -1,5 +1,11 @@
-#ifndef CROSSDESK_GUI_REMOTE_ACTION_CODEC_H_
-#define CROSSDESK_GUI_REMOTE_ACTION_CODEC_H_
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _REMOTE_ACTION_CODEC_H_
+#define _REMOTE_ACTION_CODEC_H_

 #include <cstddef>
 #include <vector>
@@ -14,4 +20,4 @@ void Free(RemoteAction &action);

 } // namespace crossdesk::remote_action_codec

-#endif // CROSSDESK_GUI_REMOTE_ACTION_CODEC_H_
+#endif
@@ -1,3 +1,9 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
 #ifndef _REMOTE_SESSION_H_
 #define _REMOTE_SESSION_H_

@@ -18,6 +24,8 @@
 #include "display_info.h"
 #include "minirtc.h"

+namespace crossdesk { class PeerEventHandler; }
+
 namespace crossdesk::gui_detail {

 struct FileTransferState {
@@ -61,6 +69,8 @@ struct FileTransferState {
 struct RemoteSession {
  Params params_;
  PeerPtr* peer_ = nullptr;
+  std::shared_ptr<PeerEventHandler> peer_events_;
+  std::atomic<bool> closing_{false};
  std::string audio_label_ = kAudioStream;
  std::string data_label_ = kDataStream;
  std::string mouse_label_ = kMouseStream;
@@ -162,7 +172,7 @@ struct RemoteSession {
  int fps_ = 0;
  int frame_count_ = 0;
  std::chrono::steady_clock::time_point last_time_;
-  XNetTrafficStats net_traffic_stats_{};
+  MiniRtcNetTrafficStats net_traffic_stats_{};

  using QueuedFile = FileTransferState::QueuedFile;
  using FileTransferStatus = FileTransferState::FileTransferStatus;
@@ -174,4 +184,4 @@ using RemoteSessionPtr = std::shared_ptr<RemoteSession>;

 }  // namespace crossdesk::gui_detail

-#endif
+#endif
@@ -1,3 +1,9 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
 #ifndef _RUNTIME_STATE_H_
 #define _RUNTIME_STATE_H_

@@ -16,9 +22,11 @@
 #include <stream_names.h>

 #include "config_center.h"
+#include "common/task_queue_lock_free.h"
 #include "path_manager.h"
 #include "runtime/device_presence_cache.h"
 #include "runtime/remote_session.h"
+#include "runtime/session_lifecycle.h"
 #include "thumbnail.h"

 namespace crossdesk::gui_detail {
@@ -47,13 +55,15 @@ struct RecentConnectionsState {
  int recent_connection_image_height_ = 90;
  uint32_t recent_connection_image_save_time_ = 0;
  DevicePresenceCache device_presence_cache_;
-  bool need_to_send_recent_connections_ = true;
+  std::atomic<bool> need_to_send_recent_connections_{true};
+  std::chrono::steady_clock::time_point next_presence_refresh_at_{};
+  std::chrono::steady_clock::time_point last_presence_request_attempt_at_{};
 };

 struct PeerState {
  SignalStatus signal_status_ = SignalStatus::SignalClosed;
  std::string signal_status_str_;
-  bool signal_connected_ = false;
+  std::atomic<bool> signal_connected_{false};
  PeerPtr *peer_ = nullptr;
  PeerPtr *peer_reserved_ = nullptr;
  std::string video_primary_label_ = "primary_display";
@@ -178,8 +188,15 @@ struct ConnectionState {
      std::unordered_map<std::string, RemoteSessionPtr>;
  RemoteSessionMap remote_sessions_;
  std::shared_mutex remote_sessions_mutex_;
-  std::vector<std::thread> thumbnail_save_threads_;
-  std::mutex thumbnail_save_threads_mutex_;
+  TaskQueueLockFree session_cleanup_queue_;
+  std::unordered_map<std::string, std::future<void>> session_cleanup_tasks_;
+  std::future<void> connection_peer_cleanup_;
+  std::unordered_map<std::string, std::future<void>> controller_cleanup_tasks_;
+  struct PendingReconnect {
+    std::string password;
+    bool remember_password = false;
+  };
+  std::unordered_map<std::string, PendingReconnect> pending_reconnects_;

  std::shared_mutex connection_status_mutex_;
  std::unordered_map<std::string, ConnectionStatus> connection_status_;
@@ -0,0 +1,47 @@
+#include "runtime/session_lifecycle.h"
+
+namespace crossdesk::gui_detail {
+
+CallbackGuard::CallbackGuard(SessionCallbackGate& callbacks)
+    : callbacks_(callbacks), accepted_(callbacks.BeginCallback()) {}
+
+CallbackGuard::~CallbackGuard() {
+  if (accepted_) {
+    callbacks_.EndCallback();
+  }
+}
+
+bool SessionCallbackGate::IsActive() const {
+  std::lock_guard lock(mutex_);
+  return accepting_callbacks_;
+}
+
+CallbackGuard SessionCallbackGate::Enter() {
+  return CallbackGuard(*this);
+}
+
+bool SessionCallbackGate::BeginCallback() {
+  std::lock_guard lock(mutex_);
+  if (!accepting_callbacks_) {
+    return false;
+  }
+  ++running_callbacks_;
+  return true;
+}
+
+void SessionCallbackGate::EndCallback() {
+  std::lock_guard lock(mutex_);
+  --running_callbacks_;
+  if (running_callbacks_ == 0) {
+    callbacks_finished_.notify_all();
+  }
+}
+
+void SessionCallbackGate::Close() {
+  std::unique_lock lock(mutex_);
+  accepting_callbacks_ = false;
+  // Waiting releases the lock so running callbacks can call EndCallback().
+  callbacks_finished_.wait(lock, [this] { return running_callbacks_ == 0; });
+}
+
+}  // namespace crossdesk::gui_detail
@@ -0,0 +1,58 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _SESSION_LIFECYCLE_H_
+#define _SESSION_LIFECYCLE_H_
+
+#include <condition_variable>
+#include <cstddef>
+#include <mutex>
+
+namespace crossdesk::gui_detail {
+
+class SessionCallbackGate;
+
+// Decrements the count on scope exit, including early returns and exceptions.
+class CallbackGuard {
+ public:
+  explicit CallbackGuard(SessionCallbackGate& callbacks);
+  ~CallbackGuard();
+
+  CallbackGuard(const CallbackGuard&) = delete;
+  CallbackGuard& operator=(const CallbackGuard&) = delete;
+
+  explicit operator bool() const { return accepted_; }
+
+ private:
+  SessionCallbackGate& callbacks_;
+  bool accepted_;
+};
+
+// Each peer counts callbacks as they enter and leave.
+// Closing rejects new callbacks, then waits for running callbacks to finish.
+class SessionCallbackGate {
+ public:
+  bool IsActive() const;
+  CallbackGuard Enter();
+
+  // Called by the session owner, never from within this session's callbacks.
+  void Close();
+
+ private:
+  friend class CallbackGuard;
+
+  bool BeginCallback();
+  void EndCallback();
+
+  mutable std::mutex mutex_;
+  std::condition_variable callbacks_finished_;
+  bool accepting_callbacks_ = true;
+  std::size_t running_callbacks_ = 0;
+};
+
+}  // namespace crossdesk::gui_detail
+
+#endif
@@ -186,6 +186,7 @@ component ConnectionDialogButton inherits Rectangle {

 export component MainWindow inherits Window {
    title: "CrossDesk";
+    icon: @image-url("../../../resources/linux/crossdesk_256x256.png");
    preferred-width: 640px;
    preferred-height: 450px + root.titlebar-height;
    min-width: 640px;
@@ -7,6 +7,7 @@ export struct ControllerEntry {

 export component ServerWindow inherits Window {
    title: "CrossDesk";
+    icon: @image-url("../../../resources/linux/crossdesk_256x256.png");
    preferred-width: root.language-index == 0 ? 250px : root.language-index == 1 ? 330px : 430px;
    preferred-height: 150px;
    min-width: root.language-index == 0 ? 250px : root.language-index == 1 ? 330px : 430px;
@@ -111,6 +111,7 @@ component ControlBarButton inherits Rectangle {

 export component StreamWindow inherits Window {
    title: "CrossDesk";
+    icon: @image-url("../../../resources/linux/crossdesk_256x256.png");
    preferred-width: 1280px;
    preferred-height: 720px + (root.custom-titlebar ? 32px : 0px);
    min-width: 640px;
@@ -1,5 +1,11 @@
-#ifndef CROSSDESK_GUI_UI_UI_LOCALIZATION_H_
-#define CROSSDESK_GUI_UI_UI_LOCALIZATION_H_
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _UI_LOCALIZATION_H_
+#define _UI_LOCALIZATION_H_

 #include <slint.h>

@@ -162,4 +168,5 @@ inline int ApplyStreamWindowStrings(

 }  // namespace crossdesk::ui_localization

-#endif  // CROSSDESK_GUI_UI_UI_LOCALIZATION_H_
+
+#endif
@@ -0,0 +1,82 @@
+#include "platform/common/gui/cuda_driver.h"
+
+#if CROSSDESK_HAS_CUDA_DRIVER
+#if defined(_WIN32)
+#include <windows.h>
+#else
+#include <dlfcn.h>
+#endif
+
+#include <type_traits>
+
+#include "rd_log.h"
+
+namespace crossdesk {
+
+const CudaDriver* CudaDriver::Get() {
+  static const CudaDriver driver;
+  return driver.loaded_ ? &driver : nullptr;
+}
+
+void* CudaDriver::Symbol(const char* name) const {
+#if defined(_WIN32)
+  return reinterpret_cast<void*>(
+      GetProcAddress(static_cast<HMODULE>(module_), name));
+#else
+  return dlsym(module_, name);
+#endif
+}
+
+CudaDriver::CudaDriver() {
+#if defined(_WIN32)
+  module_ = LoadLibraryW(L"nvcuda.dll");
+#else
+  module_ = dlopen("libcuda.so.1", RTLD_LAZY | RTLD_LOCAL);
+#endif
+  if (!module_) return;
+  const auto load = [this](auto& function, const char* name) {
+    function = reinterpret_cast<std::decay_t<decltype(function)>>(Symbol(name));
+    return function != nullptr;
+  };
+  loaded_ = load(init, "cuInit") &&
+      load(device_get_count, "cuDeviceGetCount") &&
+      load(device_get, "cuDeviceGet") &&
+      load(context_create, "cuCtxCreate_v2") &&
+      load(context_destroy, "cuCtxDestroy_v2") &&
+      load(context_push, "cuCtxPushCurrent_v2") &&
+      load(context_pop, "cuCtxPopCurrent_v2") &&
+      load(error_name, "cuGetErrorName") &&
+      load(mem_alloc, "cuMemAlloc_v2") &&
+      load(mem_free, "cuMemFree_v2") &&
+      load(memcpy_2d, "cuMemcpy2D_v2") &&
+      load(memcpy_2d_async, "cuMemcpy2DAsync_v2") &&
+      load(stream_create, "cuStreamCreate") &&
+      load(stream_destroy, "cuStreamDestroy_v2") &&
+      load(stream_synchronize, "cuStreamSynchronize") &&
+      load(register_gl_buffer, "cuGraphicsGLRegisterBuffer") &&
+      load(unregister_resource, "cuGraphicsUnregisterResource") &&
+      load(map_resources, "cuGraphicsMapResources") &&
+      load(unmap_resources, "cuGraphicsUnmapResources") &&
+      load(mapped_pointer, "cuGraphicsResourceGetMappedPointer_v2");
+}
+
+CudaDriver::~CudaDriver() {
+  if (!module_) return;
+#if defined(_WIN32)
+  FreeLibrary(static_cast<HMODULE>(module_));
+#else
+  dlclose(module_);
+#endif
+}
+
+bool CudaDriver::Check(CUresult result, const char* operation) const {
+  if (result == CUDA_SUCCESS) return true;
+  const char* name = nullptr;
+  error_name(result, &name);
+  LOG_WARN("CUDA/OpenGL {} failed: {} ({})", operation,
+           name ? name : "unknown CUDA error", static_cast<int>(result));
+  return false;
+}
+
+}  // namespace crossdesk
+#endif
@@ -0,0 +1,63 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _CUDA_DRIVER_H_
+#define _CUDA_DRIVER_H_
+
+#if defined(USE_CUDA) && USE_CUDA && \
+    (defined(_WIN32) || \
+     (defined(__linux__) && (defined(__x86_64__) || defined(__amd64__))))
+#define CROSSDESK_HAS_CUDA_DRIVER 1
+
+#include <cuda.h>
+
+namespace crossdesk {
+
+// Application-owned driver entry points. No codec library or MiniRTC internals
+// are involved; the module remains loaded for this singleton's lifetime.
+class CudaDriver {
+ public:
+  static const CudaDriver* Get();
+  bool Check(CUresult result, const char* operation) const;
+
+  decltype(&cuInit) init = nullptr;
+  decltype(&cuDeviceGetCount) device_get_count = nullptr;
+  decltype(&cuDeviceGet) device_get = nullptr;
+  CUresult(CUDAAPI* context_create)(CUcontext*, unsigned int, CUdevice) = nullptr;
+  decltype(&cuCtxDestroy) context_destroy = nullptr;
+  decltype(&cuCtxPushCurrent) context_push = nullptr;
+  decltype(&cuCtxPopCurrent) context_pop = nullptr;
+  decltype(&cuGetErrorName) error_name = nullptr;
+  decltype(&cuMemAlloc) mem_alloc = nullptr;
+  decltype(&cuMemFree) mem_free = nullptr;
+  decltype(&cuMemcpy2D) memcpy_2d = nullptr;
+  decltype(&cuMemcpy2DAsync) memcpy_2d_async = nullptr;
+  decltype(&cuStreamCreate) stream_create = nullptr;
+  decltype(&cuStreamDestroy) stream_destroy = nullptr;
+  decltype(&cuStreamSynchronize) stream_synchronize = nullptr;
+  CUresult(CUDAAPI* register_gl_buffer)(CUgraphicsResource*, unsigned int,
+                                       unsigned int) = nullptr;
+  decltype(&cuGraphicsUnregisterResource) unregister_resource = nullptr;
+  decltype(&cuGraphicsMapResources) map_resources = nullptr;
+  decltype(&cuGraphicsUnmapResources) unmap_resources = nullptr;
+  decltype(&cuGraphicsResourceGetMappedPointer) mapped_pointer = nullptr;
+
+ private:
+  CudaDriver();
+  ~CudaDriver();
+  CudaDriver(const CudaDriver&) = delete;
+  CudaDriver& operator=(const CudaDriver&) = delete;
+  void* Symbol(const char* name) const;
+  void* module_ = nullptr;
+  bool loaded_ = false;
+};
+
+}  // namespace crossdesk
+#else
+#define CROSSDESK_HAS_CUDA_DRIVER 0
+#endif
+
+#endif
@@ -0,0 +1,198 @@
+#include "platform/common/gui/cuda_opengl_interop.h"
+#include "platform/common/gui/cuda_driver.h"
+
+#include <memory>
+#include <new>
+
+#include "platform/common/gui/native_video_frame_ref.h"
+
+namespace crossdesk {
+
+#if CROSSDESK_HAS_CUDA_DRIVER
+
+namespace {
+
+class ScopedCudaContext {
+ public:
+  ScopedCudaContext(const CudaDriver& driver, CUcontext context)
+      : cuda(driver),
+        active_(cuda.Check(cuda.context_push(context), "cuCtxPushCurrent")) {}
+  ~ScopedCudaContext() { Pop(); }
+  explicit operator bool() const { return active_; }
+  bool Pop() {
+    if (!active_) return true;
+    active_ = false;
+    CUcontext context = nullptr;
+    return cuda.Check(cuda.context_pop(&context), "cuCtxPopCurrent");
+  }
+
+ private:
+  const CudaDriver& cuda;
+  bool active_;
+};
+
+bool IsCudaFrame(const MiniRtcNativeVideoFrame* frame) {
+  return frame && GetOpenGlNativeFrame(*frame) &&
+         frame->type == MiniRtcNativeVideoFrameCudaNv12;
+}
+
+}  // namespace
+
+struct CudaOpenGlVideoBuffer {
+  const CudaDriver* driver = nullptr;
+  CUcontext context = nullptr;
+  CUstream stream = nullptr;
+  CUgraphicsResource resource = nullptr;
+  bool mapped = false;
+  bool failed = false;
+  NativeVideoFrameRef source_frame;
+};
+
+bool IsCudaDeviceAvailable() {
+  const auto* cuda = CudaDriver::Get();
+  int count = 0;
+  return cuda && cuda->init(0) == CUDA_SUCCESS &&
+         cuda->device_get_count(&count) == CUDA_SUCCESS && count > 0;
+}
+
+CudaOpenGlVideoBuffer* CreateCudaOpenGlVideoBuffer(
+    const MiniRtcNativeVideoFrame* frame, uint32_t gl_buffer) {
+  const auto* driver = CudaDriver::Get();
+  if (!IsCudaFrame(frame) || gl_buffer == 0 || !driver) {
+    return nullptr;
+  }
+  std::unique_ptr<CudaOpenGlVideoBuffer, decltype(&DestroyCudaOpenGlVideoBuffer)>
+      buffer(new (std::nothrow) CudaOpenGlVideoBuffer,
+             &DestroyCudaOpenGlVideoBuffer);
+  if (!buffer) return nullptr;
+  buffer->driver = driver;
+  const auto& cuda = *driver;
+  buffer->context = static_cast<CUcontext>(frame->payload.cuda_nv12.context);
+  buffer->source_frame = NativeVideoFrameRef(frame);
+  ScopedCudaContext context(cuda, buffer->context);
+  if (!context ||
+      !cuda.Check(cuda.stream_create(&buffer->stream,
+                                     CU_STREAM_NON_BLOCKING),
+                  "cuStreamCreate") ||
+      !cuda.Check(cuda.register_gl_buffer(
+                      &buffer->resource, gl_buffer,
+                      CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD),
+                  "cuGraphicsGLRegisterBuffer") ||
+      !context.Pop()) {
+    return nullptr;
+  }
+  return buffer.release();
+}
+
+int UploadCudaFrameToOpenGlBuffer(
+    CudaOpenGlVideoBuffer* buffer, const MiniRtcNativeVideoFrame* frame) {
+  if (!buffer || buffer->failed || !IsCudaFrame(frame) ||
+      frame->payload.cuda_nv12.context != buffer->context) {
+    return -1;
+  }
+  const auto& cuda = *buffer->driver;
+  ScopedCudaContext context(cuda, buffer->context);
+  if (!context) {
+    buffer->failed = true;
+    return -1;
+  }
+  // The caller has completed this buffer's previous GL use. Hold the new
+  // surface through asynchronous copies, including partially failed uploads.
+  buffer->source_frame = NativeVideoFrameRef(frame);
+  const char* operation = "cuGraphicsMapResources";
+  CUresult result =
+      cuda.map_resources(1, &buffer->resource, buffer->stream);
+  buffer->mapped = result == CUDA_SUCCESS;
+  CUdeviceptr destination = 0;
+  size_t mapped_size = 0;
+  if (result == CUDA_SUCCESS) {
+    operation = "cuGraphicsResourceGetMappedPointer";
+    result = cuda.mapped_pointer(
+        &destination, &mapped_size, buffer->resource);
+  }
+  const size_t y_size = static_cast<size_t>(frame->width) * frame->height;
+  if (result == CUDA_SUCCESS && mapped_size < y_size + y_size / 2) {
+    operation = "validate mapped buffer size";
+    result = CUDA_ERROR_INVALID_VALUE;
+  }
+  if (result == CUDA_SUCCESS) {
+    CUDA_MEMCPY2D copy{};
+    copy.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+    copy.srcDevice = frame->payload.cuda_nv12.y_device_pointer;
+    copy.srcPitch = frame->payload.cuda_nv12.y_stride;
+    copy.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+    copy.dstDevice = destination;
+    copy.dstPitch = frame->width;
+    copy.WidthInBytes = frame->width;
+    copy.Height = frame->height;
+    operation = "cuMemcpy2DAsync (Y plane)";
+    result = cuda.memcpy_2d_async(&copy, buffer->stream);
+    if (result == CUDA_SUCCESS) {
+      copy.srcDevice = frame->payload.cuda_nv12.uv_device_pointer;
+      copy.srcPitch = frame->payload.cuda_nv12.uv_stride;
+      copy.dstDevice = destination + y_size;
+      copy.Height = frame->height / 2;
+      operation = "cuMemcpy2DAsync (UV plane)";
+      result = cuda.memcpy_2d_async(&copy, buffer->stream);
+    }
+  }
+  if (buffer->mapped) {
+    const CUresult unmap =
+        cuda.unmap_resources(1, &buffer->resource, buffer->stream);
+    buffer->mapped = unmap != CUDA_SUCCESS;
+    if (result == CUDA_SUCCESS) {
+      operation = "cuGraphicsUnmapResources";
+      result = unmap;
+    } else {
+      cuda.Check(unmap, "cuGraphicsUnmapResources (cleanup)");
+    }
+  }
+  const bool copied = cuda.Check(result, operation);
+  const bool popped = context.Pop();
+  buffer->failed = !copied || !popped;
+  return buffer->failed ? -1 : 0;
+}
+
+void DestroyCudaOpenGlVideoBuffer(CudaOpenGlVideoBuffer* buffer) {
+  if (!buffer) return;
+  // Keep the frame's device context alive until after the context is popped.
+  std::unique_ptr<CudaOpenGlVideoBuffer> owner(buffer);
+  const auto& cuda = *buffer->driver;
+  ScopedCudaContext context(cuda, buffer->context);
+  if (!context) return;
+  if (buffer->stream) {
+    cuda.Check(cuda.stream_synchronize(buffer->stream),
+               "cuStreamSynchronize (destroy)");
+  }
+  if (buffer->mapped) {
+    cuda.Check(cuda.unmap_resources(
+                  1, &buffer->resource, buffer->stream),
+               "cuGraphicsUnmapResources (destroy)");
+    cuda.Check(cuda.stream_synchronize(buffer->stream),
+               "cuStreamSynchronize (unmap)");
+  }
+  if (buffer->resource) {
+    cuda.Check(cuda.unregister_resource(buffer->resource),
+               "cuGraphicsUnregisterResource");
+  }
+  if (buffer->stream) {
+    cuda.Check(cuda.stream_destroy(buffer->stream), "cuStreamDestroy");
+  }
+}
+
+#else
+
+bool IsCudaDeviceAvailable() { return false; }
+CudaOpenGlVideoBuffer* CreateCudaOpenGlVideoBuffer(
+    const MiniRtcNativeVideoFrame*, uint32_t) {
+  return nullptr;
+}
+int UploadCudaFrameToOpenGlBuffer(
+    CudaOpenGlVideoBuffer*, const MiniRtcNativeVideoFrame*) {
+  return -1;
+}
+void DestroyCudaOpenGlVideoBuffer(CudaOpenGlVideoBuffer*) {}
+
+#endif
+
+}  // namespace crossdesk
@@ -0,0 +1,35 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _CUDA_OPENGL_INTEROP_H_
+#define _CUDA_OPENGL_INTEROP_H_
+
+#include "minirtc.h"
+
+namespace crossdesk {
+
+bool IsCudaDeviceAvailable();
+
+struct CudaOpenGlVideoBuffer;
+
+// These operations require the matching GL context to be current. The caller
+// owns the GL buffer and must allocate its storage before registering it.
+CudaOpenGlVideoBuffer* CreateCudaOpenGlVideoBuffer(
+    const MiniRtcNativeVideoFrame* frame, uint32_t gl_buffer);
+
+// Asynchronous, GPU-only NV12 copy. Retains the source through the next upload
+// or destruction, including on failure. Before reusing the buffer, the caller
+// must wait for the previous GL fence. Frames must use the same CUDA context.
+int UploadCudaFrameToOpenGlBuffer(CudaOpenGlVideoBuffer* buffer,
+                                 const MiniRtcNativeVideoFrame* frame);
+
+// Finish prior GL use before calling. Waits for CUDA work and releases retained
+// frames; the caller may then resize/delete the GL buffer. Accepts null.
+void DestroyCudaOpenGlVideoBuffer(CudaOpenGlVideoBuffer* buffer);
+
+}  // namespace crossdesk
+
+#endif
@@ -0,0 +1,99 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _NATIVE_VIDEO_FRAME_REF_H_
+#define _NATIVE_VIDEO_FRAME_REF_H_
+
+#include <limits>
+#include <utility>
+
+#include "minirtc.h"
+
+namespace crossdesk {
+
+class NativeVideoFrameRef {
+public:
+  NativeVideoFrameRef() = default;
+
+  explicit NativeVideoFrameRef(const MiniRtcNativeVideoFrame *frame) {
+    if (frame && frame->owner && frame->retain && frame->release) {
+      frame_ = *frame;
+      frame_.struct_size = sizeof(frame_);
+      frame_.retain(frame_.owner);
+      valid_ = true;
+    }
+  }
+
+  NativeVideoFrameRef(const NativeVideoFrameRef &other)
+      : NativeVideoFrameRef(other.Get()) {}
+
+  NativeVideoFrameRef(NativeVideoFrameRef &&other) noexcept
+      : frame_(other.frame_), valid_(std::exchange(other.valid_, false)) {
+    other.frame_ = {};
+  }
+
+  NativeVideoFrameRef &operator=(NativeVideoFrameRef other) noexcept {
+    Swap(other);
+    return *this;
+  }
+
+  ~NativeVideoFrameRef() { Reset(); }
+
+  void Reset() {
+    if (valid_ && frame_.owner && frame_.release) {
+      frame_.release(frame_.owner);
+    }
+    frame_ = {};
+    valid_ = false;
+  }
+
+  void Swap(NativeVideoFrameRef &other) noexcept {
+    std::swap(frame_, other.frame_);
+    std::swap(valid_, other.valid_);
+  }
+
+  const MiniRtcNativeVideoFrame *Get() const { return valid_ ? &frame_ : nullptr; }
+  explicit operator bool() const { return valid_; }
+
+private:
+  MiniRtcNativeVideoFrame frame_{};
+  bool valid_ = false;
+};
+
+inline const MiniRtcNativeVideoFrame *GetOpenGlNativeFrame(
+    const MiniRtcNativeVideoFrame &frame) {
+  const MiniRtcNativeVideoFrame *native = &frame;
+  if (native->struct_size < static_cast<uint32_t>(sizeof(MiniRtcNativeVideoFrame)) ||
+      !native->owner || !native->retain || !native->release ||
+      !native->copy_to_nv12 || native->width == 0 || native->height == 0 ||
+      (native->width & 1U) != 0 || (native->height & 1U) != 0 ||
+      native->width > static_cast<uint32_t>(std::numeric_limits<int>::max()) ||
+      native->height > static_cast<uint32_t>(std::numeric_limits<int>::max())) {
+    return nullptr;
+  }
+  if (native->type == MiniRtcNativeVideoFrameCpuNv12) {
+    return native->payload.cpu_nv12.y_plane &&
+                   native->payload.cpu_nv12.uv_plane &&
+                   native->payload.cpu_nv12.y_stride >= native->width &&
+                   native->payload.cpu_nv12.uv_stride >= native->width
+               ? native
+               : nullptr;
+  }
+  if (native->type == MiniRtcNativeVideoFrameCudaNv12) {
+    return native->payload.cuda_nv12.y_device_pointer != 0 &&
+                   native->payload.cuda_nv12.uv_device_pointer != 0 &&
+                   native->payload.cuda_nv12.y_stride >= native->width &&
+                   native->payload.cuda_nv12.uv_stride >= native->width &&
+                   native->payload.cuda_nv12.context
+               ? native
+               : nullptr;
+  }
+  return nullptr;
+}
+
+}  // namespace crossdesk
+
+#endif
@@ -13,11 +13,10 @@
 namespace crossdesk {

 // NV12 underlay for Slint's FemtoVG OpenGL renderer on Windows and Linux.
-// MiniRTC submits either ref-counted Windows native NV12 frames or packed CPU
-// NV12 fallback frames from its decode callback thread. CUDA-backed frames use
-// CUDA/OpenGL interop; CPU-backed frames are retained without an intermediate
-// queue copy. The Slint UI thread updates Y and UV textures and performs color
-// conversion and scaling before Slint draws its overlay.
+// MiniRTC submits cross-platform native NV12 descriptors or tightly packed CPU
+// fallback frames from its decode callback thread. CUDA frames rotate through
+// fenced OpenGL upload resources; CPU descriptors expose their planes without
+// an intermediate queue copy. The UI thread always consumes the newest frame.
 class OpenGlVideoRenderer final : public VideoRenderer {
 public:
  OpenGlVideoRenderer();
@@ -33,11 +32,6 @@ public:
  bool IsReady() const override;
  bool IsActive() const override;

-  // Keeps Slint's native surface on a display-driven redraw loop while decoded
-  // frames are arriving. This avoids timer/vsync phase drift that otherwise
-  // causes every second redraw request to be coalesced on Windows.
-  bool ShouldContinueRendering() const;
-
  // Only the selected stream is queued for upload. Frames for other tabs are
  // retained by GuiRuntime at a throttled rate for thumbnail/tab restoration.
  bool SetSelectedStream(std::string remote_id) override;
@@ -49,7 +43,7 @@ public:
  SubmitResult SubmitCachedNv12(std::string_view remote_id, const uint8_t *data,
                                size_t size, int width, int height) override;
  SubmitResult SubmitNativeFrame(std::string_view remote_id,
-                                 const XVideoFrame &frame) override;
+                                 const MiniRtcNativeVideoFrame &frame) override;

  // Draws below Slint while its OpenGL context is current. All dimensions are
  // physical pixels in the window client area. corner_radius_pixels clips the
@@ -0,0 +1,53 @@
+#include "platform/linux/gui/cuda_graphics.h"
+
+#include <cstdlib>
+#include <initializer_list>
+
+#include "rd_log.h"
+
+#include "platform/common/gui/cuda_opengl_interop.h"
+
+namespace crossdesk {
+
+void ConfigureLinuxCudaGraphics(bool hardware_acceleration) {
+#if USE_CUDA && (defined(__x86_64__) || defined(__amd64__))
+  if (!hardware_acceleration) {
+    return;
+  }
+
+  // Respect explicit GPU/driver selection, including a request to use Mesa
+  // or software rendering. Native frames can still use the CPU fallback.
+  for (const char* name : {"__NV_PRIME_RENDER_OFFLOAD",
+                           "__NV_PRIME_RENDER_OFFLOAD_PROVIDER",
+                           "__GLX_VENDOR_LIBRARY_NAME",
+                           "__EGL_VENDOR_LIBRARY_FILENAMES",
+                           "__EGL_VENDOR_LIBRARY_DIRS", "DRI_PRIME",
+                           "LIBGL_ALWAYS_SOFTWARE",
+                           "MESA_LOADER_DRIVER_OVERRIDE"}) {
+    const char* value = std::getenv(name);
+    if (value && value[0] != '\0') {
+      LOG_INFO("Keeping explicit Linux graphics selection: {}={}", name,
+               value);
+      return;
+    }
+  }
+
+  if (!IsCudaDeviceAvailable()) {
+    return;
+  }
+
+  // Both EGL and GLX need to render on NVIDIA to share CUDA frame buffers.
+  // These are process-local, not desktop settings.
+  // https://download.nvidia.com/XFree86/Linux-x86_64/595.45.04/README/primerenderoffload.html
+  if (setenv("__NV_PRIME_RENDER_OFFLOAD", "1", 1) != 0 ||
+      setenv("__GLX_VENDOR_LIBRARY_NAME", "nvidia", 1) != 0) {
+    LOG_WARN("Unable to select NVIDIA PRIME rendering for CUDA video");
+    return;
+  }
+  LOG_INFO("Selected NVIDIA PRIME rendering for CUDA/OpenGL video interop");
+#else
+  (void)hardware_acceleration;
+#endif
+}
+
+}  // namespace crossdesk
@@ -0,0 +1,18 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _CUDA_GRAPHICS_H_
+#define _CUDA_GRAPHICS_H_
+
+namespace crossdesk {
+
+// Call before SDL or Slint initializes EGL/GLX. Hybrid laptops otherwise
+// create the GUI context on the integrated GPU while NVDEC uses NVIDIA.
+void ConfigureLinuxCudaGraphics(bool hardware_acceleration);
+
+}  // namespace crossdesk
+
+#endif
@@ -392,7 +392,10 @@ struct LinuxTrayImpl {
        exit_menu_label(GetExitMenuLabel(language_index_value)),
        exit_menu_ascii_label(IsAsciiPrintable(exit_menu_label)
                                  ? exit_menu_label
-                                  : "Exit") {}
+                                  : "Exit") {
+
+    EnsureTrayIcon();
+  }

  explicit LinuxTrayImpl(std::function<void()> show_window_callback,
                         std::function<void()> hide_window_callback,
@@ -416,7 +419,9 @@ struct LinuxTrayImpl {
        exit_menu_label(GetExitMenuLabel(language_index_value)),
        exit_menu_ascii_label(IsAsciiPrintable(exit_menu_label)
                                  ? exit_menu_label
-                                  : "Exit") {}
+                                  : "Exit") {
+    EnsureTrayIcon();
+  }

  ~LinuxTrayImpl() { RemoveTrayIcon(); }

@@ -429,7 +429,7 @@ bool ScreenCapturerDrm::CaptureOutputFrame(const DrmOutput& output,

  if (emit_callback && callback_) {
    callback_(nv12.data(), static_cast<int>(nv12.size()), capture_width,
-              capture_height, output.stream_id.c_str());
+              capture_height, output.stream_id.c_str(), nullptr);
  }

  UnmapFramebuffer(mapped_ptr, mapped_size, prime_fd);
@@ -50,7 +50,8 @@ int ScreenCapturerLinux::Init(const int fps, cb_desktop_data cb) {
  fps_ = fps;
  callback_orig_ = std::move(cb);
  callback_ = [this](unsigned char* data, int size, int width, int height,
-                     const char* reported_stream_id) {
+                     const char* reported_stream_id,
+                     const MiniRtcNativeVideoFrame* native_frame) {
    const std::string mapped_stream_id = MapStreamId(reported_stream_id);
    if (mapped_stream_id.empty()) {
      if (!invalid_stream_id_logged_.exchange(true,
@@ -64,7 +65,8 @@ int ScreenCapturerLinux::Init(const int fps, cb_desktop_data cb) {
    }
    invalid_stream_id_logged_.store(false, std::memory_order_relaxed);
    if (callback_orig_) {
-      callback_orig_(data, size, width, height, mapped_stream_id.c_str());
+      callback_orig_(data, size, width, height, mapped_stream_id.c_str(),
+                     native_frame);
    }
  };

@@ -1047,7 +1047,7 @@ void ScreenCapturerWayland::HandlePipeWireBuffer() {
  if (callback_) {
    const std::string stream_id = MakeDisplayStreamId(0);
    callback_(nv12.data(), static_cast<int>(nv12.size()), even_width,
-              even_height, stream_id.c_str());
+              even_height, stream_id.c_str(), nullptr);
  }
  pipewire_last_frame_ms_.store(NowMs());

@@ -321,7 +321,7 @@ void ScreenCapturerX11::OnFrame() {
  if (callback_) {
    const std::string stream_id = MakeDisplayStreamId(monitor_index);
    callback_(nv12.data(), width_ * height_ * 3 / 2, width_, height_,
-              stream_id.c_str());
+              stream_id.c_str(), nullptr);
  }

  XDestroyImage(image);
@@ -12,11 +12,11 @@

 namespace crossdesk {

-// macOS video compositor used by CrossDesk only. MiniRTC continues to expose
-// tightly packed CPU NV12 frames; this renderer performs the single required
-// copy into shared Metal buffers and converts NV12 to RGB in the fragment
-// shader. AppKit attachment and rendering are main-thread operations, while
-// SubmitNv12() is safe to call from MiniRTC's decode callback thread.
+// macOS video compositor used by CrossDesk only. VideoToolbox CVPixelBuffers
+// are sampled directly through CVMetalTextureCache; packed CPU NV12 remains a
+// fallback for software decoding and cached snapshots. AppKit attachment and
+// rendering are main-thread operations, while frame submission is safe from
+// MiniRTC's decode callback thread.
 class MacMetalVideoRenderer final : public VideoRenderer {
 public:
  MacMetalVideoRenderer();
@@ -37,6 +37,11 @@ class MacMetalVideoRenderer final : public VideoRenderer {
  SubmitResult SubmitNv12(std::string_view remote_id, const uint8_t* data,
                          size_t size, int width, int height) override;

+  // Retains an IOSurface-backed VideoToolbox CVPixelBuffer until the Metal
+  // command buffer using it has completed.
+  SubmitResult SubmitNativeFrame(std::string_view remote_id,
+                                 const MiniRtcNativeVideoFrame& frame) override;
+
  // Seeds a newly selected stream from its retained CPU snapshot without
  // replacing a newer decoded frame that is already queued or rendering.
  SubmitResult SubmitCachedNv12(std::string_view remote_id,
@@ -1,6 +1,7 @@
 #include "platform/macos/gui/metal_video_renderer.h"

 #import <AppKit/AppKit.h>
+#import <CoreVideo/CVMetalTextureCache.h>
 #import <Metal/Metal.h>
 #import <QuartzCore/CAMetalLayer.h>

@@ -194,6 +195,74 @@ namespace {

 constexpr size_t kFrameSlotCount = 3;

+class NativeVideoFrameRef {
+ public:
+  NativeVideoFrameRef() = default;
+
+  explicit NativeVideoFrameRef(const MiniRtcNativeVideoFrame* frame) {
+    if (frame && frame->owner && frame->retain && frame->release) {
+      frame_ = *frame;
+      frame_.struct_size = sizeof(frame_);
+      frame_.retain(frame_.owner);
+      valid_ = true;
+    }
+  }
+
+  NativeVideoFrameRef(const NativeVideoFrameRef& other)
+      : NativeVideoFrameRef(other.Get()) {}
+
+  NativeVideoFrameRef(NativeVideoFrameRef&& other) noexcept
+      : frame_(other.frame_), valid_(std::exchange(other.valid_, false)) {
+    other.frame_ = {};
+  }
+
+  NativeVideoFrameRef& operator=(NativeVideoFrameRef other) noexcept {
+    Swap(other);
+    return *this;
+  }
+
+  ~NativeVideoFrameRef() { Reset(); }
+
+  void Reset() {
+    if (valid_ && frame_.owner && frame_.release) {
+      frame_.release(frame_.owner);
+    }
+    frame_ = {};
+    valid_ = false;
+  }
+
+  void Swap(NativeVideoFrameRef& other) noexcept {
+    std::swap(frame_, other.frame_);
+    std::swap(valid_, other.valid_);
+  }
+
+  const MiniRtcNativeVideoFrame* Get() const {
+    return valid_ ? &frame_ : nullptr;
+  }
+  explicit operator bool() const { return valid_; }
+
+ private:
+  MiniRtcNativeVideoFrame frame_{};
+  bool valid_ = false;
+};
+
+const MiniRtcNativeVideoFrame* GetMacNativeFrame(
+    const MiniRtcNativeVideoFrame& frame) {
+  const MiniRtcNativeVideoFrame* native = &frame;
+  if (native->struct_size < static_cast<uint32_t>(sizeof(*native)) ||
+      native->type != MiniRtcNativeVideoFrameCVPixelBuffer ||
+      !native->payload.cv_pixel_buffer || !native->owner || !native->retain ||
+      !native->release || !native->copy_to_nv12 || native->width == 0 ||
+      native->height == 0 || (native->width & 1U) != 0 ||
+      (native->height & 1U) != 0 ||
+      native->width > static_cast<uint32_t>(std::numeric_limits<int>::max()) ||
+      native->height >
+          static_cast<uint32_t>(std::numeric_limits<int>::max())) {
+    return nullptr;
+  }
+  return native;
+}
+
 // Slint's winit backend creates AppKit windows with transparent backing so
 // transparent Slint items can be composited. Keep the content out of the
 // titlebar and choose whether AppKit's material or the semantic window color
@@ -262,6 +331,9 @@ struct FrameSlot {
  id<MTLBuffer> uv_buffer = nil;
  id<MTLTexture> y_texture = nil;
  id<MTLTexture> uv_texture = nil;
+  CVMetalTextureRef y_cv_texture = nullptr;
+  CVMetalTextureRef uv_cv_texture = nullptr;
+  NativeVideoFrameRef native_frame;
  size_t y_stride = 0;
  size_t uv_stride = 0;
  int width = 0;
@@ -274,6 +346,15 @@ struct FrameSlot {
  void ReleaseResources() {
    y_texture = nil;
    uv_texture = nil;
+    if (y_cv_texture) {
+      CFRelease(y_cv_texture);
+      y_cv_texture = nullptr;
+    }
+    if (uv_cv_texture) {
+      CFRelease(uv_cv_texture);
+      uv_cv_texture = nullptr;
+    }
+    native_frame.Reset();
    y_buffer = nil;
    uv_buffer = nil;
    y_stride = 0;
@@ -390,7 +471,7 @@ fragment half4 nv12_fragment(
                                - 16.0 / 255.0);
  const float2 uv = uv_texture.sample(video_sampler, in.texcoord).rg - 0.5;
  // BT.601 limited-range NV12, matching the previous libyuv NV12ToABGR/RAW
-  // path. MiniRTC's current XVideoFrame API does not carry color metadata, so
+  // path. MiniRTC's current MiniRtcVideoFrame API does not carry color metadata, so
  // retaining the established matrix avoids a platform-only color change.
  const float3 rgb = float3(y + 1.59602678 * uv.y,
                            y - 0.39176229 * uv.x - 0.81296764 * uv.y,
@@ -406,6 +487,7 @@ struct MacMetalVideoRenderer::Impl {
  id<MTLDevice> device = nil;
  id<MTLCommandQueue> command_queue = nil;
  id<MTLRenderPipelineState> pipeline = nil;
+  CVMetalTextureCacheRef texture_cache = nullptr;
  std::shared_ptr<SharedFrameState> frames =
      std::make_shared<SharedFrameState>();
  NSView* slint_view = nil;
@@ -417,6 +499,8 @@ struct MacMetalVideoRenderer::Impl {
  uint64_t rendered_content_generation = 0;
  std::shared_ptr<std::atomic<bool>> native_surface_needs_redraw =
      std::make_shared<std::atomic<bool>>(true);
+  std::atomic<bool> native_path_logged{false};
+  std::atomic<bool> native_fallback_logged{false};

  Impl() {
    @autoreleasepool {
@@ -430,6 +514,12 @@ struct MacMetalVideoRenderer::Impl {
        LOG_ERROR("Metal video renderer unavailable: command queue creation failed");
        return;
      }
+      const CVReturn cache_status = CVMetalTextureCacheCreate(
+          kCFAllocatorDefault, nullptr, device, nullptr, &texture_cache);
+      if (cache_status != kCVReturnSuccess || !texture_cache) {
+        LOG_WARN("Metal video renderer could not create CV texture cache: {}",
+                 cache_status);
+      }

      NSError* library_error = nil;
      id<MTLLibrary> library =
@@ -466,6 +556,11 @@ struct MacMetalVideoRenderer::Impl {
  ~Impl() {
    DetachViews();
    frames.reset();
+    if (texture_cache) {
+      CVMetalTextureCacheFlush(texture_cache, 0);
+      CFRelease(texture_cache);
+      texture_cache = nullptr;
+    }
  }

  bool Ready() const {
@@ -655,6 +750,142 @@ MacMetalVideoRenderer::SubmitResult MacMetalVideoRenderer::SubmitNv12(
  return SubmitNv12Internal(remote_id, data, size, width, height, true);
 }

+MacMetalVideoRenderer::SubmitResult MacMetalVideoRenderer::SubmitNativeFrame(
+    std::string_view remote_id, const MiniRtcNativeVideoFrame& frame) {
+  if (!IsReady()) {
+    return SubmitResult::failed;
+  }
+  const MiniRtcNativeVideoFrame* native = GetMacNativeFrame(frame);
+  if (!native) {
+    return SubmitResult::failed;
+  }
+
+  {
+    std::lock_guard lock(impl_->frames->mutex);
+    if (impl_->frames->selected_stream != remote_id) {
+      return SubmitResult::not_selected;
+    }
+  }
+
+  const int width = static_cast<int>(native->width);
+  const int height = static_cast<int>(native->height);
+  const auto submit_cpu_fallback = [&]() {
+    if (!impl_->native_fallback_logged.exchange(true,
+                                                std::memory_order_acq_rel)) {
+      LOG_WARN("macOS native CVPixelBuffer upload unavailable; using CPU NV12 "
+               "fallback");
+    }
+    const size_t y_size = static_cast<size_t>(width) * height;
+    std::vector<unsigned char> packed_nv12(y_size + y_size / 2);
+    if (native->copy_to_nv12(native->owner, packed_nv12.data(),
+                             packed_nv12.size()) != 0) {
+      return SubmitResult::failed;
+    }
+    return SubmitNv12(remote_id, packed_nv12.data(), packed_nv12.size(), width,
+                      height);
+  };
+
+  CVPixelBufferRef pixel_buffer =
+      static_cast<CVPixelBufferRef>(native->payload.cv_pixel_buffer);
+  const OSType pixel_format = CVPixelBufferGetPixelFormatType(pixel_buffer);
+  if (!CVPixelBufferIsPlanar(pixel_buffer) ||
+      CVPixelBufferGetPlaneCount(pixel_buffer) < 2 ||
+      CVPixelBufferGetWidth(pixel_buffer) != native->width ||
+      CVPixelBufferGetHeight(pixel_buffer) != native->height ||
+      (pixel_format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange &&
+       pixel_format != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)) {
+    return submit_cpu_fallback();
+  }
+
+  NativeVideoFrameRef retained(native);
+  if (!retained || !impl_->texture_cache) {
+    return submit_cpu_fallback();
+  }
+
+  CVMetalTextureRef y_cv_texture = nullptr;
+  CVReturn y_status = CVMetalTextureCacheCreateTextureFromImage(
+      kCFAllocatorDefault, impl_->texture_cache, pixel_buffer, nullptr,
+      MTLPixelFormatR8Unorm, native->width, native->height, 0,
+      &y_cv_texture);
+  if (y_status != kCVReturnSuccess || !y_cv_texture) {
+    return submit_cpu_fallback();
+  }
+
+  CVMetalTextureRef uv_cv_texture = nullptr;
+  CVReturn uv_status = CVMetalTextureCacheCreateTextureFromImage(
+      kCFAllocatorDefault, impl_->texture_cache, pixel_buffer, nullptr,
+      MTLPixelFormatRG8Unorm, native->width / 2U, native->height / 2U, 1,
+      &uv_cv_texture);
+  if (uv_status != kCVReturnSuccess || !uv_cv_texture) {
+    CFRelease(y_cv_texture);
+    return submit_cpu_fallback();
+  }
+
+  id<MTLTexture> y_texture = CVMetalTextureGetTexture(y_cv_texture);
+  id<MTLTexture> uv_texture = CVMetalTextureGetTexture(uv_cv_texture);
+  if (y_texture == nil || uv_texture == nil) {
+    CFRelease(y_cv_texture);
+    CFRelease(uv_cv_texture);
+    return submit_cpu_fallback();
+  }
+
+  auto& frames = *impl_->frames;
+  std::lock_guard lock(frames.mutex);
+  if (frames.selected_stream != remote_id) {
+    CFRelease(y_cv_texture);
+    CFRelease(uv_cv_texture);
+    return SubmitResult::not_selected;
+  }
+
+  // Latest-frame-only queue: replace an unconsumed decoded frame to bound
+  // latency, while never recycling a frame still referenced by the GPU.
+  FrameSlot* target = nullptr;
+  for (auto& slot : frames.slots) {
+    if (slot.use == SlotUse::pending) {
+      target = &slot;
+      break;
+    }
+  }
+  if (!target) {
+    uint64_t oldest_sequence = std::numeric_limits<uint64_t>::max();
+    for (auto& slot : frames.slots) {
+      if (slot.use != SlotUse::available) {
+        continue;
+      }
+      if (!slot.valid) {
+        target = &slot;
+        break;
+      }
+      if (slot.sequence < oldest_sequence) {
+        oldest_sequence = slot.sequence;
+        target = &slot;
+      }
+    }
+  }
+  if (!target) {
+    CFRelease(y_cv_texture);
+    CFRelease(uv_cv_texture);
+    return SubmitResult::dropped;
+  }
+
+  target->ReleaseResources();
+  target->y_cv_texture = y_cv_texture;
+  target->uv_cv_texture = uv_cv_texture;
+  target->y_texture = y_texture;
+  target->uv_texture = uv_texture;
+  target->native_frame = std::move(retained);
+  target->width = width;
+  target->height = height;
+  target->remote_id.assign(remote_id);
+  target->sequence = frames.next_sequence++;
+  target->use = SlotUse::pending;
+  target->valid = true;
+  if (!impl_->native_path_logged.exchange(true, std::memory_order_acq_rel)) {
+    LOG_INFO("macOS VideoToolbox-to-Metal native NV12 path enabled");
+  }
+  return SubmitResult::submitted;
+}
+
 MacMetalVideoRenderer::SubmitResult MacMetalVideoRenderer::SubmitCachedNv12(
    std::string_view remote_id, const uint8_t* data, size_t size, int width,
    int height) {
@@ -1045,40 +1276,57 @@ bool MacMetalVideoRenderer::CopyLatestNv12(
    return false;
  }

-  std::lock_guard lock(impl_->frames->mutex);
-  const FrameSlot* newest = nullptr;
-  for (const auto& slot : impl_->frames->slots) {
-    if (!slot.valid || slot.remote_id != remote_id || slot.y_buffer == nil ||
-        slot.uv_buffer == nil || slot.sequence == 0) {
-      continue;
+  NativeVideoFrameRef native_frame;
+  {
+    std::lock_guard lock(impl_->frames->mutex);
+    const FrameSlot* newest = nullptr;
+    for (const auto& slot : impl_->frames->slots) {
+      if (!slot.valid || slot.remote_id != remote_id || slot.sequence == 0 ||
+          (!slot.native_frame &&
+           (slot.y_buffer == nil || slot.uv_buffer == nil))) {
+        continue;
+      }
+      if (newest == nullptr || slot.sequence > newest->sequence) {
+        newest = &slot;
+      }
    }
-    if (newest == nullptr || slot.sequence > newest->sequence) {
-      newest = &slot;
+    if (newest == nullptr || newest->width <= 0 || newest->height <= 0) {
+      return false;
+    }
+
+    *width = newest->width;
+    *height = newest->height;
+    native_frame = newest->native_frame;
+    if (!native_frame) {
+      const size_t y_size =
+          static_cast<size_t>(newest->width) * newest->height;
+      output->resize(y_size + y_size / 2);
+      auto* y_source =
+          static_cast<const uint8_t*>(newest->y_buffer.contents);
+      auto* uv_source =
+          static_cast<const uint8_t*>(newest->uv_buffer.contents);
+      for (int row = 0; row < newest->height; ++row) {
+        std::memcpy(output->data() +
+                        static_cast<size_t>(row) * newest->width,
+                    y_source + static_cast<size_t>(row) * newest->y_stride,
+                    newest->width);
+      }
+      uint8_t* uv_destination = output->data() + y_size;
+      for (int row = 0; row < newest->height / 2; ++row) {
+        std::memcpy(uv_destination +
+                        static_cast<size_t>(row) * newest->width,
+                    uv_source + static_cast<size_t>(row) * newest->uv_stride,
+                    newest->width);
+      }
+      return true;
    }
-  }
-  if (newest == nullptr || newest->width <= 0 || newest->height <= 0) {
-    return false;
  }

-  const size_t y_size =
-      static_cast<size_t>(newest->width) * newest->height;
+  const MiniRtcNativeVideoFrame* native = native_frame.Get();
+  const size_t y_size = static_cast<size_t>(native->width) * native->height;
  output->resize(y_size + y_size / 2);
-  auto* y_source = static_cast<const uint8_t*>(newest->y_buffer.contents);
-  auto* uv_source = static_cast<const uint8_t*>(newest->uv_buffer.contents);
-  for (int row = 0; row < newest->height; ++row) {
-    std::memcpy(output->data() + static_cast<size_t>(row) * newest->width,
-                y_source + static_cast<size_t>(row) * newest->y_stride,
-                newest->width);
-  }
-  uint8_t* uv_destination = output->data() + y_size;
-  for (int row = 0; row < newest->height / 2; ++row) {
-    std::memcpy(uv_destination + static_cast<size_t>(row) * newest->width,
-                uv_source + static_cast<size_t>(row) * newest->uv_stride,
-                newest->width);
-  }
-  *width = newest->width;
-  *height = newest->height;
-  return true;
+  return native->copy_to_nv12(native->owner, output->data(), output->size()) ==
+         0;
 }

 }  // namespace crossdesk
@@ -17,6 +17,9 @@ namespace crossdesk {

 struct MacTrayImpl;

+// Activates the app and focuses the restored Slint window's current NSView.
+void MacActivateWindow(void* appkit_view);
+
 class MacTray {
 public:
  MacTray(::SDL_Window* app_window, const std::string& tooltip,
@@ -57,6 +57,8 @@ struct MacTrayImpl {
    } else if (app_window) {
      SDL_HideWindow(app_window);
    }
+    // Keep running through the menu-bar tray without a Dock application icon.
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
  }

  void RemoveTrayIcon() {
@@ -69,6 +71,8 @@ struct MacTrayImpl {
  }

  void ShowWindow() {
+    // Restore normal application behavior before showing or focusing a window.
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
    if (show_window) {
      show_window();
    } else if (app_window) {
@@ -142,6 +146,7 @@ struct MacTrayImpl {
  }

  void OpenSettings() {
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
    if (open_settings) {
      open_settings();
    } else {
@@ -279,6 +284,13 @@ MacTray::MacTray(std::function<void()> show_window,

 MacTray::~MacTray() = default;

+void MacActivateWindow(void *appkit_view) {
+  NSView *view = (__bridge NSView *)appkit_view;
+  NSWindow *window = [view window];
+  [NSApp activateIgnoringOtherApps:YES];
+  [window makeKeyAndOrderFront:nil];
+}
+
 void MacTray::MinimizeToTray() { impl_->MinimizeToTray(); }

 void MacTray::RemoveTrayIcon() { impl_->RemoveTrayIcon(); }
@@ -42,6 +42,65 @@ static std::string NSErrorToString(NSError *error) {
  return description ? description : "";
 }

+static void RetainCapturedPixelBuffer(void *owner) {
+  if (owner) {
+    CVPixelBufferRetain(static_cast<CVPixelBufferRef>(owner));
+  }
+}
+
+static void ReleaseCapturedPixelBuffer(void *owner) {
+  if (owner) {
+    CVPixelBufferRelease(static_cast<CVPixelBufferRef>(owner));
+  }
+}
+
+static int CopyCapturedPixelBufferToNv12(void *owner, uint8_t *destination,
+                                         size_t destination_size) {
+  auto pixel_buffer = static_cast<CVPixelBufferRef>(owner);
+  if (!pixel_buffer || !destination ||
+      !CVPixelBufferIsPlanar(pixel_buffer) ||
+      CVPixelBufferGetPlaneCount(pixel_buffer) < 2) {
+    return -1;
+  }
+  const OSType pixel_format = CVPixelBufferGetPixelFormatType(pixel_buffer);
+  if (pixel_format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange &&
+      pixel_format != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange) {
+    return -1;
+  }
+
+  const size_t width = CVPixelBufferGetWidth(pixel_buffer);
+  const size_t height = CVPixelBufferGetHeight(pixel_buffer);
+  const size_t required_size = width * height * 3U / 2U;
+  if (destination_size < required_size ||
+      CVPixelBufferLockBaseAddress(pixel_buffer,
+                                   kCVPixelBufferLock_ReadOnly) !=
+          kCVReturnSuccess) {
+    return -1;
+  }
+
+  const auto *y_plane = static_cast<const uint8_t *>(
+      CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 0));
+  const auto *uv_plane = static_cast<const uint8_t *>(
+      CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 1));
+  const size_t y_stride = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 0);
+  const size_t uv_stride = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 1);
+  int result = 0;
+  if (!y_plane || !uv_plane || y_stride < width || uv_stride < width) {
+    result = -1;
+  } else {
+    for (size_t row = 0; row < height; ++row) {
+      std::memcpy(destination + row * width, y_plane + row * y_stride, width);
+    }
+    uint8_t *uv_destination = destination + width * height;
+    for (size_t row = 0; row < height / 2U; ++row) {
+      std::memcpy(uv_destination + row * width,
+                  uv_plane + row * uv_stride, width);
+    }
+  }
+  CVPixelBufferUnlockBaseAddress(pixel_buffer, kCVPixelBufferLock_ReadOnly);
+  return result;
+}
+
 // The ScreenCaptureKit API was available in macOS 12.3, but full-screen capture
 // was reported to be broken before macOS 13 - see http://crbug.com/40234870.
 // Also, the `SCContentFilter` fields `contentRect` and `pointPixelScale` were
@@ -92,14 +151,11 @@ class API_AVAILABLE(macos(14.0)) ScreenCapturerSckImpl : public ScreenCapturer {
 private:
  std::vector<DisplayInfo> display_info_list_;
  std::map<int, CGDirectDisplayID> display_id_map_;
-  unsigned char *nv12_frame_ = nullptr;
-  size_t nv12_frame_size_ = 0;
-  int width_ = 0;
-  int height_ = 0;
  int fps_ = 60;
  bool show_cursor_ = false;
  bool capture_requested_ = false;
  bool invalid_stream_id_logged_ = false;
+  bool native_output_logged_ = false;

 public:
  // Called by SckHelper when shareable content is returned by ScreenCaptureKit. `content` will be
@@ -119,8 +175,8 @@ class API_AVAILABLE(macos(14.0)) ScreenCapturerSckImpl : public ScreenCapturer {
  // object. The helper may outlive this C++ instance, if a completion-handler is passed to
  // ScreenCaptureKit APIs and the C++ object is deleted before the handler executes.
  SckHelper *__strong helper_ = nil;
-  // Callback for returning captured frames, or errors, to the caller. Only used on the caller's
-  // thread.
+  // Callback for returning captured frames to the caller. ScreenCaptureKit may
+  // invoke it on its sample-handler queue.
  cb_desktop_data _on_data = nullptr;
  // Signals that a permanent error occurred. This may be set on any thread, and is read by
  // CaptureFrame() which runs on the caller's thread.
@@ -244,12 +300,6 @@ ScreenCapturerSckImpl::~ScreenCapturerSckImpl() {

  display_info_list_.clear();
  display_id_map_.clear();
-
-  if (nv12_frame_) {
-    delete[] nv12_frame_;
-    nv12_frame_ = nullptr;
-    nv12_frame_size_ = 0;
-  }
 }

 int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
@@ -262,6 +312,7 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
  fps_ = fps > 0 ? fps : 60;
  display_info_list_.clear();
  display_id_map_.clear();
+  native_output_logged_ = false;

  if (@available(macOS 10.15, *)) {
    bool has_permission = CGPreflightScreenCaptureAccess();
@@ -596,81 +647,69 @@ void ScreenCapturerSckImpl::OnNewCVPixelBuffer(CVPixelBufferRef pixelBuffer,
    return;
  }

-  size_t width = CVPixelBufferGetWidth(pixelBuffer);
-  size_t height = CVPixelBufferGetHeight(pixelBuffer);
-  if (width == 0 || height == 0 || CVPixelBufferGetPlaneCount(pixelBuffer) < 2) {
-    LOG_ERROR("Invalid CVPixelBuffer: width={}, height={}, planes={}", width, height,
+  const size_t width = CVPixelBufferGetWidth(pixelBuffer);
+  const size_t height = CVPixelBufferGetHeight(pixelBuffer);
+  const OSType pixel_format = CVPixelBufferGetPixelFormatType(pixelBuffer);
+  if (width == 0 || height == 0 || (width & 1U) != 0 ||
+      (height & 1U) != 0 || !CVPixelBufferIsPlanar(pixelBuffer) ||
+      CVPixelBufferGetPlaneCount(pixelBuffer) < 2 ||
+      (pixel_format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange &&
+       pixel_format != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)) {
+    LOG_ERROR("Invalid CVPixelBuffer: width={}, height={}, format={}, planes={}",
+              width, height, pixel_format,
              CVPixelBufferGetPlaneCount(pixelBuffer));
    return;
  }

-  CVReturn status = CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-  if (status != kCVReturnSuccess) {
-    LOG_ERROR("Failed to lock CVPixelBuffer base address: %d", status);
-    return;
-  }
-
-  size_t required_size = width * height * 3 / 2;
+  const size_t required_size = width * height * 3U / 2U;
  if (required_size > static_cast<size_t>((std::numeric_limits<int>::max)())) {
    LOG_ERROR("Captured frame is too large: {} bytes", required_size);
-    CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
    return;
  }

-  std::lock_guard<std::mutex> lock(lock_);
-  if (!_on_data || !capture_requested_) {
-    CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-    return;
-  }
-
-  if (!nv12_frame_ || nv12_frame_size_ < required_size) {
-    delete[] nv12_frame_;
-    nv12_frame_ = new unsigned char[required_size];
-    nv12_frame_size_ = required_size;
-  }
-  width_ = static_cast<int>(width);
-  height_ = static_cast<int>(height);
-
-  void *base_y = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
-  size_t stride_y = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
-
-  void *base_uv = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
-  size_t stride_uv = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);
-  if (!base_y || !base_uv || stride_y < width || stride_uv < width) {
-    LOG_ERROR("Invalid CVPixelBuffer planes: base_y={}, base_uv={}, stride_y={}, stride_uv={}",
-              base_y != nullptr, base_uv != nullptr, stride_y, stride_uv);
-    CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-    return;
-  }
-
-  unsigned char *dst_y = nv12_frame_;
-  for (size_t row = 0; row < height; ++row) {
-    memcpy(dst_y + row * width, static_cast<unsigned char *>(base_y) + row * stride_y, width);
-  }
-
-  unsigned char *dst_uv = nv12_frame_ + width * height;
-  for (size_t row = 0; row < height / 2; ++row) {
-    memcpy(dst_uv + row * width, static_cast<unsigned char *>(base_uv) + row * stride_uv, width);
-  }
-
-  const std::string stream_id = ResolveDisplayStreamId(
-      current_stream_id_.c_str(), display_info_list_.size(),
-      current_monitor_index_);
-  if (stream_id.empty()) {
-    if (!invalid_stream_id_logged_) {
-      LOG_ERROR("Dropping macOS frames without a registered stream id, "
-                "display_id={}",
-                current_display_);
-      invalid_stream_id_logged_ = true;
+  cb_desktop_data callback;
+  std::string stream_id;
+  bool log_native_output = false;
+  {
+    std::lock_guard<std::mutex> lock(lock_);
+    if (!_on_data || !capture_requested_) {
+      return;
+    }
+    stream_id = ResolveDisplayStreamId(current_stream_id_.c_str(),
+                                       display_info_list_.size(),
+                                       current_monitor_index_);
+    if (stream_id.empty()) {
+      if (!invalid_stream_id_logged_) {
+        LOG_ERROR("Dropping macOS frames without a registered stream id, "
+                  "display_id={}",
+                  current_display_);
+        invalid_stream_id_logged_ = true;
+      }
+      return;
+    }
+    invalid_stream_id_logged_ = false;
+    callback = _on_data;
+    if (!native_output_logged_) {
+      native_output_logged_ = true;
+      log_native_output = true;
    }
-    CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-    return;
  }
-  invalid_stream_id_logged_ = false;
-  _on_data(nv12_frame_, static_cast<int>(required_size), static_cast<int>(width),
-           static_cast<int>(height), stream_id.c_str());

-  CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
+  MiniRtcNativeVideoFrame native_frame{};
+  native_frame.struct_size = sizeof(native_frame);
+  native_frame.type = MiniRtcNativeVideoFrameCVPixelBuffer;
+  native_frame.width = static_cast<uint32_t>(width);
+  native_frame.height = static_cast<uint32_t>(height);
+  native_frame.payload.cv_pixel_buffer = pixelBuffer;
+  native_frame.owner = pixelBuffer;
+  native_frame.retain = &RetainCapturedPixelBuffer;
+  native_frame.release = &ReleaseCapturedPixelBuffer;
+  native_frame.copy_to_nv12 = &CopyCapturedPixelBufferToNv12;
+  if (log_native_output) {
+    LOG_INFO("macOS ScreenCaptureKit native CVPixelBuffer output enabled");
+  }
+  callback(nullptr, static_cast<int>(required_size), static_cast<int>(width),
+           static_cast<int>(height), stream_id.c_str(), &native_frame);
 }

 void ScreenCapturerSckImpl::StartOrReconfigureCapturer() {
@@ -1,3 +1,12 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _SYSTEM_INFO_H_
+#define _SYSTEM_INFO_H_
+
 #include "platform.h"

 #include <ifaddrs.h>
@@ -53,3 +62,6 @@ std::string GetHostName() {
 bool IsWaylandSession() { return false; }

 }  // namespace crossdesk
+
+
+#endif
@@ -58,8 +58,10 @@ public:
  virtual SubmitResult SubmitCachedNv12(std::string_view remote_id,
                                        const uint8_t* data, size_t size,
                                        int width, int height) = 0;
+  // Retains a platform-native decoded frame when the backend supports its
+  // storage and handle types. Unsupported backends keep the default fallback.
  virtual SubmitResult SubmitNativeFrame(std::string_view,
-                                         const XVideoFrame&) {
+                                         const MiniRtcNativeVideoFrame&) {
    return SubmitResult::failed;
  }

@@ -0,0 +1,109 @@
+#include "platform/windows/gui/slint_backend.h"
+
+#include <windows.h>
+
+#include <cstdlib>
+#include <iomanip>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <string_view>
+
+namespace crossdesk {
+namespace {
+
+struct HandleCloser {
+  void operator()(HANDLE handle) const noexcept {
+    if (handle != INVALID_HANDLE_VALUE) {
+      CloseHandle(handle);
+    }
+  }
+};
+using ScopedHandle = std::unique_ptr<void, HandleCloser>;
+
+std::string ErrorCode(DWORD code) {
+  std::ostringstream text;
+  text << "0x" << std::hex << std::uppercase << code;
+  return text.str();
+}
+
+std::string ProbeSlintRenderer(DWORD timeout_ms) {
+  std::wstring executable(32768, L'\0');
+  const DWORD length = GetModuleFileNameW(
+      nullptr, executable.data(), static_cast<DWORD>(executable.size()));
+  if (length == 0 || length >= executable.size()) {
+    return "Unable to locate renderer probe executable";
+  }
+  executable.resize(length);
+
+  // A job also cleans up the probe if the application is closed while the
+  // graphics driver is stuck. Create it suspended so assignment cannot race.
+  ScopedHandle job(CreateJobObjectW(nullptr, nullptr));
+  JOBOBJECT_EXTENDED_LIMIT_INFORMATION limits = {};
+  limits.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+  if (!job ||
+      !SetInformationJobObject(job.get(), JobObjectExtendedLimitInformation,
+                               &limits, sizeof(limits))) {
+    return "Unable to create renderer probe job: " + ErrorCode(GetLastError());
+  }
+
+  constexpr std::string_view argument = kSlintRendererProbeArgument;
+  std::wstring command = L"\"" + executable + L"\" ";
+  command.append(argument.begin(), argument.end());
+  STARTUPINFOW startup = {sizeof(startup)};
+  PROCESS_INFORMATION process = {};
+  if (!CreateProcessW(executable.c_str(), command.data(), nullptr, nullptr,
+                      FALSE, CREATE_NO_WINDOW | CREATE_SUSPENDED, nullptr,
+                      nullptr, &startup, &process)) {
+    return "Unable to start renderer probe: " + ErrorCode(GetLastError());
+  }
+  ScopedHandle process_handle(process.hProcess);
+  ScopedHandle thread_handle(process.hThread);
+  if (!AssignProcessToJobObject(job.get(), process.hProcess) ||
+      ResumeThread(process.hThread) == static_cast<DWORD>(-1)) {
+    const DWORD error = GetLastError();
+    TerminateProcess(process.hProcess, 1);
+    return "Unable to run renderer probe: " + ErrorCode(error);
+  }
+
+  const DWORD wait = WaitForSingleObject(process.hProcess, timeout_ms);
+  if (wait != WAIT_OBJECT_0) {
+    // Closing the job kills only our probe, including any stuck driver thread.
+    return wait == WAIT_TIMEOUT ? "Slint renderer probe timed out"
+                                : "Waiting for renderer probe failed: " +
+                                      ErrorCode(GetLastError());
+  }
+  DWORD exit_code = 0;
+  if (!GetExitCodeProcess(process.hProcess, &exit_code)) {
+    return "Unable to read renderer probe result: " + ErrorCode(GetLastError());
+  }
+  return exit_code == 0
+             ? std::string{}
+             : "Slint renderer probe exited with " + ErrorCode(exit_code);
+}
+
+}  // namespace
+
+SlintBackendSelection ConfigureWindowsSlintBackend(uint32_t probe_timeout_ms) {
+  if (const char* requested = std::getenv("SLINT_BACKEND");
+      requested && requested[0] != '\0') {
+    return {true, requested, "Using explicitly requested Slint backend"};
+  }
+
+  // Slint creates its own GL context. A successful SDL/WGL capability check
+  // cannot validate it, and a Rust panic cannot be caught by C++ exceptions.
+  // Exercise Slint in a separate process without touching GL in this process.
+  const std::string error = ProbeSlintRenderer(probe_timeout_ms);
+  if (error.empty()) {
+    return {true, "default", "Slint renderer probe rendered successfully"};
+  }
+
+  // _putenv_s updates the CRT and the OS environment read by slint_cpp.dll.
+  // This is process-local so a later launch can retry hardware rendering.
+  if (_putenv_s("SLINT_BACKEND", "winit-software") != 0) {
+    return {false, {}, "Unable to select Slint software rendering: " + error};
+  }
+  return {true, "winit-software", error};
+}
+
+}  // namespace crossdesk
@@ -0,0 +1,33 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _SLINT_BACKEND_H_
+#define _SLINT_BACKEND_H_
+
+#include <cstdint>
+#include <string>
+
+namespace crossdesk {
+
+struct SlintBackendSelection {
+  bool success = true;
+  std::string backend;
+  std::string diagnostic;
+};
+
+inline constexpr char kSlintRendererProbeArgument[] = "--slint-renderer-probe";
+
+// Call before creating any Slint components. The executable's main() must
+// dispatch kSlintRendererProbeArgument before services, settings or the daemon.
+SlintBackendSelection ConfigureWindowsSlintBackend(
+    uint32_t probe_timeout_ms = 10000);
+
+// Internal child-process entry point; never call in the main application.
+int RunSlintRendererProbe();
+
+}  // namespace crossdesk
+
+#endif
@@ -0,0 +1,59 @@
+#include <SDL3/SDL.h>
+#include <windows.h>
+
+#include <chrono>
+#include <iostream>
+
+#include "crossdesk_ui.h"
+#include "platform/windows/gui/slint_backend.h"
+
+namespace crossdesk {
+
+int RunSlintRendererProbe() {
+  SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+  if (!SDL_Init(SDL_INIT_VIDEO)) {
+    return 1;
+  }
+
+  int result = 2;
+  {
+    // Reuse the application's single AOT entry point. Independently generated
+    // headers can contain colliding internal component names across TUs.
+    auto probe = ui::MainWindow::create();
+    probe->set_custom_titlebar(true);
+    // AfterRendering confirms that the real GL context, shader initialization
+    // and first draw all succeeded. GPU readback from an off-screen window can
+    // be black even when rendering works, so do not use its pixels as a test.
+    const auto notifier_error = probe->window().set_rendering_notifier(
+        [&](slint::RenderingState state, slint::GraphicsAPI) {
+          if (state == slint::RenderingState::AfterRendering) {
+            result = 0;
+          }
+        });
+    probe->window().set_position(
+        slint::PhysicalPosition(slint::Point<int32_t>{-32000, -32000}));
+    probe->show();
+    slint::Timer timer;
+    timer.start(slint::TimerMode::SingleShot, std::chrono::milliseconds(100),
+                [&] {
+                  // Renderers without a rendering notifier (software) support
+                  // snapshots.
+                  if (notifier_error) {
+                    const auto pixels = probe->window().take_snapshot();
+                    if (pixels && pixels->width() > 0 && pixels->height() > 0) {
+                      result = 0;
+                    } else {
+                      std::cerr << "Slint probe could not read rendered pixels"
+                                << std::endl;
+                    }
+                  }
+                  slint::quit_event_loop();
+                });
+    slint::run_event_loop();
+    probe->hide();
+  }
+  SDL_Quit();
+  return result;
+}
+
+}  // namespace crossdesk
@@ -60,6 +60,8 @@ WinTray::WinTray(HWND app_hwnd, HICON icon, const std::wstring& tooltip,
  nid_.uCallbackMessage = WM_TRAY_CALLBACK;
  nid_.hIcon = icon_;
  wcsncpy_s(nid_.szTip, tip_.c_str(), _TRUNCATE);
+
+  EnsureTrayIcon();
 }

 WinTray::WinTray(std::function<void()> show_window,
@@ -80,7 +82,7 @@ WinTray::~WinTray() {
 }

 void WinTray::MinimizeToTray() {
-  Shell_NotifyIcon(NIM_ADD, &nid_);
+  EnsureTrayIcon();
  if (hide_window_) {
    hide_window_();
  } else if (app_hwnd_) {
@@ -88,7 +90,25 @@ void WinTray::MinimizeToTray() {
  }
 }

-void WinTray::RemoveTrayIcon() { Shell_NotifyIcon(NIM_DELETE, &nid_); }
+bool WinTray::EnsureTrayIcon() {
+  if (tray_icon_added_) {
+    // NIM_MODIFY also detects an icon lost when Explorer was restarted.
+    if (Shell_NotifyIcon(NIM_MODIFY, &nid_)) {
+      return true;
+    }
+    tray_icon_added_ = false;
+  }
+
+  tray_icon_added_ = Shell_NotifyIcon(NIM_ADD, &nid_) != FALSE;
+  return tray_icon_added_;
+}
+
+void WinTray::RemoveTrayIcon() {
+  if (tray_icon_added_) {
+    Shell_NotifyIcon(NIM_DELETE, &nid_);
+    tray_icon_added_ = false;
+  }
+}

 void WinTray::ShowApplicationWindow() {
  if (show_window_) {
@@ -33,6 +33,7 @@ class WinTray {
  bool HandleTrayMessage(MSG* msg);

 private:
+  bool EnsureTrayIcon();
  void ShowApplicationWindow();
  void OpenSettings();

@@ -42,6 +43,7 @@ class WinTray {
  std::wstring tip_;
  int language_index_;
  NOTIFYICONDATA nid_;
+  bool tray_icon_added_ = false;
  std::function<void()> show_window_;
  std::function<void()> hide_window_;
  std::function<void()> open_settings_;
@@ -384,7 +384,7 @@ void ScreenCapturerDxgi::CaptureLoop() {
      if (idx >= 0 && idx < static_cast<int>(display_info_list_.size())) {
        const std::string stream_id = MakeDisplayStreamId(idx);
        callback_(nv12_frame_, nv12_size, even_width, even_height,
-                  stream_id.c_str());
+                  stream_id.c_str(), nullptr);
      } else {
        LOG_ERROR("DXGI: CaptureLoop invalid monitor_index {} (list size {})",
                  idx, display_info_list_.size());
@@ -212,7 +212,8 @@ void ScreenCapturerGdi::CaptureLoop() {

    if (callback_) {
      const std::string stream_id = MakeDisplayStreamId(idx);
-      callback_(nv12_frame_, nv12_size, width, height, stream_id.c_str());
+      callback_(nv12_frame_, nv12_size, width, height, stream_id.c_str(),
+                nullptr);
    }

    SelectObject(mem_dc, old);
@@ -406,7 +406,7 @@ void ScreenCapturerWgc::OnFrame(const WgcSession::wgc_session_frame& frame,

    const std::string stream_id = MakeDisplayStreamId(id);
    on_data_(nv12_frame_, nv12_size, even_width, even_height,
-             stream_id.c_str());
+             stream_id.c_str(), nullptr);
  }
 }

@@ -15,10 +15,14 @@
 #include <vector>

 #include <display_stream_id.h>
+#include "captured_nv12_frame.h"
 #include "interactive_state.h"
+#include "named_pipe_deadline.h"
 #include "rd_log.h"
 #include "screen_capturer_dxgi.h"
 #include "screen_capturer_gdi.h"
+#include "secure_desktop_frame_schedule.h"
+#include "secure_desktop_status_poller.h"
 #include "service_host.h"
 #include "session_helper_shared.h"
 #include "wgc_plugin_api.h"
@@ -40,17 +44,6 @@ constexpr int kSecureDesktopCaptureMinFps = 30;
 constexpr int kSecureDesktopCaptureMaxIntervalMs =
    1000 / kSecureDesktopCaptureMinFps;

-struct SecureDesktopServiceStatus {
-  bool service_available = false;
-  bool capture_active = false;
-  bool helper_running = false;
-  DWORD active_session_id = 0xFFFFFFFF;
-  DWORD error_code = 0;
-  std::string interactive_stage;
-  std::string interactive_desktop;
-  std::string error;
-};
-
 class WgcPluginCapturer final : public ScreenCapturer {
 public:
  using CreateFn = ScreenCapturer* (*)();
@@ -185,41 +178,6 @@ bool IsTransientWindowsServiceStatusError(const std::string& error) {
         error == "pipe_read_failed";
 }

-bool ReadPipeMessage(HANDLE pipe, std::vector<uint8_t>* response_out,
-                     DWORD* error_code_out = nullptr) {
-  if (response_out == nullptr) {
-    return false;
-  }
-
-  response_out->clear();
-  if (error_code_out != nullptr) {
-    *error_code_out = 0;
-  }
-
-  std::vector<uint8_t> chunk(64 * 1024);
-  while (true) {
-    DWORD bytes_read = 0;
-    if (ReadFile(pipe, chunk.data(), static_cast<DWORD>(chunk.size()),
-                 &bytes_read, nullptr)) {
-      response_out->insert(response_out->end(), chunk.begin(),
-                           chunk.begin() + bytes_read);
-      return true;
-    }
-
-    const DWORD error = GetLastError();
-    response_out->insert(response_out->end(), chunk.begin(),
-                         chunk.begin() + bytes_read);
-    if (error == ERROR_MORE_DATA) {
-      continue;
-    }
-
-    if (error_code_out != nullptr) {
-      *error_code_out = error;
-    }
-    return false;
-  }
-}
-
 bool ParseSecureDesktopFrameResponse(const std::vector<uint8_t>& response,
                                     std::vector<uint8_t>* nv12_frame_out,
                                     int* width_out, int* height_out,
@@ -260,25 +218,27 @@ bool ParseSecureDesktopFrameResponse(const std::vector<uint8_t>& response,
  return true;
 }

-bool QuerySecureDesktopServiceStatus(SecureDesktopServiceStatus* status) {
-  if (status == nullptr) {
-    return false;
+SecureDesktopServiceStatus QuerySecureDesktopServiceStatus() {
+  SecureDesktopServiceStatus status;
+  std::vector<uint8_t> response;
+  DWORD error_code = 0;
+  if (!QueryNamedPipeWithDeadline(kCrossDeskServicePipeName, "status",
+                                  kSecureDesktopStatusPipeTimeoutMs, &response,
+                                  &status.error, &error_code)) {
+    status.error_code = error_code;
+    return status;
  }
-
-  *status = {};
-  const std::string response =
-      QueryCrossDeskService("status", kSecureDesktopStatusPipeTimeoutMs);
-  Json json = Json::parse(response, nullptr, false);
+  Json json = Json::parse(response.begin(), response.end(), nullptr, false);
  if (json.is_discarded() || !json.is_object()) {
-    status->error = "invalid_service_status_json";
-    return false;
+    status.error = "invalid_service_status_json";
+    return status;
  }

-  status->service_available = json.value("ok", false);
-  if (!status->service_available) {
-    status->error = json.value("error", std::string("service_unavailable"));
-    status->error_code = json.value("code", 0u);
-    return true;
+  status.service_available = json.value("ok", false);
+  if (!status.service_available) {
+    status.error = json.value("error", std::string("service_unavailable"));
+    status.error_code = json.value("code", 0u);
+    return status;
  }

  if (ShouldNormalizeUnlockToUserDesktop(
@@ -292,26 +252,27 @@ bool QuerySecureDesktopServiceStatus(SecureDesktopServiceStatus* status) {
          json.value("password_box_visible", false),
          json.value("unlock_ui_visible", false),
          json.value("last_session_event", std::string()))) {
-    status->active_session_id = json.value("active_session_id", 0xFFFFFFFFu);
-    status->interactive_stage = "user-desktop";
-    status->interactive_desktop.clear();
-    status->capture_active = false;
-    return true;
+    status.active_session_id = json.value("active_session_id", 0xFFFFFFFFu);
+    status.interactive_stage = "user-desktop";
+    status.interactive_desktop.clear();
+    status.capture_active = false;
+    return status;
  }

-  status->active_session_id = json.value("active_session_id", 0xFFFFFFFFu);
-  status->helper_running = json.value("secure_input_helper_running", false);
-  status->interactive_stage = json.value("interactive_stage", std::string());
-  status->interactive_desktop =
+  status.active_session_id = json.value("active_session_id", 0xFFFFFFFFu);
+  status.helper_running = json.value("secure_input_helper_running", false);
+  status.helper_process_id = json.value("secure_input_helper_pid", 0u);
+  status.interactive_stage = json.value("interactive_stage", std::string());
+  status.interactive_desktop =
      json.value("interactive_input_desktop", std::string());
  const bool secure_desktop_active =
      json.value("interactive_secure_desktop_active",
                 json.value("secure_desktop_active", false));
-  status->capture_active =
-      status->active_session_id != 0xFFFFFFFF &&
+  status.capture_active =
+      status.active_session_id != 0xFFFFFFFF &&
      (secure_desktop_active ||
-       IsSecureDesktopInteractionRequired(status->interactive_stage));
-  return true;
+       IsSecureDesktopInteractionRequired(status.interactive_stage));
+  return status;
 }

 bool QuerySecureDesktopHelperCommand(DWORD session_id,
@@ -322,60 +283,29 @@ bool QuerySecureDesktopHelperCommand(DWORD session_id,
    return false;
  }

-  response_out->clear();
  const std::wstring pipe_name =
      GetCrossDeskSecureInputHelperPipeName(session_id);
-  if (!WaitNamedPipeW(pipe_name.c_str(), kSecureDesktopHelperPipeTimeoutMs)) {
-    if (error_out != nullptr) {
-      *error_out = "pipe_unavailable:" + std::to_string(GetLastError());
-    }
-    return false;
+  std::string error;
+  DWORD code = 0;
+  // The legacy single-frame path includes a full GDI capture and a large
+  // response. Give it a separate deadline from the small control messages.
+  const DWORD timeout_ms =
+      command.rfind(kCrossDeskSecureInputCaptureCommandPrefix, 0) == 0
+          ? 1000
+          : kSecureDesktopHelperPipeTimeoutMs;
+  const bool ok = QueryNamedPipeWithDeadline(pipe_name, command, timeout_ms,
+                                             response_out, &error, &code);
+  if (!ok && error_out != nullptr) {
+    *error_out = error + ":" + std::to_string(code);
  }
-
-  HANDLE pipe = CreateFileW(pipe_name.c_str(), GENERIC_READ | GENERIC_WRITE, 0,
-                            nullptr, OPEN_EXISTING, 0, nullptr);
-  if (pipe == INVALID_HANDLE_VALUE) {
-    if (error_out != nullptr) {
-      *error_out = "pipe_connect_failed:" + std::to_string(GetLastError());
-    }
-    return false;
-  }
-
-  DWORD pipe_mode = PIPE_READMODE_MESSAGE;
-  SetNamedPipeHandleState(pipe, &pipe_mode, nullptr, nullptr);
-
-  DWORD bytes_written = 0;
-  if (!WriteFile(pipe, command.data(), static_cast<DWORD>(command.size()),
-                 &bytes_written, nullptr)) {
-    const DWORD error = GetLastError();
-    CloseHandle(pipe);
-    if (error_out != nullptr) {
-      *error_out = "pipe_write_failed:" + std::to_string(error);
-    }
-    return false;
-  }
-
-  DWORD read_error = 0;
-  const bool read_ok = ReadPipeMessage(pipe, response_out, &read_error);
-  CloseHandle(pipe);
-  if (!read_ok) {
-    if (error_out != nullptr) {
-      *error_out = "pipe_read_failed:" + std::to_string(read_error);
-    }
-    return false;
-  }
-
-  return true;
+  return ok;
 }

-bool QuerySecureDesktopHelperFrame(DWORD session_id, int left, int top,
-                                   int width, int height, bool show_cursor,
-                                   const std::string& stage,
-                                   const std::string& desktop,
-                                   std::vector<uint8_t>* nv12_frame_out,
-                                   int* captured_width_out,
-                                   int* captured_height_out,
-                                   std::string* error_out) {
+bool QuerySecureDesktopHelperFrame(
+    DWORD session_id, int left, int top, int width, int height,
+    bool show_cursor, const std::string& stage, const std::string& desktop,
+    std::vector<uint8_t>* nv12_frame_out, int* captured_width_out,
+    int* captured_height_out, std::string* error_out) {
  if (nv12_frame_out == nullptr || captured_width_out == nullptr ||
      captured_height_out == nullptr) {
    return false;
@@ -403,8 +333,17 @@ ScreenCapturerWin::~ScreenCapturerWin() { Destroy(); }
 int ScreenCapturerWin::Init(const int fps, cb_desktop_data cb) {
  fps_ = fps;
  cb_orig_ = cb;
+  native_output_logged_.store(false, std::memory_order_relaxed);
+  native_output_error_logged_.store(false, std::memory_order_relaxed);
+  try {
+    native_frame_pool_ = CapturedNv12FramePool::Create();
+  } catch (...) {
+    LOG_ERROR("Windows capturer: failed to create native NV12 frame pool");
+    return -1;
+  }
  cb_ = [this](unsigned char* data, int size, int w, int h,
-               const char* reported_stream_id) {
+               const char* reported_stream_id,
+               const MiniRtcNativeVideoFrame* native_frame) {
    if (secure_desktop_capture_active_.load(std::memory_order_relaxed)) {
      return;
    }
@@ -450,7 +389,8 @@ int ScreenCapturerWin::Init(const int fps, cb_desktop_data cb) {
          "elapsed_ms={}",
          raw_stream_id, mapped_stream_id, w, h, size, elapsed_ms);
    }
-    if (cb_orig_) cb_orig_(data, size, w, h, mapped_stream_id.c_str());
+    EmitCapturedFrame(data, size, w, h, mapped_stream_id.c_str(),
+                      native_frame);
  };

  int ret = -1;
@@ -513,9 +453,52 @@ int ScreenCapturerWin::Destroy() {
    stream_id_alias_.clear();
    handle_to_canonical_index_.clear();
  }
+  native_frame_pool_.reset();
  return 0;
 }

+void ScreenCapturerWin::EmitCapturedFrame(
+    unsigned char* data, int size, int width, int height,
+    const char* stream_id, const MiniRtcNativeVideoFrame* native_frame) {
+  if (!cb_orig_) {
+    return;
+  }
+
+  if (native_frame) {
+    if (!native_output_logged_.exchange(true, std::memory_order_relaxed)) {
+      LOG_INFO("Windows capturer native frame output enabled (type={})",
+               static_cast<uint32_t>(native_frame->type));
+    }
+    cb_orig_(data, size, width, height, stream_id, native_frame);
+    return;
+  }
+
+  CapturedNv12Frame* owned_frame = nullptr;
+  if (native_frame_pool_ && data && size > 0 && width > 0 && height > 0) {
+    owned_frame = native_frame_pool_->CopyFrom(
+        data, static_cast<size_t>(size), static_cast<uint32_t>(width),
+        static_cast<uint32_t>(height));
+  }
+  if (!owned_frame) {
+    if (!native_output_error_logged_.exchange(true,
+                                               std::memory_order_relaxed)) {
+      LOG_WARN(
+          "Windows capturer could not retain a native NV12 frame; falling "
+          "back to copied CPU input (size={}x{}, bytes={})",
+          width, height, size);
+    }
+    cb_orig_(data, size, width, height, stream_id, nullptr);
+    return;
+  }
+
+  if (!native_output_logged_.exchange(true, std::memory_order_relaxed)) {
+    LOG_INFO("Windows capturer native NV12 output enabled");
+  }
+  cb_orig_(nullptr, static_cast<int>(owned_frame->Size()), width, height,
+           stream_id, owned_frame->Descriptor());
+  owned_frame->Release();
+}
+
 int ScreenCapturerWin::Start(bool show_cursor) {
  if (!impl_) return -1;
  if (running_.load(std::memory_order_relaxed)) {
@@ -1108,17 +1091,35 @@ void ScreenCapturerWin::SecureDesktopCaptureLoop() {
  const int frame_interval_ms =
      fps_ > 0 ? (std::min)(kSecureDesktopCaptureMaxIntervalMs, 1000 / fps_)
               : kSecureDesktopCaptureMaxIntervalMs;
-  ULONGLONG last_status_tick = 0;
  ULONGLONG last_error_tick = 0;
-  bool last_capture_active = false;
-  bool last_service_available = true;
-  std::string last_stage;
-  std::string last_service_error;
  ULONGLONG capture_stage_started_tick = 0;
  bool post_secure_restart_pending = false;
  ULONGLONG post_secure_restart_deadline_tick = 0;
  ULONGLONG last_post_secure_restart_tick = 0;
  SecureDesktopServiceStatus status;
+  SecureDesktopStatusPoller status_poller(
+      QuerySecureDesktopServiceStatus,
+      std::chrono::milliseconds(kSecureDesktopStatusIntervalMs));
+  SecureDesktopFrameSchedule frame_schedule;
+  frame_schedule.Reset(GetTickCount64());
+  ULONGLONG stats_started = GetTickCount64();
+  unsigned shared_frames = 0, fallback_frames = 0, shared_waits = 0;
+  unsigned shared_restarts = 0;
+  int64_t max_status_ms = 0;
+  auto report_stats = [&](bool force) {
+    const ULONGLONG elapsed = GetTickCount64() - stats_started;
+    if (elapsed == 0 || (!force && elapsed < 5000)) return;
+    if (shared_frames || fallback_frames || shared_waits || shared_restarts) {
+      LOG_INFO(
+          "Secure capture delivery: shared_fps={:.1f}, fallback_fps={:.1f}, "
+          "pending_waits={}, shared_restarts={}, status_max_ms={}",
+          shared_frames * 1000.0 / elapsed, fallback_frames * 1000.0 / elapsed,
+          shared_waits, shared_restarts, max_status_ms);
+    }
+    stats_started = GetTickCount64();
+    shared_frames = fallback_frames = shared_waits = shared_restarts = 0;
+    max_status_ms = 0;
+  };
  std::vector<uint8_t> secure_frame;

  while (running_.load(std::memory_order_relaxed)) {
@@ -1128,67 +1129,60 @@ void ScreenCapturerWin::SecureDesktopCaptureLoop() {
    }

    const ULONGLONG now = GetTickCount64();
-    if (last_status_tick == 0 ||
-        now - last_status_tick >= kSecureDesktopStatusIntervalMs) {
-      SecureDesktopServiceStatus latest_status;
-      const bool status_ok = QuerySecureDesktopServiceStatus(&latest_status);
-      status = latest_status;
-      if (status_ok) {
-        const bool service_changed =
-            status.service_available != last_service_available;
-        const bool service_error_changed =
-            !status.service_available && status.error != last_service_error;
-        if (service_changed || service_error_changed) {
-          if (status.service_available) {
-            LOG_INFO(
-                "Windows capturer secure desktop service available, polling "
-                "session_id={}",
-                status.active_session_id);
-          } else if (IsTransientWindowsServiceStatusError(status.error)) {
-            LOG_INFO(
-                "Windows capturer secure desktop service temporarily unavailable: "
-                "error={}, code={}",
-                status.error, status.error_code);
-          } else {
-            LOG_WARN(
-                "Windows capturer secure desktop service unavailable: "
-                "error={}, code={}",
-                status.error, status.error_code);
-          }
-          last_service_available = status.service_available;
-          last_service_error = status.error;
+    const auto frame_started = std::chrono::steady_clock::now();
+    report_stats(false);
+    if (auto sample = status_poller.Take()) {
+      const auto previous = std::exchange(status, std::move(sample->status));
+      max_status_ms = (std::max)(max_status_ms, sample->query_ms);
+      if (status.service_available != previous.service_available ||
+          status.error != previous.error) {
+        if (status.service_available) {
+          LOG_INFO(
+              "Windows capturer secure desktop service available, "
+              "polling session_id={}",
+              status.active_session_id);
+        } else if (IsTransientWindowsServiceStatusError(status.error)) {
+          LOG_INFO(
+              "Windows capturer secure desktop service temporarily "
+              "unavailable; "
+              "keeping last capture state: error={}, code={}",
+              status.error, status.error_code);
+        } else {
+          LOG_WARN(
+              "Windows capturer secure desktop service unavailable: "
+              "error={}, code={}",
+              status.error, status.error_code);
        }
-      } else if (last_service_available ||
-                 last_service_error != "invalid_service_status_json") {
-        LOG_WARN("Windows capturer secure desktop service status query failed");
-        last_service_available = false;
-        last_service_error = "invalid_service_status_json";
      }

      secure_desktop_capture_active_.store(status.capture_active,
                                           std::memory_order_relaxed);
-      if (status.capture_active != last_capture_active ||
-          status.interactive_stage != last_stage) {
+      if (status.capture_active != previous.capture_active ||
+          status.interactive_stage != previous.interactive_stage ||
+          status.active_session_id != previous.active_session_id ||
+          status.helper_process_id != previous.helper_process_id) {
+        report_stats(true);
+        // A restarted helper can leave our mapping/event handles alive, but
+        // their old producer is gone. Explicitly establish a fresh stream.
+        StopSecureDesktopSharedCapture(secure_shared_session_id_);
+        frame_schedule.Reset(now);
        const bool secure_capture_started =
-            !last_capture_active && status.capture_active;
+            !previous.capture_active && status.capture_active;
        const bool secure_capture_ended =
-            last_capture_active && !status.capture_active;
+            previous.capture_active && !status.capture_active;
        capture_stage_started_tick = now;
        LOG_INFO(
            "Windows capturer secure desktop state: active={}, stage='{}', "
            "session_id={}",
            status.capture_active, status.interactive_stage,
            status.active_session_id);
-        last_capture_active = status.capture_active;
-        last_stage = status.interactive_stage;
        if (secure_capture_started) {
          post_secure_restart_pending = false;
          post_secure_desktop_waiting_for_frame_.store(
              false, std::memory_order_relaxed);
-          post_secure_desktop_drop_logged_.store(
-              false, std::memory_order_relaxed);
-          post_secure_desktop_started_tick_.store(
-              0, std::memory_order_relaxed);
+          post_secure_desktop_drop_logged_.store(false,
+                                                 std::memory_order_relaxed);
+          post_secure_desktop_started_tick_.store(0, std::memory_order_relaxed);
        } else if (secure_capture_ended) {
          post_secure_restart_pending = true;
          post_secure_restart_deadline_tick =
@@ -1196,13 +1190,12 @@ void ScreenCapturerWin::SecureDesktopCaptureLoop() {
          last_post_secure_restart_tick = 0;
          post_secure_desktop_waiting_for_frame_.store(
              true, std::memory_order_relaxed);
-          post_secure_desktop_drop_logged_.store(
-              false, std::memory_order_relaxed);
-          post_secure_desktop_started_tick_.store(
-              now, std::memory_order_relaxed);
+          post_secure_desktop_drop_logged_.store(false,
+                                                 std::memory_order_relaxed);
+          post_secure_desktop_started_tick_.store(now,
+                                                  std::memory_order_relaxed);
        }
      }
-      last_status_tick = now;
    }

    if (!status.capture_active || status.active_session_id == 0xFFFFFFFF) {
@@ -1248,41 +1241,64 @@ void ScreenCapturerWin::SecureDesktopCaptureLoop() {
    std::string error_message;
    bool frame_delivered = false;
    const bool show_cursor = show_cursor_.load(std::memory_order_relaxed);
-    const int shared_fps =
-        fps_ > 0 ? (std::max)(kSecureDesktopCaptureMinFps, fps_)
-                 : kSecureDesktopCaptureMinFps;
+    const int shared_fps = fps_ > 0
+                               ? (std::max)(kSecureDesktopCaptureMinFps, fps_)
+                               : kSecureDesktopCaptureMinFps;

-    if (StartSecureDesktopSharedCapture(status.active_session_id, left, top,
-                                        width, height,
-                                        status.interactive_stage,
-                                        status.interactive_desktop,
-                                        show_cursor, shared_fps,
-                                        &error_message) &&
+    if (secure_shared_capture_started_ &&
+        frame_schedule.SharedCaptureStalled(now)) {
+      LOG_WARN("Secure shared capture stalled; restarting producer");
+      StopSecureDesktopSharedCapture(secure_shared_session_id_);
+      frame_schedule.Reset(GetTickCount64());
+      ++shared_restarts;
+    }
+
+    bool shared_ready = false;
+    const bool was_started = secure_shared_capture_started_;
+    if (was_started || frame_schedule.CanStart(now)) {
+      shared_ready = StartSecureDesktopSharedCapture(
+          status.active_session_id, left, top, width, height,
+          status.interactive_stage, status.interactive_desktop, show_cursor,
+          shared_fps, &error_message);
+      if (!shared_ready) {
+        frame_schedule.OnStartFailure(GetTickCount64());
+      } else if (!was_started) {
+        frame_schedule.Reset(GetTickCount64());
+      }
+    }
+
+    if (shared_ready &&
        ReadSecureDesktopSharedFrame(
-            static_cast<DWORD>(frame_interval_ms + 20), &secure_frame,
+            static_cast<DWORD>((std::max)(50, frame_interval_ms + 20)),
+            &secure_frame, &captured_width, &captured_height, &error_message)) {
+      frame_delivered = true;
+      ++shared_frames;
+      frame_schedule.OnSharedFrame(GetTickCount64());
+    }
+
+    const bool frame_pending = shared_ready && !frame_delivered &&
+                               IsPendingSecureDesktopFrame(error_message);
+    if (frame_pending) ++shared_waits;
+    if (shared_ready && !frame_delivered && !frame_pending) {
+      StopSecureDesktopSharedCapture(secure_shared_session_id_);
+      frame_schedule.OnStartFailure(GetTickCount64());
+    }
+    if (!frame_delivered && !frame_pending &&
+        QuerySecureDesktopHelperFrame(
+            status.active_session_id, left, top, width, height, show_cursor,
+            status.interactive_stage, status.interactive_desktop, &secure_frame,
            &captured_width, &captured_height, &error_message)) {
-      if (cb_orig_ && !secure_frame.empty()) {
-        cb_orig_(secure_frame.data(), static_cast<int>(secure_frame.size()),
-                 captured_width, captured_height, display_name.c_str());
-      }
      frame_delivered = true;
+      ++fallback_frames;
    }

-    if (!frame_delivered &&
-        QuerySecureDesktopHelperFrame(status.active_session_id, left, top,
-                                      width, height, show_cursor,
-                                      status.interactive_stage,
-                                      status.interactive_desktop,
-                                      &secure_frame, &captured_width,
-                                      &captured_height, &error_message)) {
-      if (cb_orig_ && !secure_frame.empty()) {
-        cb_orig_(secure_frame.data(), static_cast<int>(secure_frame.size()),
-                 captured_width, captured_height, display_name.c_str());
-      }
-      frame_delivered = true;
+    if (frame_delivered && !secure_frame.empty()) {
+      EmitCapturedFrame(secure_frame.data(),
+                        static_cast<int>(secure_frame.size()), captured_width,
+                        captured_height, display_name.c_str());
    }

-    if (!frame_delivered) {
+    if (!frame_delivered && !frame_pending) {
      const bool transient_error =
          IsTransientSecureDesktopFrameError(error_message);
      const bool in_grace_period = capture_stage_started_tick != 0 &&
@@ -1313,9 +1329,18 @@ void ScreenCapturerWin::SecureDesktopCaptureLoop() {
      }
    }

-    std::this_thread::sleep_for(std::chrono::milliseconds(frame_interval_ms));
+    const auto elapsed_ms =
+        std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::steady_clock::now() - frame_started)
+            .count();
+    const int sleep_ms = SecureDesktopFrameSchedule::RemainingFrameDelay(
+        frame_interval_ms, static_cast<uint64_t>(elapsed_ms));
+    if (sleep_ms > 0) {
+      std::this_thread::sleep_for(std::chrono::milliseconds(sleep_ms));
+    }
  }

+  report_stats(true);
  StopSecureDesktopSharedCapture(secure_shared_session_id_);
  secure_desktop_capture_active_.store(false, std::memory_order_relaxed);
 }
@@ -14,6 +14,7 @@
 #include <cstdint>
 #include <memory>
 #include <mutex>
+#include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>
@@ -22,6 +23,8 @@

 namespace crossdesk {

+class CapturedNv12FramePool;
+
 class ScreenCapturerWin : public ScreenCapturer {
 public:
  ScreenCapturerWin();
@@ -53,6 +56,8 @@ class ScreenCapturerWin : public ScreenCapturer {
  std::mutex alias_mutex_;
  std::vector<DisplayInfo> canonical_displays_;
  std::atomic<bool> invalid_stream_id_logged_{false};
+  std::atomic<bool> native_output_logged_{false};
+  std::atomic<bool> native_output_error_logged_{false};
  std::atomic<bool> running_{false};
  std::atomic<bool> paused_{false};
  std::atomic<bool> show_cursor_{true};
@@ -77,9 +82,13 @@ class ScreenCapturerWin : public ScreenCapturer {
  std::string secure_shared_stage_;
  std::string secure_shared_desktop_;
  bool secure_shared_capture_started_ = false;
+  std::shared_ptr<CapturedNv12FramePool> native_frame_pool_;

  void BuildCanonicalFromImpl();
  void RebuildAliasesFromImpl();
+  void EmitCapturedFrame(unsigned char* data, int size, int width, int height,
+                         const char* stream_id,
+                         const MiniRtcNativeVideoFrame* native_frame = nullptr);
  void StopSecureCaptureThread();
  bool RestartCaptureBackendAfterSecureDesktop();
  void SecureDesktopCaptureLoop();
@@ -0,0 +1,50 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _SECURE_DESKTOP_FRAME_SCHEDULE_H_
+#define _SECURE_DESKTOP_FRAME_SCHEDULE_H_
+
+#include <cstdint>
+#include <string>
+
+namespace crossdesk {
+
+inline bool IsPendingSecureDesktopFrame(const std::string& error) {
+  return error == "frame_wait_timeout" ||
+         error == "shared_frame_write_in_progress" ||
+         error == "shared_frame_changed_during_read";
+}
+
+// A 4K GDI frame can take longer than a single consumer wait. Do not issue
+// another expensive screenshot while the shared producer is still healthy.
+class SecureDesktopFrameSchedule {
+ public:
+  void Reset(uint64_t now) {
+    last_shared_frame_ = now;
+    next_start_attempt_ = 0;
+  }
+
+  void OnSharedFrame(uint64_t now) { last_shared_frame_ = now; }
+  bool SharedCaptureStalled(uint64_t now) const {
+    return now - last_shared_frame_ >= 1000;
+  }
+  bool CanStart(uint64_t now) const { return now >= next_start_attempt_; }
+  void OnStartFailure(uint64_t now) { next_start_attempt_ = now + 1000; }
+
+  static int RemainingFrameDelay(int interval_ms, uint64_t elapsed_ms) {
+    return elapsed_ms >= static_cast<uint64_t>(interval_ms)
+               ? 0
+               : interval_ms - static_cast<int>(elapsed_ms);
+  }
+
+ private:
+  uint64_t last_shared_frame_ = 0;
+  uint64_t next_start_attempt_ = 0;
+};
+
+}  // namespace crossdesk
+
+#endif
@@ -0,0 +1,110 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _SECURE_DESKTOP_STATUS_POLLER_H_
+#define _SECURE_DESKTOP_STATUS_POLLER_H_
+
+#include <chrono>
+#include <condition_variable>
+#include <cstdint>
+#include <functional>
+#include <mutex>
+#include <optional>
+#include <string>
+#include <thread>
+#include <utility>
+
+namespace crossdesk {
+
+struct SecureDesktopServiceStatus {
+  bool service_available = false;
+  bool capture_active = false;
+  bool helper_running = false;
+  uint32_t helper_process_id = 0;
+  uint32_t active_session_id = 0xFFFFFFFF;
+  uint32_t error_code = 0;
+  std::string interactive_stage;
+  std::string interactive_desktop;
+  std::string error;
+
+  void UpdateFrom(SecureDesktopServiceStatus latest) {
+    if (latest.service_available) {
+      *this = std::move(latest);
+    } else {
+      // Failed IPC says nothing about the desktop. Retain the last confirmed
+      // capture state until a valid response reports a change or an unlock.
+      service_available = false;
+      error = std::move(latest.error);
+      error_code = latest.error_code;
+    }
+  }
+};
+
+// The query runs without holding the snapshot mutex. Slow service/helper IPC
+// must not stop delivery of frames that are already available in shared memory.
+class SecureDesktopStatusPoller {
+ public:
+  using Query = std::function<SecureDesktopServiceStatus()>;
+
+  struct Sample {
+    SecureDesktopServiceStatus status;
+    int64_t query_ms = 0;
+  };
+
+  explicit SecureDesktopStatusPoller(Query query,
+                                     std::chrono::milliseconds interval)
+      : thread_([this, query = std::move(query), interval]() {
+          std::unique_lock<std::mutex> lock(mutex_);
+          while (!stopping_) {
+            lock.unlock();
+            const auto started = std::chrono::steady_clock::now();
+            auto latest = query();
+            const auto elapsed =
+                std::chrono::duration_cast<std::chrono::milliseconds>(
+                    std::chrono::steady_clock::now() - started);
+            lock.lock();
+            sample_.status.UpdateFrom(std::move(latest));
+            sample_.query_ms = elapsed.count();
+            pending_ = true;
+            // Even a failed/slow query gets a pause, avoiding a retry storm.
+            wake_.wait_for(lock, interval, [this] { return stopping_; });
+          }
+        }) {}
+
+  ~SecureDesktopStatusPoller() {
+    {
+      std::lock_guard<std::mutex> lock(mutex_);
+      stopping_ = true;
+    }
+    wake_.notify_one();
+    thread_.join();
+  }
+
+  SecureDesktopStatusPoller(const SecureDesktopStatusPoller&) = delete;
+  SecureDesktopStatusPoller& operator=(const SecureDesktopStatusPoller&) =
+      delete;
+
+  std::optional<Sample> Take() {
+    std::lock_guard<std::mutex> lock(mutex_);
+    if (!pending_) {
+      return std::nullopt;
+    }
+    pending_ = false;
+    return sample_;
+  }
+
+ private:
+  std::mutex mutex_;
+  std::condition_variable wake_;
+  bool stopping_ = false;
+  bool pending_ = false;
+  Sample sample_;
+  std::thread thread_;
+};
+
+}  // namespace crossdesk
+
+#endif
@@ -0,0 +1,101 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _INTERACTIVE_DESKTOP_H_
+#define _INTERACTIVE_DESKTOP_H_
+
+#include <Windows.h>
+
+#include <string>
+
+namespace crossdesk {
+
+inline std::wstring GetDesktopNameW(HDESK desktop) {
+  DWORD bytes_needed = 0;
+  if (desktop == nullptr) {
+    return {};
+  }
+  GetUserObjectInformationW(desktop, UOI_NAME, nullptr, 0, &bytes_needed);
+  if (bytes_needed == 0) {
+    return {};
+  }
+  std::wstring name(bytes_needed / sizeof(wchar_t), L'\0');
+  if (!GetUserObjectInformationW(desktop, UOI_NAME, name.data(), bytes_needed,
+                                 &bytes_needed)) {
+    return {};
+  }
+  while (!name.empty() && name.back() == L'\0') {
+    name.pop_back();
+  }
+  return name;
+}
+
+// Use only on worker threads without windows or hooks. Restore the original
+// desktop before closing the handle: Windows cannot close a desktop in use.
+class ScopedInteractiveDesktop {
+ public:
+  ScopedInteractiveDesktop()
+      : original_(GetThreadDesktop(GetCurrentThreadId())) {}
+  ScopedInteractiveDesktop(const ScopedInteractiveDesktop&) = delete;
+  ScopedInteractiveDesktop& operator=(const ScopedInteractiveDesktop&) = delete;
+
+  ~ScopedInteractiveDesktop() {
+    if (desktop_ != nullptr) {
+      SetThreadDesktop(original_);
+      CloseDesktop(desktop_);
+    }
+  }
+
+  bool Bind(const std::wstring& fallback_name) {
+    constexpr ACCESS_MASK access =
+        DESKTOP_CREATEWINDOW | DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS |
+        DESKTOP_SWITCHDESKTOP | DESKTOP_JOURNALPLAYBACK;
+    // SendInput requires playback access on the attached desktop; otherwise
+    // it returns ERROR_ACCESS_DENIED even for a correctly attached SYSTEM helper.
+    // The service's stage/name can lag a lock, unlock, or UAC transition.
+    // Opening a cached desktop can succeed even when it is no longer visible.
+    HDESK desktop = OpenInputDesktop(0, FALSE, access);
+    if (desktop == nullptr && !fallback_name.empty()) {
+      desktop = OpenDesktopW(fallback_name.c_str(), 0, FALSE, access);
+    }
+    if (desktop == nullptr) {
+      return false;
+    }
+    if (!SetThreadDesktop(desktop)) {
+      const DWORD error = GetLastError();
+      CloseDesktop(desktop);
+      SetLastError(error);
+      return false;
+    }
+    if (desktop_ != nullptr) {
+      CloseDesktop(desktop_);
+    }
+    desktop_ = desktop;
+    name_ = GetDesktopNameW(desktop_);
+    return true;
+  }
+
+  bool IsInputDesktop() const {
+    HDESK input = OpenInputDesktop(0, FALSE, DESKTOP_READOBJECTS);
+    if (input == nullptr) {
+      return false;
+    }
+    const std::wstring input_name = GetDesktopNameW(input);
+    CloseDesktop(input);
+    return !name_.empty() && _wcsicmp(name_.c_str(), input_name.c_str()) == 0;
+  }
+
+  const std::wstring& name() const { return name_; }
+
+ private:
+  HDESK original_ = nullptr;
+  HDESK desktop_ = nullptr;
+  std::wstring name_;
+};
+
+}  // namespace crossdesk
+
+#endif
@@ -0,0 +1,143 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-07
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _NAMED_PIPE_DEADLINE_H_
+#define _NAMED_PIPE_DEADLINE_H_
+
+#include <Windows.h>
+
+#include <algorithm>
+#include <cstdint>
+#include <string>
+#include <vector>
+
+namespace crossdesk {
+
+namespace pipe_deadline_detail {
+struct Handle {
+  explicit Handle(HANDLE handle = INVALID_HANDLE_VALUE) : value(handle) {}
+  Handle(const Handle&) = delete;
+  Handle& operator=(const Handle&) = delete;
+  HANDLE value = INVALID_HANDLE_VALUE;
+  ~Handle() {
+    if (value != INVALID_HANDLE_VALUE && value != nullptr) CloseHandle(value);
+  }
+};
+
+inline DWORD Remaining(ULONGLONG deadline) {
+  const ULONGLONG now = GetTickCount64();
+  return now >= deadline ? 0 : static_cast<DWORD>(deadline - now);
+}
+
+inline bool Transfer(HANDLE pipe, HANDLE event, bool write, void* data,
+                     DWORD size, ULONGLONG deadline, DWORD* transferred,
+                     DWORD* error) {
+  *transferred = 0;
+  if (Remaining(deadline) == 0) {
+    *error = ERROR_SEM_TIMEOUT;
+    return false;
+  }
+  ResetEvent(event);
+  OVERLAPPED operation{};
+  operation.hEvent = event;
+  const BOOL complete =
+      write ? WriteFile(pipe, data, size, transferred, &operation)
+            : ReadFile(pipe, data, size, transferred, &operation);
+  *error = complete ? ERROR_SUCCESS : GetLastError();
+  if (*error == ERROR_IO_PENDING) {
+    const DWORD wait = WaitForSingleObject(event, Remaining(deadline));
+    if (wait != WAIT_OBJECT_0) {
+      *error = wait == WAIT_TIMEOUT ? ERROR_SEM_TIMEOUT : GetLastError();
+      // Keep the OVERLAPPED and buffer alive until cancellation completes.
+      CancelIoEx(pipe, &operation);
+      DWORD ignored = 0;
+      GetOverlappedResult(pipe, &operation, &ignored, TRUE);
+      return false;
+    }
+  } else if (*error != ERROR_SUCCESS && *error != ERROR_MORE_DATA) {
+    return false;
+  }
+  // Immediate MORE_DATA also needs GetOverlappedResult: ReadFile may leave
+  // its byte-count output at zero even though part of the message was read.
+  const BOOL result = GetOverlappedResult(pipe, &operation, transferred, FALSE);
+  *error = result ? ERROR_SUCCESS : GetLastError();
+  return result != FALSE;
+}
+}  // namespace pipe_deadline_detail
+
+// One deadline covers connection, write, and every response chunk. A connect
+// timeout alone does not bound a synchronous ReadFile on an unresponsive peer.
+inline bool QueryNamedPipeWithDeadline(const std::wstring& name,
+                                       const std::string& command,
+                                       DWORD timeout_ms,
+                                       std::vector<uint8_t>* response,
+                                       std::string* error, DWORD* error_code) {
+  using namespace pipe_deadline_detail;
+  response->clear();
+  error->clear();
+  *error_code = ERROR_SUCCESS;
+  const ULONGLONG deadline = GetTickCount64() + timeout_ms;
+  Handle pipe;
+  while (true) {
+    const DWORD remaining = Remaining(deadline);
+    if (remaining == 0) break;
+    if (WaitNamedPipeW(name.c_str(), remaining)) {
+      pipe.value =
+          CreateFileW(name.c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr,
+                      OPEN_EXISTING, FILE_FLAG_OVERLAPPED, nullptr);
+      if (pipe.value != INVALID_HANDLE_VALUE) break;
+    }
+    *error_code = GetLastError();
+    if (*error_code != ERROR_FILE_NOT_FOUND && *error_code != ERROR_PIPE_BUSY &&
+        *error_code != ERROR_SEM_TIMEOUT)
+      break;
+    Sleep((std::min)(DWORD{10}, Remaining(deadline)));
+  }
+  if (pipe.value == INVALID_HANDLE_VALUE) {
+    *error = "pipe_unavailable";
+    if (*error_code == ERROR_SUCCESS) *error_code = ERROR_SEM_TIMEOUT;
+    return false;
+  }
+  DWORD mode = PIPE_READMODE_MESSAGE;
+  if (!SetNamedPipeHandleState(pipe.value, &mode, nullptr, nullptr)) {
+    *error = "pipe_connect_failed";
+    *error_code = GetLastError();
+    return false;
+  }
+  Handle event{CreateEventW(nullptr, TRUE, FALSE, nullptr)};
+  if (event.value == nullptr) {
+    *error = "pipe_connect_failed";
+    *error_code = GetLastError();
+    return false;
+  }
+  DWORD transferred = 0;
+  if (!Transfer(pipe.value, event.value, true,
+                const_cast<char*>(command.data()),
+                static_cast<DWORD>(command.size()), deadline, &transferred,
+                error_code) ||
+      transferred != command.size()) {
+    *error = "pipe_write_failed";
+    return false;
+  }
+  std::vector<uint8_t> chunk(64 * 1024);
+  while (true) {
+    const bool complete = Transfer(pipe.value, event.value, false, chunk.data(),
+                                   static_cast<DWORD>(chunk.size()), deadline,
+                                   &transferred, error_code);
+    if (!complete && *error_code != ERROR_MORE_DATA) {
+      response->clear();
+      *error = "pipe_read_failed";
+      return false;
+    }
+    response->insert(response->end(), chunk.begin(),
+                     chunk.begin() + transferred);
+    if (complete) return true;
+  }
+}
+
+}  // namespace crossdesk
+
+#endif
@@ -16,6 +16,7 @@
 #include <string>
 #include <thread>

+#include "interactive_state.h"
 #include "path_manager.h"
 #include "rd_log.h"
 #include "session_helper_shared.h"
@@ -1459,18 +1460,18 @@ std::string CrossDeskServiceHost::ResolveInteractiveStageLocked() const {

 std::string CrossDeskServiceHost::ResolveInteractiveDesktopLocked(
    const std::string& interactive_stage) const {
-  if (interactive_stage == "lock-screen") {
-    return "Default";
-  }
-
  if (session_helper_status_ok_ &&
      session_helper_report_input_desktop_available_ &&
      !session_helper_report_input_desktop_.empty() &&
-      (interactive_stage == "credential-ui" ||
+      (IsSecureDesktopInteractionRequired(interactive_stage) ||
       session_helper_report_consent_ui_visible_)) {
    return session_helper_report_input_desktop_;
  }

+  if (interactive_stage == "lock-screen") {
+    return "Default";
+  }
+
  if (input_desktop_available_ && !input_desktop_name_.empty() &&
      (interactive_stage == "credential-ui" || consent_ui_visible_)) {
    return input_desktop_name_;
@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>

+#include "interactive_desktop.h"
 #include "path_manager.h"
 #include "rd_log.h"
 #include "session_helper_shared.h"
@@ -30,6 +31,7 @@ namespace {

 using crossdesk::get_logger;
 using crossdesk::InitLogger;
+using crossdesk::ScopedInteractiveDesktop;
 using Json = nlohmann::json;

 constexpr DWORD kSessionHelperStatePollMs = 1000;
@@ -538,123 +540,8 @@ void HelperIpcServerLoop(HANDLE stop_event, DWORD session_id,
  }
 }

-std::wstring GetDesktopNameW(HDESK desktop) {
-  if (desktop == nullptr) {
-    return L"";
-  }
-
-  DWORD bytes_needed = 0;
-  GetUserObjectInformationW(desktop, UOI_NAME, nullptr, 0, &bytes_needed);
-  if (bytes_needed == 0) {
-    return L"";
-  }
-
-  std::wstring desktop_name(bytes_needed / sizeof(wchar_t), L'\0');
-  if (!GetUserObjectInformationW(desktop, UOI_NAME, desktop_name.data(),
-                                 bytes_needed, &bytes_needed)) {
-    return L"";
-  }
-
-  while (!desktop_name.empty() && desktop_name.back() == L'\0') {
-    desktop_name.pop_back();
-  }
-  return desktop_name;
-}
-
 std::wstring GetCurrentThreadDesktopNameW() {
-  return GetDesktopNameW(GetThreadDesktop(GetCurrentThreadId()));
-}
-
-constexpr ACCESS_MASK kCrossDeskInteractiveDesktopAccess =
-    DESKTOP_CREATEWINDOW | DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS |
-    DESKTOP_SWITCHDESKTOP;
-
-bool EnsureThreadDesktop(const wchar_t* desktop_name,
-                         HDESK* opened_desktop_out = nullptr) {
-  if (desktop_name == nullptr) {
-    return false;
-  }
-
-  std::wstring current_desktop = GetCurrentThreadDesktopNameW();
-  if (!current_desktop.empty() &&
-      _wcsicmp(current_desktop.c_str(), desktop_name) == 0) {
-    return true;
-  }
-
-  HDESK desktop =
-      OpenDesktopW(desktop_name, 0, FALSE, kCrossDeskInteractiveDesktopAccess);
-  if (desktop == nullptr) {
-    return false;
-  }
-
-  if (!SetThreadDesktop(desktop)) {
-    CloseDesktop(desktop);
-    return false;
-  }
-
-  if (opened_desktop_out != nullptr) {
-    *opened_desktop_out = desktop;
-  } else {
-    CloseDesktop(desktop);
-  }
-  return true;
-}
-
-bool EnsureThreadInputDesktop(HDESK* opened_desktop_out = nullptr) {
-  HDESK desktop =
-      OpenInputDesktop(0, FALSE, kCrossDeskInteractiveDesktopAccess);
-  if (desktop == nullptr) {
-    return false;
-  }
-
-  const std::wstring input_desktop = GetDesktopNameW(desktop);
-  const std::wstring current_desktop = GetCurrentThreadDesktopNameW();
-  if (!input_desktop.empty() && !current_desktop.empty() &&
-      _wcsicmp(input_desktop.c_str(), current_desktop.c_str()) == 0) {
-    if (opened_desktop_out != nullptr) {
-      *opened_desktop_out = desktop;
-    } else {
-      CloseDesktop(desktop);
-    }
-    return true;
-  }
-
-  if (!SetThreadDesktop(desktop)) {
-    CloseDesktop(desktop);
-    return false;
-  }
-
-  if (opened_desktop_out != nullptr) {
-    *opened_desktop_out = desktop;
-  } else {
-    CloseDesktop(desktop);
-  }
-  return true;
-}
-
-bool EnsureThreadInteractiveDesktop(HDESK* opened_desktop_out = nullptr) {
-  if (opened_desktop_out != nullptr) {
-    *opened_desktop_out = nullptr;
-  }
-
-  if (EnsureThreadInputDesktop(opened_desktop_out)) {
-    return true;
-  }
-  const DWORD input_desktop_error = GetLastError();
-
-  if (EnsureThreadDesktop(L"Winlogon", opened_desktop_out)) {
-    return true;
-  }
-  const DWORD winlogon_error = GetLastError();
-
-  LOG_WARN(
-      "Failed to switch secure input helper desktop, input_error={}, "
-      "winlogon_error={}, current='{}'",
-      input_desktop_error, winlogon_error,
-      WideToUtf8(GetCurrentThreadDesktopNameW()));
-  SetLastError(winlogon_error != ERROR_SUCCESS ? winlogon_error
-                                               : input_desktop_error);
-  return false;
+  return crossdesk::GetDesktopNameW(GetThreadDesktop(GetCurrentThreadId()));
 }

 std::wstring DesktopNameForInteractiveStage(
@@ -700,8 +587,10 @@ DesktopSwitchDetails BuildDesktopSwitchDetails(
  return details;
 }

-InputInjectionResult BuildInputSuccess() {
-  return {};
+InputInjectionResult BuildInputSuccess(DesktopSwitchDetails desktop) {
+  InputInjectionResult result;
+  result.desktop = std::move(desktop);
+  return result;
 }

 InputInjectionResult BuildInputFailure(const char* error, DWORD error_code,
@@ -732,48 +621,23 @@ Json BuildInputFailureJson(const InputInjectionResult& result) {
 bool EnsureThreadInteractiveDesktopForStage(
    const std::string& interactive_stage,
    const std::string& interactive_desktop,
-    HDESK* opened_desktop_out = nullptr,
+    ScopedInteractiveDesktop* desktop,
    DesktopSwitchDetails* switch_details = nullptr) {
-  if (opened_desktop_out != nullptr) {
-    *opened_desktop_out = nullptr;
-  }
-
  DesktopSwitchDetails local_details =
      BuildDesktopSwitchDetails(interactive_stage, interactive_desktop);
  if (switch_details != nullptr) {
    *switch_details = local_details;
  }

-  const std::wstring desktop_name =
+  std::wstring desktop_name =
      DesktopNameForInteractiveStage(interactive_stage, interactive_desktop);
-  if (!desktop_name.empty()) {
-    if (EnsureThreadDesktop(desktop_name.c_str(), opened_desktop_out)) {
-      if (switch_details != nullptr) {
-        switch_details->current_desktop =
-            WideToUtf8(GetCurrentThreadDesktopNameW());
-      }
-      return true;
-    }
-
-    const DWORD error = GetLastError();
-    if (switch_details != nullptr) {
-      switch_details->error_code = error;
-      switch_details->current_desktop =
-          WideToUtf8(GetCurrentThreadDesktopNameW());
-    }
-    LOG_WARN(
-        "Failed to switch secure input helper to stage desktop, stage='{}', "
-        "desktop='{}', error={}, current='{}'",
-        interactive_stage, WideToUtf8(desktop_name),
-        error,
-        WideToUtf8(GetCurrentThreadDesktopNameW()));
-    SetLastError(error);
-    return false;
+  if (desktop_name.empty()) {
+    desktop_name = L"Winlogon";
  }
-
-  if (EnsureThreadInteractiveDesktop(opened_desktop_out)) {
+  if (desktop->Bind(desktop_name)) {
    if (switch_details != nullptr) {
-      switch_details->current_desktop = WideToUtf8(GetCurrentThreadDesktopNameW());
+      switch_details->target_desktop = WideToUtf8(desktop->name());
+      switch_details->current_desktop = switch_details->target_desktop;
    }
    return true;
  }
@@ -783,18 +647,15 @@ bool EnsureThreadInteractiveDesktopForStage(
    switch_details->error_code = error;
    switch_details->current_desktop = WideToUtf8(GetCurrentThreadDesktopNameW());
  }
+  LOG_WARN(
+      "Failed to switch secure input helper desktop, stage='{}', "
+      "fallback='{}', error={}, current='{}'",
+      interactive_stage, WideToUtf8(desktop_name), error,
+      WideToUtf8(GetCurrentThreadDesktopNameW()));
+  SetLastError(error);
  return false;
 }

-struct ScopedDesktopHandle {
-  HDESK handle = nullptr;
-  ~ScopedDesktopHandle() {
-    if (handle != nullptr) {
-      CloseDesktop(handle);
-    }
-  }
-};
-
 bool PreferSideSpecificVkInjection(int key_code) {
  switch (key_code) {
    case VK_LSHIFT:
@@ -815,11 +676,11 @@ InputInjectionResult InjectKeyboardInput(
    int key_code, bool is_down, uint32_t scan_code, bool extended,
    const std::string& interactive_stage,
    const std::string& interactive_desktop) {
-  ScopedDesktopHandle desktop;
+  ScopedInteractiveDesktop desktop;
  DesktopSwitchDetails desktop_switch;
  if (!EnsureThreadInteractiveDesktopForStage(interactive_stage,
                                              interactive_desktop,
-                                              &desktop.handle,
+                                              &desktop,
                                              &desktop_switch)) {
    const DWORD error = GetLastError();
    return BuildInputFailure("switch_interactive_desktop_failed",
@@ -875,7 +736,7 @@ InputInjectionResult InjectKeyboardInput(
                             desktop_switch);
  }

-  return BuildInputSuccess();
+  return BuildInputSuccess(std::move(desktop_switch));
 }

 void ParseInteractionTail(const std::string& tail,
@@ -1192,11 +1053,11 @@ INPUT BuildAbsoluteMouseMoveInput(int x, int y) {
 }

 InputInjectionResult InjectMouseInput(const SecureMouseRequest& request) {
-  ScopedDesktopHandle desktop;
+  ScopedInteractiveDesktop desktop;
  DesktopSwitchDetails desktop_switch;
  if (!EnsureThreadInteractiveDesktopForStage(request.interactive_stage,
                                              request.interactive_desktop,
-                                              &desktop.handle,
+                                              &desktop,
                                              &desktop_switch)) {
    const DWORD error = GetLastError();
    return BuildInputFailure("switch_interactive_desktop_failed",
@@ -1256,13 +1117,91 @@ InputInjectionResult InjectMouseInput(const SecureMouseRequest& request) {
                             desktop_switch);
  }

-  return BuildInputSuccess();
+  return BuildInputSuccess(std::move(desktop_switch));
 }

 std::vector<uint8_t> BuildTextResponseBytes(const std::string& response) {
  return std::vector<uint8_t>(response.begin(), response.end());
 }

+// Own the desktop before its GDI objects, and release those objects before
+// restoring the original desktop. Both capture paths use the same lifecycle.
+struct SecureDesktopGdiResources {
+  ScopedInteractiveDesktop desktop;
+  HDC screen_dc = nullptr;
+  HDC mem_dc = nullptr;
+  HBITMAP dib = nullptr;
+  HGDIOBJ old_bitmap = nullptr;
+  void* bits = nullptr;
+  const char* error = nullptr;
+  DWORD error_code = ERROR_SUCCESS;
+
+  ~SecureDesktopGdiResources() {
+    if (old_bitmap != nullptr && old_bitmap != HGDI_ERROR) {
+      SelectObject(mem_dc, old_bitmap);
+    }
+    if (dib != nullptr) DeleteObject(dib);
+    if (mem_dc != nullptr) DeleteDC(mem_dc);
+    if (screen_dc != nullptr) ReleaseDC(nullptr, screen_dc);
+  }
+
+  bool Fail(const char* reason) {
+    error = reason;
+    error_code = GetLastError();
+    if (error_code == ERROR_SUCCESS) error_code = ERROR_GEN_FAILURE;
+    return false;
+  }
+
+  bool Initialize(const SecureCaptureRequest& request) {
+    const auto fallback = DesktopNameForInteractiveStage(
+        request.interactive_stage, request.interactive_desktop);
+    if (!desktop.Bind(fallback.empty() ? L"Winlogon" : fallback)) {
+      return Fail("switch_interactive_desktop_failed");
+    }
+    screen_dc = GetDC(nullptr);
+    if (screen_dc == nullptr) return Fail("get_dc_failed");
+    mem_dc = CreateCompatibleDC(screen_dc);
+    if (mem_dc == nullptr) return Fail("create_dc_failed");
+    BITMAPINFO bmi{};
+    bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+    bmi.bmiHeader.biWidth = request.width;
+    bmi.bmiHeader.biHeight = -request.height;
+    bmi.bmiHeader.biPlanes = 1;
+    bmi.bmiHeader.biBitCount = 32;
+    bmi.bmiHeader.biCompression = BI_RGB;
+    dib = CreateDIBSection(mem_dc, &bmi, DIB_RGB_COLORS, &bits, nullptr, 0);
+    if (dib == nullptr || bits == nullptr) return Fail("create_dib_failed");
+    old_bitmap = SelectObject(mem_dc, dib);
+    if (old_bitmap == nullptr || old_bitmap == HGDI_ERROR) {
+      return Fail("select_bitmap_failed");
+    }
+    return true;
+  }
+
+  bool Capture(const SecureCaptureRequest& request) {
+    if (!BitBlt(mem_dc, 0, 0, request.width, request.height, screen_dc,
+                request.left, request.top, SRCCOPY | CAPTUREBLT)) {
+      return Fail("bitblt_failed");
+    }
+    if (request.show_cursor) {
+      CURSORINFO cursor{};
+      cursor.cbSize = sizeof(cursor);
+      if (GetCursorInfo(&cursor) && cursor.flags == CURSOR_SHOWING &&
+          cursor.hCursor != nullptr) {
+        const int x = cursor.ptScreenPos.x - request.left;
+        const int y = cursor.ptScreenPos.y - request.top;
+        if (x >= -64 && y >= -64 && x < request.width + 64 &&
+            y < request.height + 64) {
+          DrawIconEx(mem_dc, x, y, cursor.hCursor, 0, 0, 0, nullptr, DI_NORMAL);
+        }
+      }
+    }
+    // Complete GDI writes before libyuv reads the DIB's pixel memory.
+    GdiFlush();
+    return true;
+  }
+};
+
 std::vector<uint8_t> CaptureSecureDesktopFrame(
    const SecureCaptureRequest& request,
    SecureCaptureBuffers* capture_buffers) {
@@ -1270,87 +1209,21 @@ std::vector<uint8_t> CaptureSecureDesktopFrame(
    return BuildTextResponseBytes(BuildErrorJson("invalid_capture_buffers"));
  }

-  ScopedDesktopHandle desktop;
-  if (!EnsureThreadInteractiveDesktopForStage(request.interactive_stage,
-                                              request.interactive_desktop,
-                                              &desktop.handle)) {
-    const DWORD error = GetLastError();
-    return BuildTextResponseBytes(BuildErrorJson(
-        "switch_interactive_desktop_failed",
-        error != ERROR_SUCCESS ? error : ERROR_GEN_FAILURE));
-  }
-
-  HDC screen_dc = GetDC(nullptr);
-  if (screen_dc == nullptr) {
+  SecureDesktopGdiResources capture;
+  if (!capture.Initialize(request) || !capture.Capture(request)) {
    return BuildTextResponseBytes(
-        BuildErrorJson("get_dc_failed", GetLastError()));
-  }
-
-  HDC mem_dc = CreateCompatibleDC(screen_dc);
-  if (mem_dc == nullptr) {
-    const DWORD error = GetLastError();
-    ReleaseDC(nullptr, screen_dc);
-    return BuildTextResponseBytes(BuildErrorJson("create_dc_failed", error));
-  }
-
-  BITMAPINFO bmi{};
-  bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-  bmi.bmiHeader.biWidth = request.width;
-  bmi.bmiHeader.biHeight = -request.height;
-  bmi.bmiHeader.biPlanes = 1;
-  bmi.bmiHeader.biBitCount = 32;
-  bmi.bmiHeader.biCompression = BI_RGB;
-
-  void* bits = nullptr;
-  HBITMAP dib =
-      CreateDIBSection(mem_dc, &bmi, DIB_RGB_COLORS, &bits, nullptr, 0);
-  if (dib == nullptr || bits == nullptr) {
-    const DWORD error = GetLastError();
-    DeleteDC(mem_dc);
-    ReleaseDC(nullptr, screen_dc);
-    return BuildTextResponseBytes(BuildErrorJson("create_dib_failed", error));
-  }
-
-  HGDIOBJ old_bitmap = SelectObject(mem_dc, dib);
-  if (!BitBlt(mem_dc, 0, 0, request.width, request.height, screen_dc,
-              request.left, request.top, SRCCOPY | CAPTUREBLT)) {
-    const DWORD error = GetLastError();
-    SelectObject(mem_dc, old_bitmap);
-    DeleteObject(dib);
-    DeleteDC(mem_dc);
-    ReleaseDC(nullptr, screen_dc);
-    return BuildTextResponseBytes(BuildErrorJson("bitblt_failed", error));
-  }
-
-  if (request.show_cursor) {
-    CURSORINFO cursor_info{};
-    cursor_info.cbSize = sizeof(CURSORINFO);
-    if (GetCursorInfo(&cursor_info) && cursor_info.flags == CURSOR_SHOWING &&
-        cursor_info.hCursor != nullptr) {
-      const int cursor_x = cursor_info.ptScreenPos.x - request.left;
-      const int cursor_y = cursor_info.ptScreenPos.y - request.top;
-      if (cursor_x >= -64 && cursor_y >= -64 && cursor_x < request.width + 64 &&
-          cursor_y < request.height + 64) {
-        DrawIconEx(mem_dc, cursor_x, cursor_y, cursor_info.hCursor, 0, 0, 0,
-                   nullptr, DI_NORMAL);
-      }
-    }
+        BuildErrorJson(capture.error, capture.error_code));
  }

  const size_t nv12_size =
      static_cast<size_t>(request.width) * request.height * 3 / 2;
  capture_buffers->nv12_frame.resize(nv12_size);
  const int convert_result = libyuv::ARGBToNV12(
-      static_cast<const uint8_t*>(bits), request.width * 4,
+      static_cast<const uint8_t*>(capture.bits), request.width * 4,
      capture_buffers->nv12_frame.data(), request.width,
      capture_buffers->nv12_frame.data() + request.width * request.height,
      request.width, request.width, request.height);

-  SelectObject(mem_dc, old_bitmap);
-  DeleteObject(dib);
-  DeleteDC(mem_dc);
-  ReleaseDC(nullptr, screen_dc);
-
  if (convert_result != 0) {
    return BuildTextResponseBytes(BuildErrorJson("argb_to_nv12_failed"));
  }
@@ -1397,8 +1270,7 @@ void CloseSecureDesktopSharedCaptureResourcesLocked(
  capture_state->frame_view_size = 0;
 }

-void SecureDesktopSharedCaptureThread(
-    SecureSharedCaptureState* capture_state) {
+void SecureDesktopSharedCaptureThread(SecureSharedCaptureState* capture_state) {
  if (capture_state == nullptr) {
    return;
  }
@@ -1421,79 +1293,65 @@ void SecureDesktopSharedCaptureThread(
      static_cast<size_t>(request.width) * request.height * 3 / 2;
  std::vector<uint8_t> nv12_frame(nv12_size);

-  ScopedDesktopHandle desktop;
-  if (!EnsureThreadInteractiveDesktopForStage(request.interactive_stage,
-                                              request.interactive_desktop,
-                                              &desktop.handle)) {
-    LOG_ERROR("Secure shared capture desktop switch failed, error={}",
-              GetLastError());
-    return;
-  }
-
-  HDC screen_dc = GetDC(nullptr);
-  if (screen_dc == nullptr) {
-    LOG_ERROR("Secure shared capture GetDC failed, error={}", GetLastError());
-    return;
-  }
-
-  HDC mem_dc = CreateCompatibleDC(screen_dc);
-  if (mem_dc == nullptr) {
-    LOG_ERROR("Secure shared capture CreateCompatibleDC failed, error={}",
-              GetLastError());
-    ReleaseDC(nullptr, screen_dc);
-    return;
-  }
-
-  BITMAPINFO bmi{};
-  bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-  bmi.bmiHeader.biWidth = request.width;
-  bmi.bmiHeader.biHeight = -request.height;
-  bmi.bmiHeader.biPlanes = 1;
-  bmi.bmiHeader.biBitCount = 32;
-  bmi.bmiHeader.biCompression = BI_RGB;
-
-  void* bits = nullptr;
-  HBITMAP dib =
-      CreateDIBSection(mem_dc, &bmi, DIB_RGB_COLORS, &bits, nullptr, 0);
-  if (dib == nullptr || bits == nullptr) {
-    LOG_ERROR("Secure shared capture CreateDIBSection failed, error={}",
-              GetLastError());
-    DeleteDC(mem_dc);
-    ReleaseDC(nullptr, screen_dc);
-    return;
-  }
-
-  HGDIOBJ old_bitmap = SelectObject(mem_dc, dib);
+  std::unique_ptr<SecureDesktopGdiResources> capture;
+  ULONGLONG last_error_tick = 0;
+  auto stats_started = std::chrono::steady_clock::now();
+  unsigned frame_count = 0;
+  double capture_ms = 0, convert_ms = 0, publish_ms = 0;
+  auto report_stats = [&](bool force) {
+    const auto elapsed = std::chrono::duration<double>(
+                             std::chrono::steady_clock::now() - stats_started)
+                             .count();
+    if (elapsed <= 0 || (!force && elapsed < 5.0)) return;
+    if (frame_count > 0) {
+      LOG_INFO(
+          "Secure capture producer: fps={:.1f}, capture_avg_ms={:.1f}, "
+          "convert_avg_ms={:.1f}, publish_avg_ms={:.1f}, size={}x{}",
+          frame_count / elapsed, capture_ms / frame_count,
+          convert_ms / frame_count, publish_ms / frame_count, request.width,
+          request.height);
+    }
+    stats_started = std::chrono::steady_clock::now();
+    frame_count = 0;
+    capture_ms = convert_ms = publish_ms = 0;
+  };
  while (!capture_state->stop_requested.load(std::memory_order_relaxed)) {
    const auto frame_started = std::chrono::steady_clock::now();
-    if (BitBlt(mem_dc, 0, 0, request.width, request.height, screen_dc,
-               request.left, request.top, SRCCOPY | CAPTUREBLT)) {
-      if (request.show_cursor) {
-        CURSORINFO cursor_info{};
-        cursor_info.cbSize = sizeof(CURSORINFO);
-        if (GetCursorInfo(&cursor_info) &&
-            cursor_info.flags == CURSOR_SHOWING &&
-            cursor_info.hCursor != nullptr) {
-          const int cursor_x = cursor_info.ptScreenPos.x - request.left;
-          const int cursor_y = cursor_info.ptScreenPos.y - request.top;
-          if (cursor_x >= -64 && cursor_y >= -64 &&
-              cursor_x < request.width + 64 &&
-              cursor_y < request.height + 64) {
-            DrawIconEx(mem_dc, cursor_x, cursor_y, cursor_info.hCursor, 0, 0,
-                       0, nullptr, DI_NORMAL);
-          }
+    report_stats(false);
+    // A lock/credential/UAC transition can change the desktop before the
+    // service's next status poll. Release its DCs before binding the new one.
+    if (capture && !capture->desktop.IsInputDesktop()) {
+      capture.reset();
+    }
+    if (!capture) {
+      capture = std::make_unique<SecureDesktopGdiResources>();
+      if (!capture->Initialize(request)) {
+        const DWORD error = capture->error_code;
+        capture.reset();
+        const ULONGLONG now = GetTickCount64();
+        if (last_error_tick == 0 || now - last_error_tick >= 5000) {
+          LOG_WARN(
+              "Secure shared capture initialization failed; retrying, "
+              "error={}",
+              error);
+          last_error_tick = now;
        }
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        continue;
      }
+    }

+    if (capture->Capture(request)) {
+      const auto captured_at = std::chrono::steady_clock::now();
      const int convert_result = libyuv::ARGBToNV12(
-          static_cast<const uint8_t*>(bits), request.width * 4,
+          static_cast<const uint8_t*>(capture->bits), request.width * 4,
          nv12_frame.data(), request.width,
          nv12_frame.data() + request.width * request.height, request.width,
          request.width, request.height);
      if (convert_result == 0) {
-        auto* header =
-            reinterpret_cast<crossdesk::CrossDeskSecureDesktopSharedFrameHeader*>(
-                frame_view);
+        const auto converted_at = std::chrono::steady_clock::now();
+        auto* header = reinterpret_cast<
+            crossdesk::CrossDeskSecureDesktopSharedFrameHeader*>(frame_view);
        uint8_t* payload = frame_view + sizeof(*header);
        header->writing = 1;
        MemoryBarrier();
@@ -1509,25 +1367,41 @@ void SecureDesktopSharedCaptureThread(
        MemoryBarrier();
        header->writing = 0;
        SetEvent(capture_state->frame_ready_event);
+        ++frame_count;
+        capture_ms += std::chrono::duration<double, std::milli>(captured_at -
+                                                                frame_started)
+                          .count();
+        convert_ms += std::chrono::duration<double, std::milli>(converted_at -
+                                                                captured_at)
+                          .count();
+        publish_ms += std::chrono::duration<double, std::milli>(
+                          std::chrono::steady_clock::now() - converted_at)
+                          .count();
      }
    } else {
-      LOG_WARN("Secure shared capture BitBlt failed, error={}", GetLastError());
+      const DWORD error = capture->error_code;
+      capture.reset();
+      const ULONGLONG now = GetTickCount64();
+      if (last_error_tick == 0 || now - last_error_tick >= 5000) {
+        LOG_WARN(
+            "Secure shared capture BitBlt failed; recreating capture, "
+            "error={}",
+            error);
+        last_error_tick = now;
+      }
    }

    const auto elapsed_ms =
        std::chrono::duration_cast<std::chrono::milliseconds>(
            std::chrono::steady_clock::now() - frame_started)
            .count();
-    if (elapsed_ms < interval_ms) {
+    const int retry_interval_ms = capture ? interval_ms : 100;
+    if (elapsed_ms < retry_interval_ms) {
      std::this_thread::sleep_for(
-          std::chrono::milliseconds(interval_ms - elapsed_ms));
+          std::chrono::milliseconds(retry_interval_ms - elapsed_ms));
    }
  }
-
-  SelectObject(mem_dc, old_bitmap);
-  DeleteObject(dib);
-  DeleteDC(mem_dc);
-  ReleaseDC(nullptr, screen_dc);
+  report_stats(true);
 }

 std::vector<uint8_t> StopSecureDesktopSharedCapture(
@@ -1703,7 +1577,7 @@ std::vector<uint8_t> HandleSecureInputHelperCommand(
    json["extended"] = extended;
    json["stage"] = interactive_stage;
    json["interactive_desktop"] = interactive_desktop;
-    json["desktop"] = WideToUtf8(GetCurrentThreadDesktopNameW());
+    json["desktop"] = inject_result.desktop.current_desktop;
    return BuildTextResponseBytes(json.dump());
  }

@@ -1731,7 +1605,7 @@ std::vector<uint8_t> HandleSecureInputHelperCommand(
    json["flag"] = mouse_request.flag;
    json["stage"] = mouse_request.interactive_stage;
    json["interactive_desktop"] = mouse_request.interactive_desktop;
-    json["desktop"] = WideToUtf8(GetCurrentThreadDesktopNameW());
+    json["desktop"] = inject_result.desktop.current_desktop;
    return BuildTextResponseBytes(json.dump());
  }

@@ -0,0 +1,165 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#include "captured_nv12_frame.h"
+
+#include <algorithm>
+#include <cstring>
+#include <limits>
+#include <new>
+#include <utility>
+
+namespace crossdesk {
+namespace {
+
+bool GetNv12Size(uint32_t width, uint32_t height, size_t* size) {
+  if (!size || width == 0 || height == 0 || (width & 1U) != 0 ||
+      (height & 1U) != 0 ||
+      static_cast<size_t>(width) >
+          std::numeric_limits<size_t>::max() / height) {
+    return false;
+  }
+  const size_t pixels = static_cast<size_t>(width) * height;
+  if (pixels > std::numeric_limits<size_t>::max() / 3U * 2U) {
+    return false;
+  }
+  *size = pixels * 3U / 2U;
+  return true;
+}
+
+}  // namespace
+
+std::shared_ptr<CapturedNv12FramePool> CapturedNv12FramePool::Create(
+    size_t max_cached_buffers) {
+  return std::shared_ptr<CapturedNv12FramePool>(
+      new CapturedNv12FramePool(max_cached_buffers));
+}
+
+CapturedNv12FramePool::CapturedNv12FramePool(size_t max_cached_buffers)
+    : max_cached_buffers_(max_cached_buffers) {}
+
+CapturedNv12Frame* CapturedNv12FramePool::CopyFrom(const uint8_t* data,
+                                                   size_t size,
+                                                   uint32_t width,
+                                                   uint32_t height) {
+  size_t required_size = 0;
+  if (!data || !GetNv12Size(width, height, &required_size) ||
+      size < required_size) {
+    return nullptr;
+  }
+
+  std::vector<uint8_t> storage;
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+    auto best = free_buffers_.end();
+    for (auto it = free_buffers_.begin(); it != free_buffers_.end(); ++it) {
+      if (it->capacity() < required_size) {
+        continue;
+      }
+      if (best == free_buffers_.end() || it->capacity() < best->capacity()) {
+        best = it;
+      }
+    }
+    if (best == free_buffers_.end() && !free_buffers_.empty()) {
+      best = std::max_element(
+          free_buffers_.begin(), free_buffers_.end(),
+          [](const auto& lhs, const auto& rhs) {
+            return lhs.capacity() < rhs.capacity();
+          });
+    }
+    if (best != free_buffers_.end()) {
+      storage = std::move(*best);
+      free_buffers_.erase(best);
+    }
+  }
+
+  try {
+    storage.resize(required_size);
+    std::memcpy(storage.data(), data, required_size);
+    return new CapturedNv12Frame(shared_from_this(), std::move(storage), width,
+                                 height);
+  } catch (...) {
+    return nullptr;
+  }
+}
+
+void CapturedNv12FramePool::Recycle(std::vector<uint8_t> storage) {
+  if (max_cached_buffers_ == 0 || storage.empty()) {
+    return;
+  }
+
+  std::lock_guard<std::mutex> lock(mutex_);
+  if (free_buffers_.size() < max_cached_buffers_) {
+    free_buffers_.push_back(std::move(storage));
+    return;
+  }
+
+  auto smallest = std::min_element(
+      free_buffers_.begin(), free_buffers_.end(),
+      [](const auto& lhs, const auto& rhs) {
+        return lhs.capacity() < rhs.capacity();
+      });
+  if (smallest != free_buffers_.end() &&
+      smallest->capacity() < storage.capacity()) {
+    *smallest = std::move(storage);
+  }
+}
+
+CapturedNv12Frame::CapturedNv12Frame(
+    std::shared_ptr<CapturedNv12FramePool> pool,
+    std::vector<uint8_t> storage, uint32_t width, uint32_t height)
+    : pool_(std::move(pool)),
+      storage_(std::move(storage)),
+      width_(width),
+      height_(height) {
+  descriptor_.struct_size = sizeof(descriptor_);
+  descriptor_.type = MiniRtcNativeVideoFrameCpuNv12;
+  descriptor_.width = width_;
+  descriptor_.height = height_;
+  descriptor_.payload.cpu_nv12 = {
+      storage_.data(), storage_.data() + static_cast<size_t>(width_) * height_,
+      width_, width_};
+  descriptor_.owner = this;
+  descriptor_.retain = &RetainOwner;
+  descriptor_.release = &ReleaseOwner;
+  descriptor_.copy_to_nv12 = &CopyToNv12;
+}
+
+CapturedNv12Frame::~CapturedNv12Frame() {
+  if (pool_) {
+    pool_->Recycle(std::move(storage_));
+  }
+}
+
+void CapturedNv12Frame::AddRef() {
+  references_.fetch_add(1, std::memory_order_relaxed);
+}
+
+void CapturedNv12Frame::Release() {
+  if (references_.fetch_sub(1, std::memory_order_acq_rel) == 1) {
+    delete this;
+  }
+}
+
+void CapturedNv12Frame::RetainOwner(void* owner) {
+  static_cast<CapturedNv12Frame*>(owner)->AddRef();
+}
+
+void CapturedNv12Frame::ReleaseOwner(void* owner) {
+  static_cast<CapturedNv12Frame*>(owner)->Release();
+}
+
+int CapturedNv12Frame::CopyToNv12(void* owner, uint8_t* destination,
+                                  size_t destination_size) {
+  auto* frame = static_cast<CapturedNv12Frame*>(owner);
+  if (!frame || !destination || destination_size < frame->Size()) {
+    return -1;
+  }
+  std::memcpy(destination, frame->storage_.data(), frame->Size());
+  return 0;
+}
+
+}  // namespace crossdesk
@@ -0,0 +1,78 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-04
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _CAPTURED_NV12_FRAME_H_
+#define _CAPTURED_NV12_FRAME_H_
+
+#include <atomic>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <mutex>
+#include <vector>
+
+#include "minirtc.h"
+
+namespace crossdesk {
+
+class CapturedNv12Frame;
+
+// Owns the pixels behind captured native frames. A frame may outlive the
+// capture callback while MiniRTC waits for its asynchronous encoder, so capture
+// buffers cannot be borrowed directly. Released allocations are cached to keep
+// that ownership transfer inexpensive after the pipeline is warm.
+class CapturedNv12FramePool final
+    : public std::enable_shared_from_this<CapturedNv12FramePool> {
+ public:
+  static std::shared_ptr<CapturedNv12FramePool> Create(
+      size_t max_cached_buffers = 4);
+
+  CapturedNv12Frame* CopyFrom(const uint8_t* data, size_t size,
+                              uint32_t width, uint32_t height);
+
+ private:
+  explicit CapturedNv12FramePool(size_t max_cached_buffers);
+  void Recycle(std::vector<uint8_t> storage);
+
+  friend class CapturedNv12Frame;
+
+  const size_t max_cached_buffers_;
+  std::mutex mutex_;
+  std::vector<std::vector<uint8_t>> free_buffers_;
+};
+
+class CapturedNv12Frame final {
+ public:
+  const MiniRtcNativeVideoFrame* Descriptor() const { return &descriptor_; }
+  size_t Size() const { return storage_.size(); }
+
+  void AddRef();
+  void Release();
+
+ private:
+  friend class CapturedNv12FramePool;
+
+  CapturedNv12Frame(std::shared_ptr<CapturedNv12FramePool> pool,
+                    std::vector<uint8_t> storage, uint32_t width,
+                    uint32_t height);
+  ~CapturedNv12Frame();
+
+  static void RetainOwner(void* owner);
+  static void ReleaseOwner(void* owner);
+  static int CopyToNv12(void* owner, uint8_t* destination,
+                        size_t destination_size);
+
+  std::atomic<uint32_t> references_{1};
+  std::shared_ptr<CapturedNv12FramePool> pool_;
+  std::vector<uint8_t> storage_;
+  uint32_t width_ = 0;
+  uint32_t height_ = 0;
+  MiniRtcNativeVideoFrame descriptor_{};
+};
+
+}  // namespace crossdesk
+
+#endif
@@ -10,14 +10,18 @@
 #include <functional>

 #include "display_info.h"
+#include "minirtc.h"

 namespace crossdesk {

 class ScreenCapturer {
 public:
-  // The final callback argument is a logical MiniRTC stream ID (DisplayN),
-  // not a platform display name or physical handle.
-  typedef std::function<void(unsigned char*, int, int, int, const char*)>
+  // |stream_id| is a logical MiniRTC stream ID (DisplayN), not a platform
+  // display name or physical handle. |native_frame| is borrowed for the
+  // duration of the callback; retain its owner before using it asynchronously.
+  typedef std::function<void(unsigned char* data, int size, int width,
+                             int height, const char* stream_id,
+                             const MiniRtcNativeVideoFrame* native_frame)>
      cb_desktop_data;

 public:
@@ -6,6 +6,7 @@
 #include <charconv>
 #include <cstdlib>
 #include <fstream>
+#include <iostream>
 #include <memory>
 #include <string>
 #include <string_view>
@@ -44,6 +45,7 @@ struct CaptureOptions {
  std::string page;
  int language = 0;
  std::string snapshot_path;
+  std::string demo_assets_path;
 };

 // Compatibility entry point for the former application-level debug capture
@@ -98,9 +100,55 @@ CaptureOptions LoadCaptureOptions() {
          std::getenv("CROSSDESK_UI_CAPTURE_SNAPSHOT")) {
    options.snapshot_path = snapshot;
  }
+  if (const char *assets = std::getenv("CROSSDESK_UI_CAPTURE_DEMO_ASSETS")) {
+    options.demo_assets_path = assets;
+  }
  return options;
 }

+// Opt-in documentation data, separate from the smoke test's baseline state.
+// The images are public page captures, never a user's cached remote desktops.
+bool ConfigureDocumentationDemo(
+    const slint::ComponentHandle<crossdesk::ui::MainWindow> &window,
+    const CaptureOptions &options) {
+  if (options.demo_assets_path.empty()) {
+    return true;
+  }
+  struct DemoDevice {
+    const char *id;
+    const char *name;
+    const char *thumbnail;
+  };
+  const DemoDevice devices[] = {
+      {"987654321", "Dev Workstation", "fixtures/source.png"},
+      {"246813579", "Office PC", "fixtures/website.png"},
+      {"135792468", "Home Laptop", "web-client.png"},
+  };
+  std::vector<crossdesk::ui::RecentConnection> connections;
+  for (const auto &device : devices) {
+    const std::string path = options.demo_assets_path + "/" + device.thumbnail;
+    const auto thumbnail =
+        slint::Image::load_from_path(slint::SharedString(path.c_str()));
+    if (thumbnail.size().width == 0 || thumbnail.size().height == 0) {
+      std::cerr << "Missing documentation thumbnail: " << path << '\n';
+      return false;
+    }
+    crossdesk::ui::RecentConnection connection;
+    connection.remote_id = device.id;
+    connection.display_name = device.name;
+    connection.host_name = device.name;
+    connection.online = true;
+    connection.thumbnail = thumbnail;
+    connections.emplace_back(std::move(connection));
+  }
+  window->set_recent_connections(
+      std::make_shared<slint::VectorModel<crossdesk::ui::RecentConnection>>(
+          std::move(connections)));
+  window->set_signal_connected(true);
+  window->set_hardware_codec_available(true);
+  return true;
+}
+
 bool HasNonEmptyEnvironmentVariable(const char *name) {
  const char *value = std::getenv(name);
  return value != nullptr && value[0] != '\0';
@@ -306,6 +354,9 @@ int RunCaptureMode(
    slint::ComponentHandle<crossdesk::ui::StreamWindow> &stream,
    slint::ComponentHandle<crossdesk::ui::ServerWindow> &server) {
  ConfigureMainCapturePage(window, options);
+  if (!ConfigureDocumentationDemo(window, options)) {
+    return 8;
+  }
  stream->hide();
  server->hide();

@@ -1,200 +0,0 @@
-#include <cstdint>
-#include <iostream>
-#include <memory>
-
-#include "video_receive_scheduler.h"
-
-namespace {
-
-std::unique_ptr<minirtc::ReceivedFrame>
-MakeFrame(uint32_t rtp_timestamp, int64_t received_us, bool key_frame = false) {
-  const uint8_t payload = key_frame ? 0x65 : 0x41;
-  auto frame =
-      std::make_unique<minirtc::ReceivedFrame>(&payload, sizeof(payload));
-  frame->SetRtpTimestamp(rtp_timestamp);
-  frame->SetReceivedTimestamp(received_us);
-  frame->SetCapturedTimestamp(received_us - 5000);
-  frame->SetFrameType(key_frame ? minirtc::kVideoFrameKey
-                                : minirtc::kVideoFrameDelta);
-  return frame;
-}
-
-bool Expect(bool condition, const char *message) {
-  if (!condition) {
-    std::cerr << message << '\n';
-  }
-  return condition;
-}
-
-bool TestOneFramePerPlaybackCycle() {
-  minirtc::VideoReceiveScheduler scheduler(60);
-  scheduler.Enqueue(MakeFrame(90000, 1000000), 1000000);
-  scheduler.Enqueue(MakeFrame(91500, 1016667), 1016667);
-
-  auto first = scheduler.Poll(1016667, false);
-  bool ok = Expect(first.frame != nullptr, "first frame was not released");
-  ok &= Expect(first.frame && first.frame->RtpTimestamp() == 90000,
-               "scheduler did not preserve RTP order");
-
-  auto same_cycle = scheduler.Poll(1016667, false);
-  ok &= Expect(!same_cycle.frame,
-               "scheduler released more than one frame in a cycle");
-  ok &= Expect(same_cycle.next_delay_us > 0,
-               "scheduler did not schedule the next playback cycle");
-
-  auto second = scheduler.Poll(1033334, false);
-  ok &= Expect(second.frame != nullptr,
-               "second frame was not released on the next cycle");
-  ok &= Expect(second.frame && second.frame->RtpTimestamp() == 91500,
-               "second RTP timestamp was incorrect");
-  return ok;
-}
-
-bool TestSevereLagJumpsToNewestKeyFrame() {
-  minirtc::VideoReceiveScheduler scheduler(60);
-  for (uint32_t i = 0; i < 10; ++i) {
-    scheduler.Enqueue(MakeFrame(90000 + i * 1500, 1000000 + i * 16667, i == 8),
-                      1000000 + i * 16667);
-  }
-
-  auto result = scheduler.Poll(1200000, false);
-  const auto metrics = scheduler.GetMetrics(1200000);
-  bool ok = Expect(result.frame && result.frame->IsKeyFrame(),
-                   "catch-up did not jump to the newest key frame");
-  ok &= Expect(result.dropped_frames == 8,
-               "catch-up dropped an unexpected number of frames");
-  ok &= Expect(metrics.catch_up_count == 1,
-               "catch-up metric was not incremented");
-  return ok;
-}
-
-bool TestSevereLagRequestsKeyFrameWhenNoSyncPointExists() {
-  minirtc::VideoReceiveScheduler scheduler(60);
-  for (uint32_t i = 0; i < 10; ++i) {
-    scheduler.Enqueue(MakeFrame(180000 + i * 1500, 2000000 + i * 16667),
-                      2000000 + i * 16667);
-  }
-
-  auto result = scheduler.Poll(2200000, false);
-  const auto metrics = scheduler.GetMetrics(2200000);
-  bool ok = Expect(!result.frame,
-                   "undecodable delta frame was released during catch-up");
-  ok &=
-      Expect(result.request_key_frame, "catch-up did not request a key frame");
-  ok &= Expect(metrics.buffered_frames == 0 && metrics.awaiting_key_frame,
-               "scheduler did not enter key-frame wait state");
-  return ok;
-}
-
-bool TestAdaptiveBufferStaysWithinOneToThreeFrames() {
-  minirtc::VideoReceiveScheduler scheduler(60);
-  int64_t arrival_us = 3000000;
-  for (uint32_t i = 0; i < 40; ++i) {
-    arrival_us += (i % 2 == 0) ? 5000 : 30000;
-    scheduler.Enqueue(MakeFrame(270000 + i * 1500, arrival_us), arrival_us);
-  }
-
-  const auto metrics = scheduler.GetMetrics(arrival_us);
-  bool ok = Expect(metrics.target_buffer_frames >= 1 &&
-                       metrics.target_buffer_frames <= 3,
-                   "adaptive target left the 1-3 frame range");
-  ok &= Expect(metrics.target_buffer_frames > 1,
-               "arrival jitter did not increase the target buffer");
-  return ok;
-}
-
-bool TestLegacyMicrosecondTimestampFallsBackToArrivalCadence() {
-  minirtc::VideoReceiveScheduler scheduler(60);
-  int64_t arrival_us = 4000000;
-  for (uint32_t i = 0; i < 20; ++i) {
-    scheduler.Enqueue(MakeFrame(500000 + i * 16667, arrival_us), arrival_us);
-    scheduler.Poll(arrival_us, false);
-    arrival_us += 16667;
-  }
-  scheduler.Poll(arrival_us, false);
-
-  const auto metrics = scheduler.GetMetrics(arrival_us);
-  bool ok = Expect(metrics.estimated_frame_interval_us >= 15000 &&
-                       metrics.estimated_frame_interval_us <= 20000,
-                   "legacy RTP units slowed the playback interval");
-  ok &= Expect(metrics.timestamp_fallbacks > 0,
-               "legacy RTP units did not activate timestamp fallback");
-  ok &= Expect(metrics.released_frames == 20 && metrics.dropped_frames == 0,
-               "legacy RTP units caused scheduler frame loss");
-  return ok;
-}
-
-bool TestSixtyFpsCadenceDoesNotTriggerCatchUp() {
-  minirtc::VideoReceiveScheduler scheduler(60);
-  constexpr int64_t kStartUs = 6000000;
-  constexpr int64_t kFrameIntervalUs = 16667;
-  constexpr uint32_t kStartRtpTimestamp = 700000;
-  constexpr uint32_t kRtpFrameInterval = 1500;
-
-  for (uint32_t i = 0; i < 60; ++i) {
-    const int64_t now_us = kStartUs + static_cast<int64_t>(i) *
-                                          kFrameIntervalUs;
-    scheduler.Enqueue(
-        MakeFrame(kStartRtpTimestamp + i * kRtpFrameInterval, now_us),
-        now_us);
-    scheduler.Poll(now_us, false);
-  }
-  scheduler.Poll(kStartUs + 60 * kFrameIntervalUs, false);
-
-  const auto metrics =
-      scheduler.GetMetrics(kStartUs + 60 * kFrameIntervalUs);
-  bool ok = Expect(metrics.released_frames == 60,
-                   "60 fps input was not released at 60 fps cadence");
-  ok &= Expect(metrics.dropped_frames == 0 && metrics.catch_up_count == 0,
-               "steady 60 fps input incorrectly triggered catch-up");
-  ok &= Expect(metrics.estimated_frame_interval_us >= 15000 &&
-                   metrics.estimated_frame_interval_us <= 18000,
-               "steady 60 fps interval estimate drifted");
-  return ok;
-}
-
-bool TestKeyFrameRequestCooldownKeepsDecodableProgress() {
-  minirtc::VideoReceiveScheduler scheduler(60);
-  for (uint32_t i = 0; i < 10; ++i) {
-    scheduler.Enqueue(MakeFrame(600000 + i * 1500,
-                                5000000 + static_cast<int64_t>(i) * 16667),
-                      5000000 + static_cast<int64_t>(i) * 16667);
-  }
-  auto first_catch_up = scheduler.Poll(5200000, false);
-  bool ok = Expect(first_catch_up.request_key_frame,
-                   "initial severe lag did not request a key frame");
-
-  scheduler.Enqueue(MakeFrame(615000, 5220000, true), 5220000);
-  auto key_frame = scheduler.Poll(5240000, false);
-  ok &= Expect(key_frame.frame && key_frame.frame->IsKeyFrame(),
-               "requested key frame was not released");
-
-  for (uint32_t i = 0; i < 10; ++i) {
-    scheduler.Enqueue(MakeFrame(616500 + i * 1500,
-                                5250000 + static_cast<int64_t>(i) * 16667),
-                      5250000 + static_cast<int64_t>(i) * 16667);
-  }
-  auto cooldown_catch_up = scheduler.Poll(5450000, false);
-  const auto metrics = scheduler.GetMetrics(5450000);
-  ok &= Expect(!cooldown_catch_up.request_key_frame,
-               "key frame request cooldown was ignored");
-  ok &= Expect(cooldown_catch_up.frame != nullptr,
-               "cooldown prevented forward playback progress");
-  ok &= Expect(metrics.key_frame_requests == 1,
-               "key frame request metric ignored cooldown");
-  return ok;
-}
-
-} // namespace
-
-int main() {
-  bool ok = true;
-  ok &= TestOneFramePerPlaybackCycle();
-  ok &= TestSevereLagJumpsToNewestKeyFrame();
-  ok &= TestSevereLagRequestsKeyFrameWhenNoSyncPointExists();
-  ok &= TestAdaptiveBufferStaysWithinOneToThreeFrames();
-  ok &= TestLegacyMicrosecondTimestampFallsBackToArrivalCadence();
-  ok &= TestSixtyFpsCadenceDoesNotTriggerCatchUp();
-  ok &= TestKeyFrameRequestCooldownKeepsDecodableProgress();
-  return ok ? 0 : 1;
-}
@@ -1,84 +0,0 @@
-#include <cstdint>
-#include <iostream>
-#include <memory>
-#include <vector>
-
-#include "rtp_defines.h"
-#include "rtp_packetizer_av1.h"
-#include "rtp_packetizer_h264.h"
-
-namespace {
-
-bool Expect(bool condition, const char *message) {
-  if (!condition) {
-    std::cerr << message << '\n';
-  }
-  return condition;
-}
-
-bool AllPacketsUseTimestamp(
-    const std::vector<std::unique_ptr<minirtc::RtpPacket>> &packets,
-    uint32_t expected_timestamp) {
-  if (packets.empty()) {
-    return false;
-  }
-  for (const auto &packet : packets) {
-    if (!packet || packet->Timestamp() != expected_timestamp) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool TestTimestampConversion() {
-  bool ok = Expect(minirtc::rtp::VideoTimestampFromMicroseconds(1000000) ==
-                       90000,
-                   "one second did not convert to 90 kHz");
-  ok &= Expect(minirtc::rtp::VideoTimestampFromMicroseconds(16667) == 1500,
-               "60 fps interval did not convert to 1500 RTP ticks");
-  ok &= Expect(minirtc::rtp::VideoTimestampToMicroseconds(90000) == 1000000,
-               "90 kHz timestamp did not convert to one second");
-  return ok;
-}
-
-bool TestH264PacketizerPreservesTimestamp() {
-  constexpr uint32_t kTimestamp = 0x89abcdef;
-  minirtc::RtpPacketizerH264 packetizer(1234);
-  std::vector<uint8_t> small_nalu = {0x65, 0x01, 0x02};
-  auto single_packet =
-      packetizer.Build(small_nalu.data(), small_nalu.size(), kTimestamp, true);
-  bool ok = Expect(AllPacketsUseTimestamp(single_packet, kTimestamp),
-                   "H.264 single-NAL packetizer changed RTP timestamp");
-
-  std::vector<uint8_t> large_nalu(MAX_NALU_LEN + 100, 0x55);
-  large_nalu.front() = 0x65;
-  auto fragmented =
-      packetizer.Build(large_nalu.data(), large_nalu.size(), kTimestamp, true);
-  ok &= Expect(AllPacketsUseTimestamp(fragmented, kTimestamp),
-               "H.264 FU-A packetizer changed RTP timestamp");
-
-  auto padding = packetizer.BuildPadding(2000, kTimestamp, true);
-  ok &= Expect(AllPacketsUseTimestamp(padding, kTimestamp),
-               "H.264 padding packetizer changed RTP timestamp");
-  return ok;
-}
-
-bool TestAv1PacketizerPreservesTimestamp() {
-  constexpr uint32_t kTimestamp = 0x12345678;
-  minirtc::RtpPacketizerAv1 packetizer(5678);
-  // One frame OBU with a one-byte payload.
-  std::vector<uint8_t> obu = {0x32, 0x01, 0x00};
-  auto packets = packetizer.Build(obu.data(), obu.size(), kTimestamp, true);
-  return Expect(AllPacketsUseTimestamp(packets, kTimestamp),
-                "AV1 packetizer changed RTP timestamp");
-}
-
-} // namespace
-
-int main() {
-  bool ok = true;
-  ok &= TestTimestampConversion();
-  ok &= TestH264PacketizerPreservesTimestamp();
-  ok &= TestAv1PacketizerPreservesTimestamp();
-  return ok ? 0 : 1;
-}
@@ -34,6 +34,7 @@ function setup_targets()
        set_kind("object")
        add_deps("rd_log", "crossdesk_wire")
        add_packages("libyuv")
+        add_packages("concurrentqueue", {public = true})
        add_files("apps/desktop/src/common/*.cpp")
        remove_files("apps/desktop/src/common/rounded_corner_button.cpp")
        if is_os("windows") then
@@ -106,18 +107,6 @@ function setup_targets()
        set_default(false)
        add_files("apps/desktop/tests/video_callback_lifetime_test.cpp")

-    target("video_receive_scheduler_test")
-        set_kind("binary")
-        set_default(false)
-        add_deps("minirtc")
-        add_files("apps/desktop/tests/video_receive_scheduler_test.cpp")
-
-    target("video_rtp_timestamp_test")
-        set_kind("binary")
-        set_default(false)
-        add_deps("minirtc")
-        add_files("apps/desktop/tests/video_rtp_timestamp_test.cpp")
-
    target("windows_manifest_resource_test")
        set_kind("binary")
        set_default(false)
@@ -171,8 +160,10 @@ function setup_targets()
        set_kind("object")
        add_deps("rd_log", "common", "crossdesk_wire")
        add_includedirs("apps/desktop/src/screen_capturer", {public = true})
+        add_includedirs("deps/submodules/minirtc/src/api", {public = true})
        if is_os("windows") then
            add_packages("libyuv")
+            add_files("apps/desktop/src/screen_capturer/captured_nv12_frame.cpp")
            add_files("apps/desktop/src/platform/windows/screen_capturer/screen_capturer_dxgi.cpp",
                "apps/desktop/src/platform/windows/screen_capturer/screen_capturer_gdi.cpp",
                "apps/desktop/src/platform/windows/screen_capturer/screen_capturer_win.cpp",
@@ -339,7 +330,11 @@ function setup_targets()
            add_cxxflags("/bigobj")
            add_links("opengl32")
            add_files("apps/desktop/src/platform/windows/gui/tray/win_tray.cpp",
+                "apps/desktop/src/platform/windows/gui/slint_backend.cpp",
+                "apps/desktop/src/platform/windows/gui/slint_renderer_probe.cpp",
                "apps/desktop/src/platform/common/gui/opengl_video_renderer.cpp",
+                "apps/desktop/src/platform/common/gui/cuda_driver.cpp",
+                "apps/desktop/src/platform/common/gui/cuda_opengl_interop.cpp",
                "apps/desktop/src/platform/common/gui/video_renderer_factory_opengl.cpp",
                "apps/desktop/src/platform/windows/gui/runtime/windows_service_runtime.cpp",
                "apps/desktop/src/platform/windows/gui/application/portable_service_integration.cpp")
@@ -357,7 +352,10 @@ function setup_targets()
        elseif is_os("linux") then
            add_links("GL")
            add_files("apps/desktop/src/platform/linux/gui/tray/linux_tray.cpp",
+                "apps/desktop/src/platform/linux/gui/cuda_graphics.cpp",
                "apps/desktop/src/platform/common/gui/opengl_video_renderer.cpp",
+                "apps/desktop/src/platform/common/gui/cuda_driver.cpp",
+                "apps/desktop/src/platform/common/gui/cuda_opengl_interop.cpp",
                "apps/desktop/src/platform/common/gui/video_renderer_factory_opengl.cpp")
            add_includedirs("apps/desktop/src/platform/common/gui",
                "apps/desktop/src/platform/linux/gui/tray",
@@ -379,7 +377,8 @@ function setup_targets()
                "apps/desktop/src/platform/windows/screen_capturer/wgc_plugin_entry.cpp")
            add_files("apps/desktop/resources/windows/wgc_plugin.rc")
            add_includedirs("apps/desktop/src/common", "apps/desktop/src/screen_capturer",
-                "apps/desktop/src/platform/windows/screen_capturer")
+                "apps/desktop/src/platform/windows/screen_capturer",
+                "deps/submodules/minirtc/src/api")

        target("crossdesk_service")
            set_kind("binary")
@@ -265,7 +265,7 @@
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 8DNC3SZ86S;
 				ENABLE_BITCODE = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -277,7 +277,7 @@
 				);
 				INFOPLIST_FILE = CrossDeskMobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 0.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Vendor/iphoneos/$(CONFIGURATION)/libCrossDeskMiniRTC.a",
@@ -314,7 +314,7 @@
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 8DNC3SZ86S;
 				ENABLE_BITCODE = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -326,7 +326,7 @@
 				);
 				INFOPLIST_FILE = CrossDeskMobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 0.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Vendor/iphoneos/$(CONFIGURATION)/libCrossDeskMiniRTC.a",
@@ -61,7 +61,8 @@ typedef NS_ENUM(NSInteger, CrossDeskVideoAdaptationPolicy) {
          displayNames:(NSArray<NSString *> *)displayNames
          displaySizes:(NSArray<NSValue *> *)displaySizes;
 - (void)rtcBridge:(CrossDeskRTCBridge *)bridge
-    didReceivePresence:(NSDictionary<NSString *, NSNumber *> *)presence;
+    didReceivePresence:(NSDictionary<NSString *, NSNumber *> *)presence
+               snapshot:(BOOL)snapshot;
 - (void)rtcBridge:(CrossDeskRTCBridge *)bridge
    didReceiveCursorVisible:(BOOL)visible
                      shape:(NSInteger)shape
@@ -104,10 +105,13 @@ typedef NS_ENUM(NSInteger, CrossDeskVideoAdaptationPolicy) {
 - (void)setHardwareAccelerationEnabled:(BOOL)enabled;
 - (void)setVideoAdaptationPolicy:(CrossDeskVideoAdaptationPolicy)policy;
 - (void)requestPresenceForRemoteIDs:(NSArray<NSString *> *)remoteIDs
-    NS_SWIFT_NAME(requestPresence(remoteIDs:));
+                         subscribe:(BOOL)subscribe
+    NS_SWIFT_NAME(requestPresence(remoteIDs:subscribe:));
+- (void)invalidatePresence;

 - (void)connectToRemoteID:(NSString *)remoteID password:(NSString *)password;
 - (void)disconnect;
+- (void)requestKeyFrame;

 - (void)sendPointerAtX:(float)x
                     y:(float)y
@@ -8,6 +8,7 @@
 #include <cmath>
 #include <cstdio>
 #include <cstring>
+#include <deque>
 #include <limits>
 #include <memory>
 #include <mutex>
@@ -62,6 +63,11 @@ struct CallbackContext {
  uint64_t generation = 0;
 };

+struct PresenceRequest {
+  uint64_t generation;
+  bool subscription;
+};
+
 struct RTCState {
  PeerPtr *identity_peer = nullptr;
  PeerPtr *controller_peer = nullptr;
@@ -75,6 +81,7 @@ struct RTCState {
  VideoDegradationPreference video_adaptation_policy =
      VideoDegradationPreference::MaintainResolution;
  bool identity_ready = false;
+  std::deque<PresenceRequest> presence_requests;
  bool identity_recovery_attempted = false;
  std::string identity_with_password;
  std::string identity_base;
@@ -192,17 +199,21 @@ void DispatchMain(dispatch_block_t block) {
 }  // namespace

@interface CrossDeskRTCBridge ()
- (void)handleSignalState:(CrossDeskSignalState)state role:(PeerRole)role;
+- (void)handleSignalState:(CrossDeskSignalState)state
+                     role:(PeerRole)role
+               generation:(uint64_t)generation;
 - (void)handleSignalMessage:(const char *)message
                       size:(size_t)size
-                       role:(PeerRole)role;
- (void)handleProvisionedIdentity:(const std::string &)identity;
+                       role:(PeerRole)role
+                 generation:(uint64_t)generation;
+- (void)handleProvisionedIdentity:(const std::string &)identity
+                       generation:(uint64_t)generation;
 - (void)handleConnectionState:(CrossDeskConnectionState)state
                      remoteID:(const std::string &)remoteID
                    generation:(uint64_t)generation;
 - (BOOL)isControllerGenerationActive:(uint64_t)generation;
 - (BOOL)isControllerGenerationCurrent:(uint64_t)generation;
- (void)handleVideoFrame:(const XVideoFrame *)frame
+- (void)handleVideoFrame:(const MiniRtcVideoFrame *)frame
                sourceID:(const char *)sourceID
            sourceIDSize:(size_t)sourceIDSize;
 - (void)enqueueVideoPixelBuffer:(CVPixelBufferRef)pixelBuffer
@@ -214,7 +225,7 @@ void DispatchMain(dispatch_block_t block) {
              size:(size_t)size
          sourceID:(const char *)sourceID
      sourceIDSize:(size_t)sourceIDSize;
- (void)handleStats:(const XNetTrafficStats *)stats mode:(TraversalMode)mode;
+- (void)handleStats:(const MiniRtcNetTrafficStats *)stats mode:(TraversalMode)mode;
 - (void)sendMessage:(const std::string &)message
            reliable:(BOOL)reliable
              stream:(const char *)stream;
@@ -222,12 +233,11 @@ void DispatchMain(dispatch_block_t block) {
 - (void)createControllerPeer;
 - (void)destroyIdentityPeer;
 - (void)destroyControllerPeer;
- (void)requestKeyFrame;
@end

 namespace {

-void OnVideoFrame(const XVideoFrame *frame, const char *, size_t,
+void OnVideoFrame(const MiniRtcVideoFrame *frame, const char *, size_t,
                  const char *source_id, size_t source_id_size,
                  void *user_data) {
  auto *context = static_cast<CallbackContext *>(user_data);
@@ -271,7 +281,8 @@ void OnSignalState(SignalStatus status, const char *, size_t, void *user_data) {
      (context->role == PeerRole::Identity ||
       [owner isControllerGenerationActive:context->generation])) {
    [owner handleSignalState:static_cast<CrossDeskSignalState>(status)
-                        role:context->role];
+                        role:context->role
+                  generation:context->generation];
  }
 }

@@ -279,7 +290,8 @@ void OnSignalMessage(const char *message, size_t size, void *user_data) {
  auto *context = static_cast<CallbackContext *>(user_data);
  CrossDeskRTCBridge *owner = context ? context->owner : nil;
  if (owner && message && size > 0) {
-    [owner handleSignalMessage:message size:size role:context->role];
+    [owner handleSignalMessage:message size:size role:context->role
+                     generation:context->generation];
  }
 }

@@ -298,14 +310,15 @@ void OnConnectionState(ConnectionStatus status, const char *remote_id,
 }

 void OnNetworkStats(const char *peer_id, size_t peer_id_size,
-                    TraversalMode mode, const XNetTrafficStats *stats,
+                    TraversalMode mode, const MiniRtcNetTrafficStats *stats,
                    const char *, size_t, void *user_data) {
  auto *context = static_cast<CallbackContext *>(user_data);
  CrossDeskRTCBridge *owner = context ? context->owner : nil;
  if (!owner) return;
  if (context->role == PeerRole::Identity && mode == TraversalMode::UnknownMode &&
      peer_id && peer_id_size > 0) {
-    [owner handleProvisionedIdentity:std::string(peer_id, peer_id_size)];
+    [owner handleProvisionedIdentity:std::string(peer_id, peer_id_size)
+                           generation:context->generation];
  } else if (context->role == PeerRole::Controller && stats &&
             [owner isControllerGenerationActive:context->generation]) {
    [owner handleStats:stats mode:mode];
@@ -370,6 +383,9 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
  std::atomic<uint64_t> _receivedVideoFrames;
  std::atomic<uint64_t> _controllerGenerationCounter;
  std::atomic<uint64_t> _activeControllerGeneration;
+  std::atomic<uint64_t> _identityGeneration;
+  std::atomic<uint64_t> _signalGeneration;
+  std::atomic<uint64_t> _presenceGeneration;
 }

 - (instancetype)init {
@@ -396,6 +412,9 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
    _receivedVideoFrames.store(0);
    _controllerGenerationCounter.store(0);
    _activeControllerGeneration.store(0);
+    _identityGeneration.store(0);
+    _signalGeneration.store(0);
+    _presenceGeneration.store(0);
  }
  return self;
 }
@@ -517,10 +536,17 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
  });
 }

- (void)requestPresenceForRemoteIDs:(NSArray<NSString *> *)remoteIDs {
+- (void)invalidatePresence {
+  _presenceGeneration.fetch_add(1);
+}
+
+- (void)requestPresenceForRemoteIDs:(NSArray<NSString *> *)remoteIDs
+                         subscribe:(BOOL)subscribe {
  NSArray<NSString *> *owned_ids = [remoteIDs copy];
+  const uint64_t generation = _presenceGeneration.load();
  dispatch_async(_rtcQueue, ^{
-    if (!self->_state->identity_peer || !self->_state->identity_ready ||
+    if (generation != self->_presenceGeneration.load() ||
+        !self->_state->identity_peer || !self->_state->identity_ready ||
        self->_state->identity_base.empty()) {
      return;
    }
@@ -540,14 +566,19 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
      @"type" : @"recent_connections_presence",
      @"user_id" : user_id ?: @"",
      @"devices" : devices,
+      @"subscribe" : @(subscribe),
    };
    NSData *payload = [NSJSONSerialization dataWithJSONObject:request
                                                      options:0
                                                        error:nil];
    if (!payload) return;
-    SendSignalMessage(self->_state->identity_peer,
-                      static_cast<const char *>(payload.bytes),
-                      payload.length);
+    if (SendSignalMessage(self->_state->identity_peer,
+                           static_cast<const char *>(payload.bytes),
+                           payload.length) == 0) {
+      // Both old and new servers return snapshots in request order. Retain the
+      // epoch so a pre-foreground response cannot satisfy a fresh query.
+      self->_state->presence_requests.push_back({generation, bool(subscribe)});
+    }
  });
 }

@@ -832,13 +863,15 @@ Params MakeParams(const RTCState &state, const std::string &user_id,

 - (void)createIdentityPeer {
  if (_state->identity_peer || _state->signal_host.empty()) return;
+  _state->identity_context.generation = _identityGeneration.fetch_add(1) + 1;
  Params params = MakeParams(*_state, _state->identity_with_password,
                             &_state->identity_context);
  _state->identity_peer = CreatePeer(&params);
  if (!_state->identity_peer || Init(_state->identity_peer) != 0) {
    [self destroyIdentityPeer];
    [self handleSignalState:CrossDeskSignalStateFailed
-                       role:PeerRole::Identity];
+                       role:PeerRole::Identity
+                 generation:_identityGeneration.load()];
  }
 }

@@ -890,6 +923,9 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
 }

 - (void)destroyIdentityPeer {
+  _identityGeneration.fetch_add(1);
+  _presenceGeneration.fetch_add(1);
+  _state->presence_requests.clear();
  if (_state->identity_peer) {
    DestroyPeer(&_state->identity_peer);
  }
@@ -920,8 +956,19 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
  [self resetVideoDelivery];
 }

- (void)handleSignalState:(CrossDeskSignalState)state role:(PeerRole)role {
+- (void)handleSignalState:(CrossDeskSignalState)state
+                     role:(PeerRole)role
+               generation:(uint64_t)generation {
+  // Only the long-lived identity peer drives presence and the home indicator.
+  if (role != PeerRole::Identity || generation != _identityGeneration.load()) {
+    return;
+  }
+  const uint64_t signal_generation = _signalGeneration.fetch_add(1) + 1;
+  _presenceGeneration.fetch_add(1);
  dispatch_async(_rtcQueue, ^{
+    if (generation != self->_identityGeneration.load() ||
+        signal_generation != self->_signalGeneration.load()) return;
+    self->_state->presence_requests.clear();
    if (role == PeerRole::Identity) {
      self->_state->identity_ready = state == CrossDeskSignalStateConnected;
      if (state == CrossDeskSignalStateFailed &&
@@ -954,6 +1001,8 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
    // its shutdown would incorrectly make the server look disconnected.
    if (role == PeerRole::Identity) {
      DispatchMain(^{
+        if (generation != self->_identityGeneration.load() ||
+            signal_generation != self->_signalGeneration.load()) return;
        id<CrossDeskRTCBridgeDelegate> delegate = self.delegate;
        if ([delegate respondsToSelector:
                @selector(rtcBridge:didChangeSignalState:)]) {
@@ -966,13 +1015,18 @@ Params MakeParams(const RTCState &state, const std::string &user_id,

 - (void)handleSignalMessage:(const char *)message
                       size:(size_t)size
-                       role:(PeerRole)role {
+                       role:(PeerRole)role
+                 generation:(uint64_t)generation {
  constexpr size_t kMaxPresenceMessageSize = 256 * 1024;
-  if (role != PeerRole::Identity || !message || size == 0 ||
+  if (role != PeerRole::Identity || generation != _identityGeneration.load() ||
+      !message || size == 0 ||
      size > kMaxPresenceMessageSize) {
    return;
  }

+  const uint64_t signal_generation = _signalGeneration.load();
+  const uint64_t presence_generation = _presenceGeneration.load();
+
  NSData *payload = [NSData dataWithBytes:message length:size];
  id decoded = [NSJSONSerialization JSONObjectWithData:payload
                                                options:0
@@ -1007,22 +1061,41 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
  } else {
    return;
  }
-  if (presence.count == 0) return;
-
  NSDictionary<NSString *, NSNumber *> *result = [presence copy];
-  DispatchMain(^{
-    id<CrossDeskRTCBridgeDelegate> delegate = self.delegate;
-    if ([delegate respondsToSelector:
-            @selector(rtcBridge:didReceivePresence:)]) {
-      [delegate rtcBridge:self didReceivePresence:result];
+  const bool response = [type isEqualToString:@"presence"];
+  dispatch_async(_rtcQueue, ^{
+    if (generation != self->_identityGeneration.load() ||
+        signal_generation != self->_signalGeneration.load() ||
+        !self->_state->identity_ready) return;
+    uint64_t delivery_generation = presence_generation;
+    BOOL snapshot = NO;
+    if (response) {
+      if (self->_state->presence_requests.empty()) return;
+      const auto request = self->_state->presence_requests.front();
+      self->_state->presence_requests.pop_front();
+      delivery_generation = request.generation;
+      snapshot = request.subscription;
    }
+    if (delivery_generation != self->_presenceGeneration.load()) return;
+    DispatchMain(^{
+      if (generation != self->_identityGeneration.load() ||
+          signal_generation != self->_signalGeneration.load() ||
+          delivery_generation != self->_presenceGeneration.load()) return;
+      id<CrossDeskRTCBridgeDelegate> delegate = self.delegate;
+      if ([delegate respondsToSelector:
+              @selector(rtcBridge:didReceivePresence:snapshot:)]) {
+        [delegate rtcBridge:self didReceivePresence:result snapshot:snapshot];
+      }
+    });
  });
 }

- (void)handleProvisionedIdentity:(const std::string &)identity {
+- (void)handleProvisionedIdentity:(const std::string &)identity
+                       generation:(uint64_t)generation {
  if (identity.empty()) return;
  const std::string identity_copy = identity;
  dispatch_async(_rtcQueue, ^{
+    if (generation != self->_identityGeneration.load()) return;
    self->_state->identity_with_password = identity_copy;
    self->_state->identity_base = BaseIdentity(identity_copy);
    NSString *host = [NSString stringWithUTF8String:
@@ -1038,6 +1111,7 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
      [[NSUserDefaults standardUserDefaults] removeObjectForKey:key];
    }
    DispatchMain(^{
+      if (generation != self->_identityGeneration.load()) return;
      id<CrossDeskRTCBridgeDelegate> delegate = self.delegate;
      if ([delegate respondsToSelector:@selector(rtcBridge:didProvisionIdentity:)]) {
        [delegate rtcBridge:self didProvisionIdentity:value];
@@ -1114,7 +1188,7 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
  return active == 0 || active == generation;
 }

- (void)handleVideoFrame:(const XVideoFrame *)frame
+- (void)handleVideoFrame:(const MiniRtcVideoFrame *)frame
                sourceID:(const char *)sourceID
            sourceIDSize:(size_t)sourceIDSize {
  if (!frame || frame->width == 0 || frame->height == 0) return;
@@ -1124,12 +1198,17 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
        static_cast<size_t>(_selectedDisplay.load()));
    if (source != expected) return;
  }
+  const MiniRtcNativeVideoFrame *native_frame = frame->native_frame;
  const bool has_native_pixel_buffer =
-      frame->native_handle &&
-      frame->native_handle_type == XVideoFrameNativeHandleCVPixelBuffer;
+      native_frame &&
+      native_frame->struct_size >=
+          static_cast<uint32_t>(sizeof(MiniRtcNativeVideoFrame)) &&
+      native_frame->type == MiniRtcNativeVideoFrameCVPixelBuffer &&
+      native_frame->payload.cv_pixel_buffer;
  if (has_native_pixel_buffer) {
    CVPixelBufferRef pixel_buffer =
-        static_cast<CVPixelBufferRef>(frame->native_handle);
+        static_cast<CVPixelBufferRef>(
+            native_frame->payload.cv_pixel_buffer);
    [self enqueueVideoPixelBuffer:pixel_buffer
                            width:frame->width
                           height:frame->height];
@@ -1579,7 +1658,7 @@ Params MakeParams(const RTCState &state, const std::string &user_id,
  }
 }

- (void)handleStats:(const XNetTrafficStats *)stats mode:(TraversalMode)mode {
+- (void)handleStats:(const MiniRtcNetTrafficStats *)stats mode:(TraversalMode)mode {
  if (!stats) return;
  const NSUInteger bitrate = stats->total_inbound_stats.bitrate;
  const float loss = stats->video_inbound_stats.loss_rate;
@@ -23,11 +23,16 @@ struct ContentView: View {
            }
            if scenePhase == .active {
                session.refreshRecentConnectionPresenceAfterForeground()
+                session.resumeVideoAfterForeground()
            }
        }
        .onChange(of: scenePhase) { phase in
            if phase == .active {
                session.refreshRecentConnectionPresenceAfterForeground()
+                session.resumeVideoAfterForeground()
+            } else if phase == .background {
+                session.suspendVideoForBackground()
+                session.suspendPresenceMonitoring()
            }
        }
    }
@@ -17,9 +17,9 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
-    <string>1.0</string>
+    <string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
    <key>LSRequiresIPhoneOS</key>
    <true/>
    <key>NSLocalNetworkUsageDescription</key>
@@ -58,6 +58,7 @@ struct RemoteTouchInputView: UIViewRepresentable {
    let videoSize: CGSize
    let controlMode: MouseControlMode
    let remoteCursorPosition: CGPoint?
+    let remoteCursorPositionRevision: UInt64
    let viewportScale: CGFloat
    let viewportOffset: CGSize
    let viewportChanged: (CGFloat, CGSize) -> Void
@@ -81,7 +82,8 @@ struct RemoteTouchInputView: UIViewRepresentable {
        view.onLeftUp = leftUp
        view.onRightClick = rightClick
        view.onScroll = scroll
-        view.synchronizeRemoteCursor(remoteCursorPosition)
+        view.synchronizeRemoteCursor(remoteCursorPosition,
+                                     revision: remoteCursorPositionRevision)
    }
 }

@@ -108,6 +110,7 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {

    private var relativeCursorPoint: (Float, Float) = (0.5, 0.5)
    private var lastRemoteCursorPoint: (Float, Float)?
+    private var lastRemoteCursorRevision: UInt64?
    private var relativePanActive = false
    private var heldDragPoint: (Float, Float)?
    private var heldDragLastLocation: CGPoint?
@@ -184,7 +187,12 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {
        viewportOffset = constrainedViewportOffset(offset, scale: nextScale)
    }

-    func synchronizeRemoteCursor(_ position: CGPoint?) {
+    func synchronizeRemoteCursor(_ position: CGPoint?, revision: UInt64) {
+        // SwiftUI refreshes this view for video frames and shape-only feedback
+        // too. Consume each position update once, even when it arrives during
+        // local movement, so a later refresh cannot restore an old coordinate.
+        guard revision != lastRemoteCursorRevision else { return }
+        lastRemoteCursorRevision = revision
        guard let position else {
            lastRemoteCursorPoint = nil
            return
@@ -194,7 +202,11 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {
            Float(min(max(position.y, 0), 1))
        )
        lastRemoteCursorPoint = point
-        applyRemoteCursorIfIdle()
+        guard controlMode == .relative,
+              !relativePanActive,
+              heldDragPoint == nil,
+              hoverLastLocation == nil else { return }
+        relativeCursorPoint = point
    }

    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer,
@@ -359,7 +371,7 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {
        if controlMode == .relative {
            switch recognizer.state {
            case .began:
-                guard renderRect()?.contains(location) == true else { return }
+                guard canStartRelativePointerGesture(at: location) else { return }
                hoverLastLocation = location
                onMove?(relativeCursorPoint.0, relativeCursorPoint.1)
            case .changed:
@@ -386,7 +398,7 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {
        switch recognizer.state {
        case .began:
            let location = recognizer.location(in: self)
-            relativePanActive = renderRect()?.contains(location) == true
+            relativePanActive = canStartRelativePointerGesture(at: location)
            recognizer.setTranslation(.zero, in: self)
            if relativePanActive {
                onMove?(relativeCursorPoint.0, relativeCursorPoint.1)
@@ -400,7 +412,6 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {
            }
        default:
            relativePanActive = false
-            applyRemoteCursorIfIdle()
        }
    }

@@ -408,7 +419,7 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {
        let location = recognizer.location(in: self)
        switch recognizer.state {
        case .began:
-            guard renderRect()?.contains(location) == true else { return }
+            guard canStartRelativePointerGesture(at: location) else { return }
            heldDragLastLocation = location
            heldDragPoint = relativeCursorPoint
            onMove?(relativeCursorPoint.0, relativeCursorPoint.1)
@@ -429,7 +440,6 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {
            }
            heldDragPoint = nil
            heldDragLastLocation = nil
-            applyRemoteCursorIfIdle()
        default:
            break
        }
@@ -437,12 +447,18 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {

    private func pointerPoint(for location: CGPoint) -> (Float, Float)? {
        if controlMode == .relative {
-            guard renderRect()?.contains(location) == true else { return nil }
+            guard canStartRelativePointerGesture(at: location) else { return nil }
            return relativeCursorPoint
        }
        return normalized(location)
    }

+    private func canStartRelativePointerGesture(at location: CGPoint) -> Bool {
+        // The entire touch surface acts as a trackpad, including letterboxing.
+        // A valid video rect is still required to scale pointer movement.
+        bounds.contains(location) && renderRect() != nil
+    }
+
    private func updateRelativeCursor(by translation: CGPoint) -> (Float, Float)? {
        guard let renderRect = renderRect(),
              renderRect.width > 0, renderRect.height > 0 else { return nil }
@@ -457,14 +473,6 @@ final class RemoteTouchSurface: UIView, UIGestureRecognizerDelegate {
        return relativeCursorPoint
    }

-    private func applyRemoteCursorIfIdle() {
-        guard controlMode == .relative,
-              !relativePanActive,
-              heldDragPoint == nil,
-              let point = lastRemoteCursorPoint else { return }
-        relativeCursorPoint = point
-    }
-
    private func normalized(_ point: CGPoint) -> (Float, Float)? {
        guard let renderRect = renderRect(), renderRect.contains(point) else { return nil }
        return (Float((point.x - renderRect.minX) / renderRect.width),
@@ -381,6 +381,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
    @Published private(set) var remoteCursorVisible = true
    @Published private(set) var remoteCursorShape = 0
    @Published private(set) var remoteCursorPosition: CGPoint?
+    @Published private(set) var remoteCursorPositionRevision: UInt64 = 0
    @Published private(set) var remoteCursorVisualOffset = CGPoint.zero
    @Published private(set) var hasRemoteCursorState = false
    @Published private(set) var bitrate: UInt = 0
@@ -407,8 +408,27 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
    private var shouldCaptureThumbnail = false
    private var activeDisplayName = ""
    private var remoteCursorSequence: UInt32?
+    private var videoWasBackgrounded = false
+    private var videoRecoveryTask: Task<Void, Never>?
    private var pendingPresenceRemoteID: String?
    private var presenceProbeGeneration: UInt64 = 0
+    private var signalConnected = false
+    private var presenceIsForeground = false
+    private var awaitingPresenceSnapshot = true
+    private var presenceUpdatedAt: [String: ContinuousClock.Instant] = [:]
+    private var lastPresenceRefreshAt: ContinuousClock.Instant?
+    private var presenceTimer: Timer?
+    private let presenceClock = ContinuousClock()
+    private static let presenceRefreshInterval: Duration = .seconds(30)
+    private static let presenceMaxAge: Duration = .seconds(60)
+
+    private struct BridgeConfiguration: Equatable {
+        let host: String
+        let signalPort: Int
+        let turnPort: Int
+        let enableSRTP: Bool
+    }
+    private var bridgeConfiguration: BridgeConfiguration?

    var pixelBuffer: CVPixelBuffer? { videoFrame?.pixelBuffer }
    var frameSize: CGSize { videoFrame?.encodedSize ?? .zero }
@@ -426,18 +446,38 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
        configureBridge()
    }

-    func configureBridge() {
+    deinit {
+        presenceTimer?.invalidate()
+    }
+
+    @discardableResult
+    func configureBridge() -> Bool {
+        let host = signalHost.trimmingCharacters(in: .whitespacesAndNewlines)
        guard let signal = Int(signalPort), let turn = Int(turnPort),
-              !signalHost.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
+              (1...65535).contains(signal), (1...65535).contains(turn),
+              !host.isEmpty else {
            signalStatus = "服务器配置无效"
-            return
+            return false
+        }
+        let configuration = BridgeConfiguration(host: host, signalPort: signal,
+                                                turnPort: turn, enableSRTP: enableSRTP)
+        if bridgeConfiguration != configuration {
+            bridgeConfiguration = configuration
+            signalConnected = false
+            signalStatus = "正在连接信令服务"
+            stopPresenceMonitoring()
+            invalidatePresence()
+            cancelPendingPresenceConnection()
+        } else if signalConnected {
+            signalStatus = "已连接服务器"
        }
        bridge.setHardwareAccelerationEnabled(videoCodecMode == .hardware)
        bridge.setVideoAdaptationPolicy(videoAdaptationPolicy.bridgeValue)
-        bridge.configure(withSignalHost: signalHost,
+        bridge.configure(withSignalHost: host,
                         signalPort: signal,
                         turnPort: turn,
                         enableSRTP: enableSRTP)
+        return true
    }

    func connect(password: String, rememberPassword: Bool) {
@@ -453,8 +493,11 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
            return
        }
        remoteID = identifier
-        configureBridge()
-        if recentConnectionPresence[identifier] == true {
+        guard configureBridge() else {
+            connectionStatus = signalStatus
+            return
+        }
+        if isDeviceOnline(identifier) {
            beginRemoteConnection(identifier)
        } else {
            beginPresenceProbe(identifier)
@@ -462,6 +505,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
    }

    private func beginRemoteConnection(_ identifier: String) {
+        cancelVideoRecovery()
        cancelPresenceProbe()
        activeRemoteID = identifier
        activeDisplayName = ""
@@ -477,7 +521,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
    }

    private func beginPresenceProbe(_ identifier: String) {
-        guard signalStatus == "已连接服务器" else {
+        guard signalConnected, presenceIsForeground else {
            showDeviceOffline()
            return
        }
@@ -489,7 +533,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
        isConnected = false
        sessionVisible = false
        connectionStatus = "正在确认设备状态…"
-        bridge.requestPresence(remoteIDs: [identifier])
+        requestPresenceProbe(identifier)

        DispatchQueue.main.asyncAfter(deadline: .now() + 5) { [weak self] in
            guard let self,
@@ -508,6 +552,21 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
        pendingPresenceRemoteID = nil
    }

+    private func cancelPendingPresenceConnection() {
+        guard pendingPresenceRemoteID != nil else { return }
+        cancelPresenceProbe()
+        isConnecting = false
+        connectionStatus = "未连接"
+    }
+
+    private func requestPresenceProbe(_ identifier: String) {
+        guard signalConnected, presenceIsForeground else { return }
+        // Older servers ignore subscribe=false and replace the watched list.
+        var identifiers = recentConnections.map(\.remoteID)
+        if !identifiers.contains(identifier) { identifiers.append(identifier) }
+        bridge.requestPresence(remoteIDs: identifiers, subscribe: false)
+    }
+
    private func showDeviceOffline() {
        isConnecting = false
        isConnected = false
@@ -521,6 +580,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
    }

    func disconnect() {
+        cancelVideoRecovery()
        let wasCheckingPresence = pendingPresenceRemoteID != nil
        cancelPresenceProbe()
        if wasCheckingPresence {
@@ -543,6 +603,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
    }

    func retry() {
+        cancelVideoRecovery()
        bridge.disconnect()
        connect()
    }
@@ -569,29 +630,120 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
    }

    func isRecentConnectionOnline(_ connection: RecentConnection) -> Bool {
-        recentConnectionPresence[connection.remoteID] == true
+        isDeviceOnline(connection.remoteID)
+    }
+
+    private func isDeviceOnline(_ identifier: String) -> Bool {
+        guard signalConnected, presenceIsForeground, !awaitingPresenceSnapshot,
+              recentConnectionPresence[identifier] == true,
+              let updatedAt = presenceUpdatedAt[identifier] else { return false }
+        return updatedAt.duration(to: presenceClock.now) < Self.presenceMaxAge
    }

    private func refreshRecentConnectionPresence() {
-        bridge.requestPresence(remoteIDs: recentConnections.map(\.remoteID))
+        guard signalConnected, presenceIsForeground else { return }
+        lastPresenceRefreshAt = presenceClock.now
+        bridge.requestPresence(remoteIDs: recentConnections.map(\.remoteID),
+                               subscribe: true)
+    }
+
+    private func invalidatePresence() {
+        bridge.invalidatePresence()
+        recentConnectionPresence = [:]
+        presenceUpdatedAt = [:]
+        awaitingPresenceSnapshot = true
+        lastPresenceRefreshAt = nil
+    }
+
+    private func startPresenceMonitoring() {
+        guard signalConnected, presenceIsForeground, presenceTimer == nil else { return }
+        let timer = Timer(timeInterval: 1, repeats: true) { [weak self] _ in
+            self?.maintainPresence()
+        }
+        RunLoop.main.add(timer, forMode: .common)
+        presenceTimer = timer
+    }
+
+    private func stopPresenceMonitoring() {
+        presenceTimer?.invalidate()
+        presenceTimer = nil
+    }
+
+    private func maintainPresence() {
+        guard signalConnected, presenceIsForeground else { return }
+        let now = presenceClock.now
+        let expired = presenceUpdatedAt.compactMap { identifier, updatedAt in
+            updatedAt.duration(to: now) >= Self.presenceMaxAge ? identifier : nil
+        }
+        if !expired.isEmpty {
+            var updated = recentConnectionPresence
+            for identifier in expired {
+                updated.removeValue(forKey: identifier)
+                presenceUpdatedAt.removeValue(forKey: identifier)
+            }
+            recentConnectionPresence = updated
+        }
+        if lastPresenceRefreshAt.map({ $0.duration(to: now) >= Self.presenceRefreshInterval }) ?? true {
+            refreshRecentConnectionPresence()
+        }
+    }
+
+    func suspendPresenceMonitoring() {
+        presenceIsForeground = false
+        stopPresenceMonitoring()
+        invalidatePresence()
+        cancelPendingPresenceConnection()
+    }
+
+    func suspendVideoForBackground() {
+        videoWasBackgrounded = true
+        cancelVideoRecovery()
+    }
+
+    func resumeVideoAfterForeground() {
+        guard videoWasBackgrounded else { return }
+        videoWasBackgrounded = false
+        guard isConnected, sessionVisible else { return }
+
+        cancelVideoRecovery()
+        NSLog("CrossDesk resuming foreground video, requesting key frame")
+        bridge.requestKeyFrame()
+        // The first request can race transport resumption. Retry briefly until
+        // a decoded frame arrives, and never carry retries into another session.
+        videoRecoveryTask = Task { @MainActor [weak self] in
+            for delay in [500_000_000, 1_000_000_000, 2_000_000_000] as [UInt64] {
+                do {
+                    try await Task.sleep(nanoseconds: delay)
+                } catch {
+                    return
+                }
+                guard !Task.isCancelled, let self,
+                      !self.videoWasBackgrounded,
+                      self.isConnected, self.sessionVisible else { return }
+                self.bridge.requestKeyFrame()
+            }
+        }
+    }
+
+    private func cancelVideoRecovery() {
+        videoRecoveryTask?.cancel()
+        videoRecoveryTask = nil
    }

    func refreshRecentConnectionPresenceAfterForeground() {
-        // iOS can suspend the process while it is in the background, so presence
-        // updates received during that time are missed. Treat cached values as
-        // unknown (and therefore offline, like the desktop client) until the
-        // signaling server returns a fresh snapshot.
-        recentConnectionPresence = [:]
+        presenceIsForeground = true
+        invalidatePresence()
+        startPresenceMonitoring()
+        refreshRecentConnectionPresence()
        if let pendingPresenceRemoteID {
-            bridge.requestPresence(remoteIDs: [pendingPresenceRemoteID])
-        } else {
-            refreshRecentConnectionPresence()
+            requestPresenceProbe(pendingPresenceRemoteID)
        }
    }

    func removeRecentConnection(_ connection: RecentConnection) {
        recentConnections.removeAll { $0.remoteID == connection.remoteID }
        recentConnectionPresence.removeValue(forKey: connection.remoteID)
+        presenceUpdatedAt.removeValue(forKey: connection.remoteID)
        RecentConnectionStore.save(recentConnections)
        RecentConnectionStore.removeThumbnail(fileName: connection.thumbnailFileName)
        ConnectionCredentialStore.removePassword(for: connection.remoteID)
@@ -621,7 +773,6 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
        )
        recentConnections.removeAll { $0.remoteID == activeRemoteID }
        recentConnections.insert(connection, at: 0)
-        recentConnectionPresence[activeRemoteID] = true
        RecentConnectionStore.save(recentConnections)
        refreshRecentConnectionPresence()
    }
@@ -665,6 +816,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
        remoteCursorVisible = true
        remoteCursorShape = 0
        remoteCursorPosition = nil
+        remoteCursorPositionRevision &+= 1
        remoteCursorVisualOffset = .zero
        hasRemoteCursorState = false
        remoteCursorSequence = nil
@@ -706,6 +858,8 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe

    func rtcBridge(_ bridge: CrossDeskRTCBridge,
                   didChange state: CrossDeskSignalState) {
+        signalConnected = state.rawValue == 1
+        invalidatePresence()
        switch state.rawValue {
        case 0: signalStatus = "正在连接信令服务"
        case 1: signalStatus = "已连接服务器"
@@ -716,12 +870,15 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
        case 6: signalStatus = "TLS 证书校验失败"
        default: signalStatus = "未知信令状态"
        }
-        if state.rawValue == 1 {
+        if signalConnected {
+            startPresenceMonitoring()
+            refreshRecentConnectionPresence()
            if let pendingPresenceRemoteID {
-                bridge.requestPresence(remoteIDs: [pendingPresenceRemoteID])
-            } else {
-                refreshRecentConnectionPresence()
+                requestPresenceProbe(pendingPresenceRemoteID)
            }
+        } else {
+            stopPresenceMonitoring()
+            cancelPendingPresenceConnection()
        }
    }

@@ -729,14 +886,14 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
                   didChange state: CrossDeskConnectionState,
                   remoteID: String) {
        isConnected = state.rawValue == 1
+        if !isConnected {
+            cancelVideoRecovery()
+        }
        isConnecting = [0, 2].contains(state.rawValue)
        switch state.rawValue {
        case 0: connectionStatus = "正在建立远程连接"
        case 1:
            connectionStatus = "已连接"
-            if !remoteID.isEmpty {
-                recentConnectionPresence[remoteID] = true
-            }
            sessionVisible = true
            recordSuccessfulConnectionIfNeeded()
            audioPlayer.setEnabled(audioEnabled)
@@ -760,6 +917,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
            connectionStatus = "远程设备 ID 不存在"
            if !remoteID.isEmpty {
                recentConnectionPresence[remoteID] = false
+                presenceUpdatedAt.removeValue(forKey: remoteID)
            }
            sessionVisible = false
            AppOrientation.update(to: .portrait)
@@ -767,6 +925,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
            connectionStatus = "远程设备当前不可用"
            if !remoteID.isEmpty {
                recentConnectionPresence[remoteID] = false
+                presenceUpdatedAt.removeValue(forKey: remoteID)
            }
            sessionVisible = false
            AppOrientation.update(to: .portrait)
@@ -776,18 +935,28 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe

    func rtcBridge(_ bridge: CrossDeskRTCBridge, didProvisionIdentity identity: String) {
        localIdentity = identity.split(separator: "@").first.map(String.init) ?? identity
+        refreshRecentConnectionPresence()
        if let pendingPresenceRemoteID {
-            bridge.requestPresence(remoteIDs: [pendingPresenceRemoteID])
-        } else {
-            refreshRecentConnectionPresence()
+            requestPresenceProbe(pendingPresenceRemoteID)
        }
    }

    func rtcBridge(_ bridge: CrossDeskRTCBridge,
-                   didReceivePresence presence: [String: NSNumber]) {
-        var updated = recentConnectionPresence
-        for (remoteID, online) in presence {
+                   didReceivePresence presence: [String: NSNumber],
+                   snapshot: Bool) {
+        guard signalConnected, presenceIsForeground,
+              snapshot || !awaitingPresenceSnapshot else { return }
+        var updated = snapshot ? [:] : recentConnectionPresence
+        if snapshot {
+            presenceUpdatedAt = [:]
+            awaitingPresenceSnapshot = false
+        }
+        let now = presenceClock.now
+        let watched = Set(recentConnections.map(\.remoteID))
+        for (remoteID, online) in presence
+            where watched.contains(remoteID) || pendingPresenceRemoteID == remoteID {
            updated[remoteID] = online.boolValue
+            presenceUpdatedAt[remoteID] = now
        }
        recentConnectionPresence = updated

@@ -808,6 +977,8 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
                   didReceive pixelBuffer: CVPixelBuffer,
                   width: Int,
                   height: Int) {
+        guard !videoWasBackgrounded else { return }
+        cancelVideoRecovery()
        // Buffer and encoded dimensions must be one observable value. Adaptive
        // resolution changes must never expose a new frame with the previous
        // frame's geometry to SwiftUI.
@@ -867,6 +1038,7 @@ final class RemoteSessionModel: NSObject, ObservableObject, CrossDeskRTCBridgeDe
            } else {
                remoteCursorPosition = nil
            }
+            remoteCursorPositionRevision &+= 1
        }
        hasRemoteCursorState = true
    }
@@ -79,6 +79,7 @@ struct RemoteSessionView: View {
                        videoSize: session.displayGeometrySize,
                        controlMode: session.mouseControlMode,
                        remoteCursorPosition: session.remoteCursorPosition,
+                        remoteCursorPositionRevision: session.remoteCursorPositionRevision,
                        viewportScale: viewport.scale,
                        viewportOffset: viewport.offset,
                        viewportChanged: { scale, offset in
@@ -161,8 +162,8 @@ struct RemoteSessionView: View {
        .onChange(of: session.mouseControlMode) { _ in
            cursorPosition = session.remoteCursorPosition
        }
-        .onChange(of: session.remoteCursorPosition) { position in
-            guard let position else { return }
+        .onChange(of: session.remoteCursorPositionRevision) { _ in
+            guard let position = session.remoteCursorPosition else { return }
            cursorPosition = position
        }
        .fileImporter(isPresented: $showingFileImporter,
@@ -245,6 +246,8 @@ struct RemoteSessionView: View {
    }

    private var floatingStatusControls: some View {
+        // Keep the orb and expanded menu inside the safe area so their initial
+        // positions and drag bounds clear the Dynamic Island in either orientation.
        GeometryReader { proxy in
            let containerSize = proxy.size
            let restingOrbCenter = boundedOrbCenter(in: containerSize)
@@ -332,7 +335,6 @@ struct RemoteSessionView: View {
                    )
            }
        }
-        .ignoresSafeArea()
    }

    private var draggableKeyboard: some View {
@@ -1167,8 +1169,12 @@ private struct FloatingSessionMenu: View {
    }

    private var statusDetail: String {
-        var components = [session.usingTURN ? "TURN" : "P2P",
-                          session.formattedBitrate]
+        var components = [session.usingTURN ? "TURN" : "P2P"]
+        let frameSize = session.frameSize
+        if frameSize.width > 0 && frameSize.height > 0 {
+            components.append("\(Int(frameSize.width))×\(Int(frameSize.height))")
+        }
+        components.append(session.formattedBitrate)
        if session.lossRate > 0 {
            components.append(String(format: "丢包 %.1f%%", session.lossRate * 100))
        }
@@ -10,6 +10,7 @@ import UIKit
 /// itself. This avoids the Core Image -> MTKView path, which can remain black
 /// on a physical device even though VideoToolbox is producing valid frames.
 struct NativeVideoView: UIViewRepresentable {
+    @Environment(\.scenePhase) private var scenePhase
    let pixelBuffer: CVPixelBuffer?

    func makeUIView(context: Context) -> SampleBufferVideoView {
@@ -17,7 +18,7 @@ struct NativeVideoView: UIViewRepresentable {
    }

    func updateUIView(_ uiView: SampleBufferVideoView, context: Context) {
-        uiView.display(pixelBuffer)
+        uiView.display(pixelBuffer, isActive: scenePhase == .active)
    }
 }

@@ -31,6 +32,7 @@ final class SampleBufferVideoView: UIView {
    }

    private var lastPixelBuffer: CVPixelBuffer?
+    private var renderingActive = false
    private var submittedFrames: UInt64 = 0
    private var droppedFrames: UInt64 = 0

@@ -55,7 +57,16 @@ final class SampleBufferVideoView: UIView {
        videoLayer.videoGravity = .resize
    }

-    func display(_ pixelBuffer: CVPixelBuffer?) {
+    func display(_ pixelBuffer: CVPixelBuffer?, isActive: Bool) {
+        if renderingActive != isActive {
+            renderingActive = isActive
+            // Backgrounding can invalidate the display layer without changing
+            // the retained frame. Clear the queue and allow that frame to be
+            // submitted again when the scene becomes active.
+            lastPixelBuffer = nil
+            videoLayer.flushAndRemoveImage()
+        }
+
        guard let pixelBuffer else {
            lastPixelBuffer = nil
            submittedFrames = 0
@@ -63,18 +74,21 @@ final class SampleBufferVideoView: UIView {
            videoLayer.flushAndRemoveImage()
            return
        }
+        guard renderingActive else { return }

-        // SwiftUI can refresh for unrelated status fields. Do not enqueue the
-        // same retained CVPixelBuffer more than once.
-        guard lastPixelBuffer !== pixelBuffer else { return }
-        lastPixelBuffer = pixelBuffer
-
-        if videoLayer.status == .failed {
+        // Check recovery before deduplicating frames: a failed layer may need
+        // to display the same buffer again even if no new decoded frame arrives.
+        if videoLayer.status == .failed || videoLayer.requiresFlushToResumeDecoding {
            NSLog("CrossDesk video layer failed: %@",
                  videoLayer.error?.localizedDescription ?? "unknown error")
            videoLayer.flush()
+            lastPixelBuffer = nil
        }

+        // SwiftUI can refresh for unrelated status fields. Only deduplicate a
+        // frame after it was actually submitted to a healthy, active layer.
+        guard lastPixelBuffer !== pixelBuffer else { return }
+
        // Never let AVSampleBufferDisplayLayer turn temporary rendering
        // pressure into seconds of latency. Its queued buffers are already
        // stale by the time it stops accepting more data, so discard them and
@@ -132,6 +146,7 @@ final class SampleBufferVideoView: UIView {
        }

        videoLayer.enqueue(sampleBuffer)
+        lastPixelBuffer = pixelBuffer
        submittedFrames &+= 1
        if submittedFrames == 1 || submittedFrames.isMultiple(of: 300) {
            NSLog("CrossDesk presented video frame %llu (%zu x %zu)",
@@ -12,12 +12,34 @@ There is no `WKWebView` or browser runtime.

 ## Build

-Open `CrossDeskMobile.xcodeproj`, select the `CrossDeskMobile` scheme and a
-physical device, then build. The first build phase compiles MiniRTC and the
-CrossDesk wire library, then merges their iPhoneOS static dependencies into
-a local archive under `Vendor/`.
+Clone the repository with its submodules. Run these commands from the parent
+directory where you want to place the checkout:

-You can also verify the target without code signing:
+```sh
+git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
+cd crossdesk
+```
+
+For an existing checkout, run `git submodule update --init --recursive` from
+the repository root. All remaining commands below use that root directory.
+
+1. Open `apps/ios/CrossDeskMobile.xcodeproj` and select the `CrossDeskMobile`
+   target and scheme.
+2. Under **Signing & Capabilities**, select your own development team and set
+   a bundle identifier available to that team. The checked-in signing team
+   and `cn.crossdesk.mobile` identifier belong to the project maintainer.
+3. Connect and select a physical iPhone or iPad, configure device trust and
+   Developer Mode as prompted by Xcode, then build and run. See Apple's
+   [device setup guide](https://developer.apple.com/documentation/xcode/running-your-app-on-simulated-or-physical-devices).
+
+The first build phase builds MiniRTC and the CrossDesk wire library, downloads
+and builds their dependencies, then merges the iPhoneOS archives into a local library under
+`Vendor/`. This build path targets physical devices; simulator builds are
+not supported. The exact tool versions used by CI are recorded in the
+[workflow](../../.github/workflows/build.yml).
+
+You can also build the target without code signing. The resulting app, like
+the unsigned CI artifact, requires signing before device installation:

 ```sh
 xcodebuild -project apps/ios/CrossDeskMobile.xcodeproj \
@@ -35,8 +57,9 @@ the desktop-compatible `DisplayN`, `control_audio`, `mouse`, `keyboard`,
 ## Video codecs

 Every iOS build includes VideoToolbox, OpenH264, dav1d, libaom, and SVT-AV1. H.264 uses
-VideoToolbox by default; the in-app **Settings > Video Codec** selector switches
-H.264 software processing to OpenH264. AV1 encoding uses SVT-AV1 and AV1 decoding
+VideoToolbox by default; choose software processing under **设置 → 视频编解码 →
+处理方式** (Settings → Video codec → Processing mode) to use OpenH264 for H.264.
+The change takes effect on the next connection. AV1 encoding uses SVT-AV1 and AV1 decoding
 uses dav1d; VideoToolbox AV1 hardware decoding is currently unsupported.

 ## Physical-device test checklist
@@ -45,26 +68,31 @@ Run the app from Xcode on a physical device and connect to a current desktop
 build. Test the features in this order so a media problem is not confused with
 a data-channel problem:

-1. **Video:** after the connection turns green, the waiting panel should be
-   replaced by the remote desktop. The status bar reports the decoded size and
-   frame count.
+1. **Video:** after the session connects, the waiting panel should be replaced
+   by the remote desktop. Tap the floating icon to see the connection state,
+   P2P/TURN mode, decoded resolution, and bitrate. The current menu does not
+   display a frame counter.
 2. **Audio:** play continuous sound on the remote computer, then toggle the
   speaker button. Audio is Opus-decoded by MiniRTC and played as 48 kHz mono
   16-bit PCM through `AVAudioEngine`.
-3. **Clipboard:** copy a short text value on the phone and choose **Send local
-   clipboard**. Copy a different value on the desktop and confirm that it is
-   written to the iOS pasteboard. Text is limited to 128 KiB.
+3. **Clipboard:** copy a short text value on the remote desktop, then paste it
+   into a text field on the phone to verify reception. Text is limited to
+   128 KiB. The bridge supports sending local text, but the current UI has no
+   **Send local clipboard** action.
 4. **Displays:** open the display menu, switch every listed monitor, and check
-   that the frame counter restarts and the selected monitor appears after a
-   new key frame.
-5. **Files:** use the folder button to pick a small file, then send a file back
+   that the selected monitor appears and the displayed resolution updates
+   after a new key frame.
+5. **Files:** choose **发送文件** (Send file) from the floating menu to pick a
+   small file, then send a file back
   from the desktop. Progress is ACK-driven. Received files are stored in the
   app's `Documents/Received` directory and can be exported with the share
-   button or Finder's Files tab.
+   button beside the transfer status or Finder's Files tab.

-For black-screen diagnosis, keep Xcode's device console open and filter for
-`CrossDesk`. A working pipeline prints both `VideoToolbox decoded frame` from
-MiniRTC and `CrossDesk received decoded frame` from the iOS bridge. If only the
-first message appears, verify that the selected stream is named `Display1`,
-`Display2`, and so on. If neither appears, update and rebuild the desktop side
-and request a key frame.
+For black-screen diagnosis, keep Xcode's debug console open and look for
+`CrossDesk` and `VideoToolbox` messages. With VideoToolbox H.264 decoding selected, look for
+`VideoToolbox decoded frame` from MiniRTC and `CrossDesk delivered latest frame`
+from the iOS bridge. Other codec paths do not produce the VideoToolbox message.
+If decoded frames do not reach the bridge, check that the selected stream is
+named `Display1`, `Display2`, and so on. If no frames decode, check the selected
+codec and the desktop capture/encoding logs, then reconnect or switch displays
+to request a new key frame.
@@ -121,6 +121,7 @@ LINK_DIRS=("${(@f)$(print -r -- "${CLEAN_INFO}" | sed -nE 's|.*-> (/.*)/lib -> p

 REQUIRED_LINKS=(
  nice glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 gthread-2.0 intl
+  gupnp-igd-1.6 gupnp-1.6 gssdp-1.6 soup-3.0 nghttp2 sqlite3 psl xml2
  ffi pcre2-8 pcre2-posix z ssl crypto srtp2 openfec opus yuv kcp
  datachannel usrsctp openh264 dav1d aom SvtAv1Enc
 )
@@ -0,0 +1,240 @@
+# 从源码构建
+
+[返回 README](../README.md) · [English](BUILD_EN.md)
+
+克隆仓库后，构建和打包命令均在仓库根目录执行。构建依赖与参数以 [Xmake 配置](../apps/desktop/xmake/options.lua) 和 [CI 工作流](../.github/workflows/build.yml) 为准。`1.4.3` 仅为本地构建示例版本号；调整时请同步修改配置命令与打包参数，避免程序内版本号与安装包不一致。
+
+## 构建依赖
+
+- Git、[Xmake](https://xmake.io/guide/quick-start.html) 及下文对应平台的编译工具链。
+- 构建脚本通过 Xmake 管理 **CMake 3.x（≥ 3.21、< 4.0）**、**Rust 1.92.0** 等依赖；首次构建需要下载工具与源码。具体约束见 [Slint 包配置](../deps/thirdparty/slint/xmake.lua)。
+
+## Windows
+
+安装 Visual Studio 2022 的“使用 C++ 的桌面开发”工作负载及 Windows SDK，并安装 Xmake。在开发者 PowerShell 中执行：
+
+```powershell
+git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
+cd crossdesk
+xmake f -c -p windows -a x64 -m release --CROSSDESK_VERSION=1.4.3 --USE_CUDA=false -y
+xmake b -vy crossdesk
+xmake r crossdesk
+```
+
+安装包还使用 NSIS，需将仓库中的 [nsProcess.dll](../apps/desktop/scripts/windows/nsProcess.dll) 放入 NSIS 的 `Plugins/x86-unicode` 目录，并确保 `makensis` 在 `PATH` 中。完成 Release 编译后运行：
+
+```powershell
+.\apps\desktop\scripts\windows\pkg_x64.ps1 1.4.3
+```
+
+完整流程见 [Windows 脚本](../apps/desktop/scripts/windows/pkg_x64.ps1) 和 [CI 工作流](../.github/workflows/build.yml)。手动部署时需保留运行库及两个服务辅助程序，见 [Windows 服务说明](../README.md#windows-service)。
+
+## macOS
+
+安装 Xcode 及其命令行工具、Xmake，然后执行：
+
+```bash
+git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
+cd crossdesk
+xmake f -c -m release --target_minver=14.0 --CROSSDESK_VERSION=1.4.3 --USE_CUDA=false -y
+xmake b -vy crossdesk
+xmake r crossdesk
+```
+
+当前 CI 对 Intel 与 Apple Silicon 均设置 macOS 14.0 为最低目标版本，使用的 Xcode/SDK 版本见 [CI 工作流](../.github/workflows/build.yml)。打包时按本机架构执行一个脚本：
+
+```bash
+# Apple Silicon
+./apps/desktop/scripts/macos/pkg_arm64.sh 1.4.3
+# Intel
+./apps/desktop/scripts/macos/pkg_x64.sh 1.4.3
+```
+
+打包脚本会生成包含 Slint 运行库的 `.app` 和 `.pkg`。屏幕录制、辅助功能授权与应用路径及签名有关；测试被控能力时请使用固定路径下的应用包。
+
+## Linux
+
+Linux 构建支持 Ubuntu 20.04 及以上版本的 amd64 和 arm64。发布安装包以
+Ubuntu 20.04/glibc 2.31 为兼容基线。以下依赖命令以 Ubuntu 20.04 为例；其他发行版或较新版本需按其软件源调整包名和工具链，复现 CI 可使用下文的构建镜像。先安装基础编译依赖：
+
+```bash
+sudo apt-get update
+sudo apt-get install -y \
+  git curl unzip build-essential gcc-10 g++-10 python3-pip \
+  pkg-config binutils dpkg-dev \
+  libx11-dev libxext-dev libxrender-dev libxft-dev libxrandr-dev \
+  libxinerama-dev libxcursor-dev libxi-dev libxfixes-dev libxv-dev \
+  libxtst-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev \
+  libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxcb-shm0-dev \
+  libasound2-dev libsndio-dev libpulse-dev \
+  libgl1-mesa-dev
+```
+
+Ubuntu 20.04 自带的 CMake 3.16 不满足要求，Xmake 会下载符合上述范围的
+CMake 3.x，无需手动替换系统 CMake。
+
+Ubuntu 20.04 默认的 GCC 9 缺少 Slint C++ API 所需的部分 C++20 标准库，
+因此上述命令同时安装并在后续配置中指定 GCC 10。
+
+下载子模块并编译 Release 版本：
+
+```bash
+git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
+cd crossdesk
+
+# 已经克隆过仓库时执行这一行
+git submodule update --init --recursive
+
+xmake f -c -m release --CROSSDESK_VERSION=1.4.3 --USE_CUDA=false --toolchain=gcc-10 -y
+xmake b -vy crossdesk
+```
+
+这里应使用 `--toolchain=gcc-10`，以确保 CrossDesk 及 xmake 在配置阶段构建的
+libyuv 等第三方包都使用 GCC 10。只指定 `--cc`/`--cxx` 时，依赖安装可能仍回退到
+系统默认的 `/bin/cc` 和 `/bin/c++`。`-c` 会清除旧配置，切换编译器时必须保留。
+
+amd64 构建结果位于 `build/linux/x86_64/release/crossdesk`，arm64 构建结果位于 `build/linux/arm64/release/crossdesk`。
+
+启用 Wayland 和 DRM 时，再安装 D-Bus、DRM 及 PipeWire 开发依赖。Ubuntu 20.04 使用仓库提供的 PipeWire 头文件 SDK；Ubuntu 22.04 及以上可改用系统的 `libpipewire-0.3-dev` 和 `libspa-0.2-dev` 包：
+
+```bash
+sudo apt-get install -y libdbus-1-dev libdrm-dev
+# 已安装系统 PipeWire 0.3 开发包时跳过这一行
+sudo ./docker/linux-build/install-pipewire-sdk.sh
+
+xmake f -c -m release --USE_WAYLAND=true --USE_DRM=true --USE_CUDA=false \
+  --CROSSDESK_VERSION=1.4.3 --toolchain=gcc-10 -y
+xmake b -vy crossdesk
+```
+
+生成 Debian 安装包（必须在对应架构上先完成 Release 编译）：
+
+```bash
+# amd64
+./apps/desktop/scripts/linux/pkg_amd64.sh 1.4.3
+
+# arm64
+./apps/desktop/scripts/linux/pkg_arm64.sh 1.4.3
+```
+
+打包脚本会将 Slint 共享运行库安装到软件包私有目录 `/usr/lib/crossdesk`，无需用户另外安装 `libslint_cpp.so`。
+PipeWire 不属于强制运行时依赖：程序在运行时检测宿主系统的 PipeWire 0.3，
+没有该运行库时仍可使用 X11（以及构建时启用的 DRM）捕获。
+
+## 通用编译选项
+
+```text
+--USE_CUDA=true/false: 启用 CUDA 硬件编解码，默认不启用
+--USE_WAYLAND=true/false: 在 Linux 上启用 Wayland/PipeWire 捕获，默认不启用
+--USE_DRM=true/false: 在 Linux 上启用 DRM 捕获，默认不启用
+--CROSSDESK_PORTABLE=true/false: 构建便携版本，默认不启用
+--CROSSDESK_VERSION=xxx: 指定 CrossDesk 的版本
+
+# 示例
+xmake f --CROSSDESK_VERSION=1.4.3 --USE_CUDA=true
+```
+
+运行：
+
+```bash
+xmake r crossdesk
+```
+
+## 无 CUDA 环境下的开发支持
+
+对于**未安装 CUDA 环境的 Linux 开发者，如果希望编译后的成果物拥有硬件编解码能力**，这里提供了预配置的 [Ubuntu 20.04 兼容构建镜像](https://hub.docker.com/r/crossdesk/ubuntu20.04)。该镜像内置必要的构建依赖，可生成兼容 glibc 2.31 的单一 Linux 安装包。
+
+镜像版本和 amd64 / arm64 差异见 [构建镜像说明](../docker/linux-build/README.md)。以下 CUDA 示例适用于 amd64 镜像；进入容器、下载工程后执行：
+
+```bash
+export CUDA_PATH=/usr/local/cuda
+export XMAKE_GLOBALDIR=/data
+
+xmake f --root -c -m release --CROSSDESK_VERSION=1.4.3 --USE_CUDA=true --toolchain=gcc-10 -y
+xmake b --root -vy crossdesk
+```
+
+对于**未安装 CUDA 环境的 Windows 开发者**，执行下面的命令安装 CUDA 编译环境：
+
+```powershell
+xmake require -vy "cuda 12.6.3"
+```
+
+安装完成后执行:
+
+```powershell
+xmake require --info "cuda 12.6.3"
+```
+
+在输出中查找 `installdir` 字段。
+
+使用 `installdir` 指向的 CUDA 安装目录。将 CUDA_PATH 加入系统环境变量，或在终端中输入：
+
+```powershell
+$env:CUDA_PATH = "C:\path\to\cuda_installdir"
+```
+
+重新执行：
+
+```powershell
+xmake f --USE_CUDA=true
+xmake b -vy crossdesk
+```
+
+### 运行时连接问题
+
+“未连接服务器”可能由网络、服务器配置或证书信任引起，不应只通过安装另一份客户端来排查。请按 [常见问题](FAQ.md) 和 [自托管证书说明](SELF_HOSTING.md) 检查。
+
+## 关于 Xmake
+
+### 安装 Xmake
+
+使用 curl：
+
+```bash
+curl -fsSL https://xmake.io/shget.text | bash
+```
+
+使用 wget：
+
+```bash
+wget https://xmake.io/shget.text -O - | bash
+```
+
+使用 powershell：
+
+```powershell
+irm https://xmake.io/psget.text | iex
+```
+
+### 编译选项
+
+```text
+# 切换到 Debug；Release 构建将 debug 替换为 release
+xmake f -m debug
+
+# 可选编译参数
+-r ：重新构建目标
+-v ：显示详细的构建日志
+-y ：自动确认提示
+
+# 示例
+xmake b -vy crossdesk
+```
+
+### 运行选项
+
+```bash
+# 使用调试器启动当前构建；不会自动切换为 Debug 编译模式
+xmake r -d crossdesk
+```
+
+更多使用方法可参考 [Xmake 官方文档](https://xmake.io/guide/quick-start.html)。
+
+## iOS / iPadOS
+
+原生客户端使用独立 Xcode 工程，要求 iOS 16+ 的 arm64 真机。构建与音视频、文件传输验证步骤见 [iOS 开发说明](../apps/ios/README.md)。当前 CI 导出未签名应用，真机安装需要自行签名。
+
+## 更新界面截图
+
+README 的桌面图片直接由当前 Slint UI 渲染，复现方式见 [截图说明](images/README.md)。
@@ -0,0 +1,253 @@
+# Build from source
+
+[Back to README](../README_EN.md) · [中文](BUILD.md)
+
+After cloning, run build and packaging commands from the repository root. The [Xmake options](../apps/desktop/xmake/options.lua) and [CI workflow](../.github/workflows/build.yml) define the build configuration. `1.4.3` is an example version for local builds; change both the configuration value and packaging argument together so the app and package versions match.
+
+## Build requirements
+
+- Git, [Xmake](https://xmake.io/guide/quick-start.html), and the platform toolchain listed below.
+- The build scripts use Xmake to manage **CMake 3.x (≥ 3.21, < 4.0)**, **Rust 1.92.0**, and other dependencies. The first build downloads tools and source archives. See the [Slint package configuration](../deps/thirdparty/slint/xmake.lua) for the constraints.
+
+## Windows
+
+Install Visual Studio 2022 with the **Desktop development with C++** workload and Windows SDK, plus Xmake. In a developer PowerShell, run:
+
+```powershell
+git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
+cd crossdesk
+xmake f -c -p windows -a x64 -m release --CROSSDESK_VERSION=1.4.3 --USE_CUDA=false -y
+xmake b -vy crossdesk
+xmake r crossdesk
+```
+
+Installer packaging also uses NSIS. Copy the repository's [nsProcess.dll](../apps/desktop/scripts/windows/nsProcess.dll) into NSIS's `Plugins/x86-unicode` directory and ensure `makensis` is on `PATH`. After building Release, run:
+
+```powershell
+.\apps\desktop\scripts\windows\pkg_x64.ps1 1.4.3
+```
+
+See the [Windows packaging script](../apps/desktop/scripts/windows/pkg_x64.ps1) and [CI workflow](../.github/workflows/build.yml) for the full process. Manual deployment must retain the runtime libraries and both service helpers; see [Windows Service](../README_EN.md#windows-service).
+
+## macOS
+
+Install Xcode and its command-line tools, plus Xmake, then run:
+
+```bash
+git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
+cd crossdesk
+xmake f -c -m release --target_minver=14.0 --CROSSDESK_VERSION=1.4.3 --USE_CUDA=false -y
+xmake b -vy crossdesk
+xmake r crossdesk
+```
+
+The current CI sets macOS 14.0 as the minimum target for both Intel and Apple Silicon. Check the [workflow](../.github/workflows/build.yml) for its Xcode/SDK versions. Package with the script matching your architecture:
+
+```bash
+# Apple Silicon
+./apps/desktop/scripts/macos/pkg_arm64.sh 1.4.3
+# Intel
+./apps/desktop/scripts/macos/pkg_x64.sh 1.4.3
+```
+
+The scripts create an `.app` and `.pkg` containing the Slint runtime. Screen Recording and Accessibility grants depend on the app path and signature; use a consistent application bundle when testing host functionality.
+
+## Linux
+
+Linux builds support Ubuntu 20.04 or later on amd64 and arm64. Release packages
+use Ubuntu 20.04/glibc 2.31 as their compatibility baseline. The dependency
+commands below target Ubuntu 20.04; adapt package names and toolchains for
+other distributions or newer versions, or use the build image below to
+reproduce CI. Install the base build dependencies first:
+
+```bash
+sudo apt-get update
+sudo apt-get install -y \
+  git curl unzip build-essential gcc-10 g++-10 python3-pip \
+  pkg-config binutils dpkg-dev \
+  libx11-dev libxext-dev libxrender-dev libxft-dev libxrandr-dev \
+  libxinerama-dev libxcursor-dev libxi-dev libxfixes-dev libxv-dev \
+  libxtst-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev \
+  libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxcb-shm0-dev \
+  libasound2-dev libsndio-dev libpulse-dev \
+  libgl1-mesa-dev
+```
+
+Ubuntu 20.04's bundled CMake 3.16 is too old. Xmake downloads a CMake 3.x
+version within the range above; replacing the system CMake manually is not required.
+
+Ubuntu 20.04's default GCC 9 lacks parts of the C++20 standard library needed
+by Slint's C++ API, so the commands above install GCC 10 and the configuration
+below selects it explicitly.
+
+Clone the submodules and build a release binary:
+
+```bash
+git clone --recurse-submodules https://github.com/kunkundi/crossdesk.git
+cd crossdesk
+
+# Run this when the repository has already been cloned
+git submodule update --init --recursive
+
+xmake f -c -m release --CROSSDESK_VERSION=1.4.3 --USE_CUDA=false --toolchain=gcc-10 -y
+xmake b -vy crossdesk
+```
+
+Use `--toolchain=gcc-10` so that both CrossDesk and third-party packages such
+as libyuv, which xmake builds during configuration, use GCC 10. Specifying only
+`--cc`/`--cxx` may still let dependency builds fall back to the system
+`/bin/cc` and `/bin/c++`. Keep `-c` when switching compilers to clear the old
+configuration.
+
+The amd64 binary is written to `build/linux/x86_64/release/crossdesk`; the arm64 binary is written to `build/linux/arm64/release/crossdesk`.
+
+For Wayland and DRM, install the D-Bus, DRM, and PipeWire development dependencies.
+Ubuntu 20.04 uses the repository's PipeWire header SDK; Ubuntu 22.04 and later
+can use the distribution's `libpipewire-0.3-dev` and `libspa-0.2-dev` packages instead:
+
+```bash
+sudo apt-get install -y libdbus-1-dev libdrm-dev
+# Skip this line if the system PipeWire 0.3 development packages are installed
+sudo ./docker/linux-build/install-pipewire-sdk.sh
+
+xmake f -c -m release --USE_WAYLAND=true --USE_DRM=true --USE_CUDA=false \
+  --CROSSDESK_VERSION=1.4.3 --toolchain=gcc-10 -y
+xmake b -vy crossdesk
+```
+
+Build a Debian package after compiling a release binary on the matching architecture:
+
+```bash
+# amd64
+./apps/desktop/scripts/linux/pkg_amd64.sh 1.4.3
+
+# arm64
+./apps/desktop/scripts/linux/pkg_arm64.sh 1.4.3
+```
+
+The package scripts install the shared Slint runtime in the private `/usr/lib/crossdesk` directory, so users do not need to install `libslint_cpp.so` separately.
+PipeWire is not a mandatory runtime dependency. CrossDesk detects the host's
+PipeWire 0.3 runtime dynamically and can still use X11 capture (and DRM when
+enabled at build time) when it is unavailable.
+
+## Common build options
+
+```text
+--USE_CUDA=true/false: Enable CUDA hardware codec acceleration, disabled by default
+--USE_WAYLAND=true/false: Enable Wayland/PipeWire capture on Linux, disabled by default
+--USE_DRM=true/false: Enable DRM capture on Linux, disabled by default
+--CROSSDESK_PORTABLE=true/false: Build the portable variant, disabled by default
+--CROSSDESK_VERSION=xxx: Set the CrossDesk version
+
+# Example
+xmake f --CROSSDESK_VERSION=1.4.3 --USE_CUDA=true
+```
+
+Run:
+
+```bash
+xmake r crossdesk
+```
+
+## Development Without CUDA Environment
+
+For **Linux developers who do not have a CUDA environment installed and want to enable hardware codec feature**, a preconfigured [Ubuntu 20.04 compatibility build image](https://hub.docker.com/r/crossdesk/ubuntu20.04) is provided.
+This image contains the required build dependencies and produces a single Linux package compatible with the glibc 2.31 baseline.
+
+See the [build image notes](../docker/linux-build/README.md) for image tags and architecture differences. The CUDA example below targets the amd64 image. Inside the container, download the project and run:
+
+```bash
+export CUDA_PATH=/usr/local/cuda
+export XMAKE_GLOBALDIR=/data
+
+xmake f --root -c -m release --CROSSDESK_VERSION=1.4.3 --USE_CUDA=true --toolchain=gcc-10 -y
+xmake b --root -vy crossdesk
+```
+
+For **Windows developers without a CUDA environment** installed, run the following command to install the CUDA build environment:
+
+```powershell
+xmake require -vy "cuda 12.6.3"
+```
+
+After the installation is complete, execute:
+
+```powershell
+xmake require --info "cuda 12.6.3"
+```
+
+Find the `installdir` field in the output.
+
+From the output above, locate the CUDA installation directory — this is the path pointed to by installdir.
+Add this path to your system environment variable CUDA_PATH, or set it in the terminal using:
+
+```powershell
+$env:CUDA_PATH = "C:\path\to\cuda_installdir"
+```
+
+Then re-run:
+
+```powershell
+xmake f --USE_CUDA=true
+xmake b -vy crossdesk
+```
+
+### Connection issues at runtime
+
+A disconnected status can result from network, server configuration, or certificate trust problems. See the [FAQ](FAQ.md#english) and [self-hosted TLS guide](SELF_HOSTING_EN.md) before changing the installation.
+
+## About Xmake
+
+### Installing Xmake
+
+You can install Xmake using one of the following methods:
+
+Using curl:
+
+```bash
+curl -fsSL https://xmake.io/shget.text | bash
+```
+
+Using wget:
+
+```bash
+wget https://xmake.io/shget.text -O - | bash
+```
+
+Using powershell:
+
+```powershell
+irm https://xmake.io/psget.text | iex
+```
+
+### Build Options
+
+```text
+# Select Debug; replace debug with release for a Release build
+xmake f -m debug
+
+# Optional build parameters
+-r : Rebuild the target
+-v : Show detailed build logs
+-y : Automatically confirm prompts
+
+# Example
+xmake b -vy crossdesk
+```
+
+### Run Options
+
+```bash
+# Launch the current build in a debugger; this does not select Debug build mode
+xmake r -d crossdesk
+```
+
+For more information, please refer to the [official Xmake documentation](https://xmake.io/guide/quick-start.html).
+
+## iOS / iPadOS
+
+The native client has a separate Xcode project and requires an arm64 physical device running iOS 16+. See the [iOS development guide](../apps/ios/README.md) for build and media/file-transfer checks. CI exports an unsigned app; device installation requires your own signing.
+
+## Refreshing screenshots
+
+Desktop README images are rendered directly from the current Slint UI. See the [screenshot notes](images/README.md) for reproduction commands.
@@ -1,33 +1,73 @@
-# 常见问题（FAQ）
+# 常见问题 / FAQ

-欢迎来到 **CrossDesk 常见问题** 页面！  
-这里整理了用户和开发者最常见的一些疑问。如果你没有找到答案，欢迎在 [Issues](https://github.com/kunkundi/crossdesk/issues) 中反馈。
+[返回 README](../README.md) · [English](#english)
+
+## 未连接服务器，或提示 TLS 证书错误
+
+先确认网络可用、两端使用预期的服务器配置。自托管环境检查信令端口、证书有效期、主机名匹配和系统信任；详见 [自托管指南](SELF_HOSTING.md)。这一步解决后，再排查远程设备和 P2P 连接。
+
+## 已连接服务器，但远程设备离线
+
+确认被控端 CrossDesk 仍在运行，双方连接同一个信令服务，并重新复制被控端当前的本机 ID。切换服务器后，原来的 ID 和连接记录可能不再适用。
+
+## 对等连接失败
+
+在 **☰ → 设置** 中勾选 **启用中继服务**，点击“确认”后重新连接。自托管用户还需检查 Coturn 是否正常运行，以及中继端口 TCP/UDP、媒体端口范围 UDP 是否放通。
+
+公共服务的兼容性变更也会影响旧客户端；请核对 [Release 说明](https://github.com/kunkundi/crossdesk/releases)，尽量让两端使用兼容的近期版本。
+
+## macOS 有连接但黑屏，或无法操作键鼠
+
+在“系统设置 → 隐私与安全性”中检查 CrossDesk 的屏幕录制与辅助功能权限。更换应用位置或签名、更新开发构建后，可能需要重新授权并重启应用。
+
+## Linux Wayland 无法捕获画面
+
+Wayland 画面捕获依赖启用了 Wayland 支持的构建、宿主系统 PipeWire 0.3 和桌面门户授权；无法捕获时也可在 X11 会话中对比验证。构建选项见 [Linux 构建说明](BUILD.md#linux)。
+
+## Windows 锁屏后无法操作
+
+在被控电脑检查 CrossDesk Service 是否安装、是否运行，并保持 CrossDesk 客户端运行。便携版可在“设置 → 锁屏控制服务”安装。服务状态检查命令见 [Windows 服务说明](../README.md#windows-service)。
+
+## 修改密码后连接失败
+
+修改密码时使用 6 位数字或英文字母，并保持连接服务器。等待修改成功、客户端重新连接后，重新复制当前密码。控制端保存的旧密码会失效，按弹窗输入新密码再连接。
+
+## 收到的文件在哪里
+
+桌面端见 **☰ → 设置 → 文件保存路径**。iOS 原生端收到的文件保存在应用的 `Documents/Received`，可以从分享入口导出；更多说明见 [iOS 开发文档](../apps/ios/README.md)。
+
+## 关闭主窗口后为什么还能连接
+
+关闭主窗口会隐藏窗口，客户端仍在后台运行。需要结束程序时，从系统托盘或 macOS 菜单栏中选择退出。
+
+## Windows 没有安装 CUDA，如何编译
+
+可以先使用 `--USE_CUDA=false` 构建。需要 CUDA 编解码支持时，按 [构建指南](BUILD.md) 安装对应依赖；PowerShell 中设置环境变量应使用 `$env:CUDA_PATH = "实际安装目录"`。
+
+## iOS 构建产物为什么不能直接安装
+
+当前 CI 导出的是未签名应用。需要使用自己的开发签名 / 分发方式安装；也可用 Xcode 打开工程并选择真机运行。见 [iOS 构建要求](../apps/ios/README.md)。

 ---

-### Q1. 对等连接失败
-**A:**  
-打开设置，勾选 **启用中继服务** 选项，尝试重新发起连接。
+<a id="english"></a>

-<img width="396" height="306" alt="Image" src="https://github.com/user-attachments/assets/fd8db148-c782-4f4d-b874-8f1b2a7ec7d6" />
+## English

-由于公共中继服务器带宽较小，连接的清晰度流畅度可能会下降，建议自建服务器。 [Issue #8](https://github.com/kunkundi/crossdesk/issues/8)
+[Back to README](../README_EN.md)

-### Q2. Windows 无 CUDA 环境下编译
-**A:**  
-运行下面的命令安装 CUDA 编译环境。
-```
-xmake require -vy "cuda 12.6.3"
-```
-安装完成后执行
-```
-xmake require --info "cuda 12.6.3"
-```
-输出如下
+| Symptom | What to check |
+| --- | --- |
+| Server disconnected / TLS error | Network access, signaling endpoint, certificate dates, hostname, and system trust. See [self-hosting](SELF_HOSTING_EN.md). |
+| Remote device offline | Keep the host running, connect both sides to the same signaling server, and copy its current ID again. |
+| P2P connection failed | Enable TURN relay in Settings and reconnect. For self-hosting, check Coturn and relay/media firewall ports. Review [release compatibility notes](https://github.com/kunkundi/crossdesk/releases). |
+| Black screen / no input on macOS | Grant Screen Recording and Accessibility, then reopen the app. A changed app path or signature may require fresh permission grants. |
+| No capture on Linux Wayland | Check the Wayland build option, host PipeWire 0.3, and desktop portal permission. Compare with an X11 session. See [Linux build instructions](BUILD_EN.md#linux). |
+| Cannot control a Windows lock screen | Install/start CrossDesk Service and keep the host client running. See [service commands](../README_EN.md#windows-service). |
+| Saved password no longer works | Use 6 ASCII letters or digits when changing the password, with the host connected to the server. Wait for the change and reconnection to complete, then copy the current password and enter it on the controller. |
+| Cannot find received files | Check Settings → File Save Path on desktop. Native iOS stores them in `Documents/Received` and provides a share action. |
+| Main window closed but app still running | Closing hides the window. Use the tray/menu-bar exit command to quit. |
+| Windows build without CUDA | Build with `--USE_CUDA=false`, or follow the [CUDA build instructions](BUILD_EN.md). Use `$env:CUDA_PATH` in PowerShell. |
+| iOS artifact cannot be installed directly | CI exports an unsigned app. Sign it yourself or build and run from Xcode on a physical device. See [iOS requirements](../apps/ios/README.md). |

-<img width="860" height="226" alt="Image" src="https://github.com/user-attachments/assets/999ac365-581a-4b9a-806e-05eb3e4cf44d" />
-
-根据上述输出获取到 CUDA 的安装目录，即 installdir 指向的位置。将 CUDA_PATH 加入系统环境变量，或在终端中输入 set CUDA_PATH=path_to_cuda_installdir，重新执行 xmake b -vy crossdesk 即可。
-[Issue #6](https://github.com/kunkundi/crossdesk/issues/6)
-
---
+If the issue persists, [open an issue](https://github.com/kunkundi/crossdesk/issues) with both OS versions, client versions, connection mode, and reproduction steps. Remove passwords and private device information from logs or screenshots before sharing them.
@@ -0,0 +1,99 @@
+# 自托管服务器
+
+[返回 README](../README.md) · [English](SELF_HOSTING_EN.md)
+
+CrossDesk 的信令服务与 TURN 中继由独立的 [CrossDesk Server](https://github.com/kunkundi/crossdesk-server) 项目维护。本页说明部署入口与当前客户端的配置方法；服务端文件请使用同一 Release 中的配套版本。
+
+## 1. 部署服务端
+
+以下步骤面向已安装 Docker Engine 和 Compose 插件的 Linux 服务器；先确认 `docker compose version` 可用。当前 Compose 使用主机网络，分别运行信令服务和 Coturn。
+
+按 [服务端部署文档](https://github.com/kunkundi/crossdesk-server#运行服务)，从其 [Releases](https://github.com/kunkundi/crossdesk-server/releases) 下载 `compose.yaml` 和 `env.example`，放到同一目录。在该目录执行：
+
+```bash
+cp env.example .env
+```
+
+用文本编辑器修改 `.env`，至少核对以下内容，填写完成后再启动。完整参数以配套的环境文件为准，也可参考服务端仓库的 [环境变量示例](https://github.com/kunkundi/crossdesk-server/blob/admin-dashboard/.env.example)。
+
+| 配置 | 填写内容 |
+| --- | --- |
+| `CROSSDESK_IMAGE` | 与下载的配置匹配的固定发布 tag |
+| `EXTERNAL_IP` / `INTERNAL_IP` | 服务器真实公网 / 内网 IP；不要直接使用示例地址 |
+| `CROSSDESK_SERVER_PORT` | 信令端口，例如 `9099` |
+| `COTURN_PORT` | 中继端口，例如 `3478` |
+| `MIN_PORT` / `MAX_PORT` | TURN 媒体端口范围 |
+| `COTURN_AUTH_SECRET` | 信令服务与 Coturn 的共享密钥；不填入客户端 |
+| `COTURN_STATELESS_NONCE_SECRET` | 独立生成、持久保存的 nonce 密钥 |
+| `CROSSDESK_DATA_DIR` / `CROSSDESK_LOG_DIR` | 数据、证书和日志的持久化位置 |
+
+两个密钥分别用 `openssl rand -hex 32` 生成。防火墙及云安全组需允许信令端口 TCP、中继端口 TCP/UDP，以及所选媒体端口范围 UDP。容器挂载和网络配置见 [官方 Compose 文件](https://github.com/kunkundi/crossdesk-server/blob/admin-dashboard/compose.yaml)。
+
+保存配置后，校验并启动：
+
+```bash
+sudo docker compose config -q
+sudo docker compose pull
+sudo docker compose up -d
+sudo docker compose ps
+```
+
+## 2. 配置桌面客户端
+
+使用自签证书时，先按 [证书信任步骤](#3-配置信任证书) 在两端导入根证书，再检查连接状态。
+
+1. 断开现有会话，点击主窗口右上角 **☰ → 设置**。
+2. 在设置列表中向下滚动，点击 **自托管配置**。
+3. 填写 **服务器地址**、**信令服务端口**、**中继服务端口**，点击“确认”。地址只填主机名或 IP，不加 `https://`、路径或端口。
+4. 回到设置窗口，勾选 **自托管配置** 右侧复选框，再点击“确认”保存。
+5. 在控制端和被控端执行相同配置。等待两端都显示“已连接服务器”，再使用被控端当前显示的 ID 发起连接。
+
+<p align="center">
+  <img src="images/desktop-self-hosted-zh.png" width="720" alt="当前 Slint 客户端自托管设置：服务器地址、信令端口、中继端口" />
+</p>
+
+切换服务器后请重新核对本机 ID；设备身份与服务端相关，旧服务上的 ID 不应直接套用。
+
+## 3. 配置信任证书
+
+客户端通过 TLS 连接信令服务。证书必须覆盖填写的域名 / IP，且被客户端系统信任。使用受信任 CA 签发的证书时按服务端说明配置证书链；使用自签证书时，需要信任自己部署的根证书。
+
+默认的 [证书生成脚本](https://github.com/kunkundi/crossdesk-server/blob/admin-dashboard/docker/generate_certs.sh) 只将 `EXTERNAL_IP` 写入证书的地址范围；使用这份证书时，客户端应填写该 IP。改用域名需要配置包含该域名的证书。已有证书存在时，[启动脚本](https://github.com/kunkundi/crossdesk-server/blob/admin-dashboard/docker/start.sh) 会复用它们，修改 `.env` 中的 IP 不会自动更新证书。
+
+默认证书文件位于服务端数据目录下的 `certs/`。将自己服务器的 `api.crossdesk.cn_root.crt` 下载到客户端机器，再执行对应平台命令；不要导入来源不明的根证书。
+
+**Windows（管理员 PowerShell）：**
+
+```powershell
+certutil -addstore "Root" "C:\path\to\api.crossdesk.cn_root.crt"
+```
+
+**Ubuntu / Debian：**
+
+```bash
+sudo cp /path/to/api.crossdesk.cn_root.crt /usr/local/share/ca-certificates/
+sudo update-ca-certificates
+```
+
+**macOS：**
+
+```bash
+sudo security add-trusted-cert -d -r trustRoot \
+  -k /Library/Keychains/System.keychain /path/to/api.crossdesk.cn_root.crt
+```
+
+完成后重新打开客户端。自签证书并不等于没有加密，但根证书信任和主机名校验必须正确配置。
+
+## 4. Web 与 iOS
+
+- **Web：** 按 [Web 客户端项目](https://github.com/kunkundi/crossdesk-web-client) 配置自己的信令连接。浏览器必须信任该服务的证书；不要通过关闭 TLS 校验解决证书错误。
+- **iOS：** 在“设置 → 服务器”填写信令服务器、信令端口与 STUN/TURN 端口，然后点击“应用”。自签证书需要在设备上安装对应根证书并启用信任。
+
+## 排查顺序
+
+- **未连接服务器 / TLS 错误：** 先检查地址、信令端口、证书有效期、证书主机名及根证书信任。
+- **已连服务器但设备离线：** 确认两端连接同一服务、被控端仍在运行，并重新复制当前 ID。
+- **P2P 连接失败：** 检查“启用中继服务”、Coturn 状态、TURN 端口和媒体端口范围，并核对客户端与服务端版本兼容性。
+- **配置修改未生效：** 在配置目录重新执行 `sudo docker compose up -d`；单纯重启容器不会应用修改过的环境变量。
+
+日志、备份和迁移操作请参考 [服务端维护说明](https://github.com/kunkundi/crossdesk-server)。
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dijunkun	5b60695a52	[fix] restore Linux Dock icons in packaged builds	2026-09-08 15:03:32 +08:00
dijunkun	0002bcea74	[fix] hide macOS Dock icon when closing to the tray	2026-09-08 00:22:08 +08:00
dijunkun	58225de7ea	[release] prepare v1.5.0 release notes and iOS version	2026-09-07 23:24:53 +08:00
dijunkun	5f37d0e753	[docs] update MiniRTC submodule documentation	2026-09-07 23:13:49 +08:00
dijunkun	b518ea82e2	[docs] refresh README screenshots and platform guides	2026-09-07 22:53:30 +08:00
dijunkun	abc8f907f3	[fix] restore iOS video after returning to the foreground	2026-09-07 21:31:08 +08:00
dijunkun	d498d3f0ef	[feat] show video resolution in the iOS floating status bar	2026-09-07 21:17:54 +08:00
dijunkun	55806d9e82	[fix] allow iOS relative mouse control outside the video area	2026-09-07 21:14:53 +08:00
dijunkun	2d3f1bb475	[fix] prevent iOS relative cursor jumps after movement	2026-09-07 21:11:27 +08:00
dijunkun	5d97d5a393	[fix] keep iOS floating controls clear of the Dynamic Island	2026-09-07 21:04:14 +08:00
dijunkun	19218a57f9	[fix] prevent stale device online status on iOS	2026-09-07 20:57:30 +08:00
dijunkun	af729144fe	[fix] prevent stale device online status	2026-09-07 20:02:19 +08:00
dijunkun	d381cbaa9b	[fix] show system tray icon on application startup	2026-09-07 17:42:25 +08:00
dijunkun	5aedb09c55	[feat] enable CUDA/OpenGL video rendering on Linux	2026-09-07 17:31:48 +08:00
dijunkun	fe1178e26f	[fix] move connection cleanup off the UI thread	2026-09-07 10:54:18 +08:00
dijunkun	e0cd761bdc	[fix] restore Windows lock-screen control and improve capture performance, fixes #98	2026-09-07 05:29:42 +08:00
dijunkun	2000654792	[fix] prevent Windows startup crashes from OpenGL failures, fixes #97	2026-09-07 04:20:54 +08:00
dijunkun	19800ef350	[fix] update MiniRTC iOS UPnP dependencies	2026-09-07 02:57:40 +08:00
dijunkun	d10b65cc19	[fix] update MiniRTC relay to P2P upgrades	2026-09-07 02:30:26 +08:00
dijunkun	3a0179968c	[fix] update MiniRTC ICE connectivity	2026-09-07 02:04:34 +08:00
dijunkun	55f389b834	[fix] update MiniRTC recovery tuning	2026-09-04 18:45:57 +08:00
dijunkun	8a58166c59	[fix] update MiniRtc video recovery timing	2026-09-04 17:35:14 +08:00
dijunkun	aa2ee8ce7f	[fix] update MiniRtc video recovery handling	2026-09-04 17:07:39 +08:00
dijunkun	b150d46501	[fix] align MiniRtc media interfaces and timestamps	2026-09-04 15:45:26 +08:00
dijunkun	010064d5b7	[feat] optimize Windows native video encoding	2026-09-04 02:23:16 +08:00
dijunkun	db3b26efe7	[feat] optimize macOS native video encoding	2026-09-04 02:06:44 +08:00
dijunkun	cd1b53ee65	[chore] standardize source file headers	2026-09-04 02:06:36 +08:00
dijunkun	b031a3953e	[feat] optimize macOS native video rendering	2026-09-04 01:28:13 +08:00
dijunkun	3f537ae63c	[feat] optimize Windows native video rendering	2026-09-03 18:01:09 +08:00