terminal works basically. (#12189)

* terminal works basically. todo: - persistent - sessions restore - web - mobile * missed terminal persistent option change * android sdk 34 -> 35 * +#![cfg_attr(lt_1_77, feature(c_str_literals))] * fixing ci * fix ci * fix ci for android * try "Fix Android SDK Platform 35" * fix android 34 * revert flutter_plugin_android_lifecycle to 2.0.17 which used in rustdesk 1.4.0 * refactor, but break something of desktop terminal (new tab showing loading) * fix connecting...
2026-03-27 23:21:06 +03:00 · 2025-07-01 13:12:55 +08:00
parent ee5cdc3155
commit 5faf0ad3cf
130 changed files with 4064 additions and 4247 deletions
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -30,6 +30,7 @@ import 'common/widgets/overlay.dart';
 import 'mobile/pages/file_manager_page.dart';
 import 'mobile/pages/remote_page.dart';
 import 'mobile/pages/view_camera_page.dart';
+import 'mobile/pages/terminal_page.dart';
 import 'desktop/pages/remote_page.dart' as desktop_remote;
 import 'desktop/pages/file_manager_page.dart' as desktop_file_manager;
 import 'desktop/pages/view_camera_page.dart' as desktop_view_camera;
@@ -99,6 +100,7 @@ enum DesktopType {
  remote,
  fileTransfer,
  viewCamera,
+  terminal,
  cm,
  portForward,
 }
@@ -1571,7 +1573,9 @@ bool option2bool(String option, String value) {

 String bool2option(String option, bool b) {
  String res;
-  if (option.startsWith('enable-') && option != kOptionEnableUdpPunch && option != kOptionEnableIpv6Punch) {
+  if (option.startsWith('enable-') &&
+      option != kOptionEnableUdpPunch &&
+      option != kOptionEnableIpv6Punch) {
    res = b ? defaultOptionYes : 'N';
  } else if (option.startsWith('allow-') ||
      option == kOptionStopService ||
@@ -2117,6 +2121,7 @@ enum UriLinkType {
  viewCamera,
  portForward,
  rdp,
+  terminal,
 }

 // uri link handler
@@ -2181,6 +2186,11 @@ bool handleUriLink({List<String>? cmdArgs, Uri? uri, String? uriString}) {
        id = args[i + 1];
        i++;
        break;
+      case '--terminal':
+        type = UriLinkType.terminal;
+        id = args[i + 1];
+        i++;
+        break;
      case '--password':
        password = args[i + 1];
        i++;
@@ -2230,6 +2240,12 @@ bool handleUriLink({List<String>? cmdArgs, Uri? uri, String? uriString}) {
              password: password, forceRelay: forceRelay);
        });
        break;
+      case UriLinkType.terminal:
+        Future.delayed(Duration.zero, () {
+          rustDeskWinManager.newTerminal(id!,
+              password: password, forceRelay: forceRelay);
+        });
+        break;
    }

    return true;
@@ -2247,7 +2263,8 @@ List<String>? urlLinkToCmdArgs(Uri uri) {
    "file-transfer",
    "view-camera",
    "port-forward",
-    "rdp"
+    "rdp",
+    "terminal"
  ];
  if (uri.authority.isEmpty &&
      uri.path.split('').every((char) => char == '/')) {
@@ -2276,21 +2293,10 @@ List<String>? urlLinkToCmdArgs(Uri uri) {
      }
    }
  } else if (options.contains(uri.authority)) {
-    final optionIndex = options.indexOf(uri.authority);
    command = '--${uri.authority}';
    if (uri.path.length > 1) {
      id = uri.path.substring(1);
    }
-    if (isMobile && id != null) {
-      if (optionIndex == 0 || optionIndex == 1) {
-        connect(Get.context!, id);
-      } else if (optionIndex == 2) {
-        connect(Get.context!, id, isFileTransfer: true);
-      } else if (optionIndex == 3) {
-        connect(Get.context!, id, isViewCamera: true);
-      }
-      return null;
-    }
  } else if (uri.authority.length > 2 &&
      (uri.path.length <= 1 ||
          (uri.path == '/r' || uri.path.startsWith('/r@')))) {
@@ -2314,13 +2320,25 @@ List<String>? urlLinkToCmdArgs(Uri uri) {
    }
  }

-  if (isMobile) {
-    if (id != null) {
-      final forceRelay = queryParameters["relay"] != null;
+  if (isMobile && id != null) {
+    final forceRelay = queryParameters["relay"] != null;
+    final password = queryParameters["password"];
+
+    // Determine connection type based on command
+    if (command == '--file-transfer') {
      connect(Get.context!, id,
-          forceRelay: forceRelay, password: queryParameters["password"]);
-      return null;
+          isFileTransfer: true, forceRelay: forceRelay, password: password);
+    } else if (command == '--view-camera') {
+      connect(Get.context!, id,
+          isViewCamera: true, forceRelay: forceRelay, password: password);
+    } else if (command == '--terminal') {
+      connect(Get.context!, id,
+          isTerminal: true, forceRelay: forceRelay, password: password);
+    } else {
+      // Default to remote desktop for '--connect', '--play', or direct connection
+      connect(Get.context!, id, forceRelay: forceRelay, password: password);
    }
+    return null;
  }

  List<String> args = List.empty(growable: true);
@@ -2342,6 +2360,7 @@ List<String>? urlLinkToCmdArgs(Uri uri) {
 connectMainDesktop(String id,
    {required bool isFileTransfer,
    required bool isViewCamera,
+    required bool isTerminal,
    required bool isTcpTunneling,
    required bool isRDP,
    bool? forceRelay,
@@ -2366,6 +2385,12 @@ connectMainDesktop(String id,
        isSharedPassword: isSharedPassword,
        connToken: connToken,
        forceRelay: forceRelay);
+  } else if (isTerminal) {
+    await rustDeskWinManager.newTerminal(id,
+        password: password,
+        isSharedPassword: isSharedPassword,
+        connToken: connToken,
+        forceRelay: forceRelay);
  } else {
    await rustDeskWinManager.newRemoteDesktop(id,
        password: password,
@@ -2382,6 +2407,7 @@ connectMainDesktop(String id,
 connect(BuildContext context, String id,
    {bool isFileTransfer = false,
    bool isViewCamera = false,
+    bool isTerminal = false,
    bool isTcpTunneling = false,
    bool isRDP = false,
    bool forceRelay = false,
@@ -2404,7 +2430,7 @@ connect(BuildContext context, String id,
  id = id.replaceAll(' ', '');
  final oldId = id;
  id = await bind.mainHandleRelayId(id: id);
-  final forceRelay2 = id != oldId || forceRelay;
+  forceRelay = id != oldId || forceRelay;
  assert(!(isFileTransfer && isTcpTunneling && isRDP),
      "more than one connect type");

@@ -2414,17 +2440,19 @@ connect(BuildContext context, String id,
        id,
        isFileTransfer: isFileTransfer,
        isViewCamera: isViewCamera,
+        isTerminal: isTerminal,
        isTcpTunneling: isTcpTunneling,
        isRDP: isRDP,
        password: password,
        isSharedPassword: isSharedPassword,
-        forceRelay: forceRelay2,
+        forceRelay: forceRelay,
      );
    } else {
      await rustDeskWinManager.call(WindowType.Main, kWindowConnect, {
        'id': id,
        'isFileTransfer': isFileTransfer,
        'isViewCamera': isViewCamera,
+        'isTerminal': isTerminal,
        'isTcpTunneling': isTcpTunneling,
        'isRDP': isRDP,
        'password': password,
@@ -2458,7 +2486,10 @@ connect(BuildContext context, String id,
          context,
          MaterialPageRoute(
            builder: (BuildContext context) => FileManagerPage(
-                id: id, password: password, isSharedPassword: isSharedPassword),
+                id: id,
+                password: password,
+                isSharedPassword: isSharedPassword,
+                forceRelay: forceRelay),
          ),
        );
      }
@@ -2473,7 +2504,6 @@ connect(BuildContext context, String id,
              id: id,
              toolbarState: ToolbarState(),
              password: password,
-              forceRelay: forceRelay,
              isSharedPassword: isSharedPassword,
            ),
          ),
@@ -2483,10 +2513,25 @@ connect(BuildContext context, String id,
          context,
          MaterialPageRoute(
            builder: (BuildContext context) => ViewCameraPage(
-                id: id, password: password, isSharedPassword: isSharedPassword),
+                id: id,
+                password: password,
+                isSharedPassword: isSharedPassword,
+                forceRelay: forceRelay),
          ),
        );
      }
+    } else if (isTerminal) {
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (BuildContext context) => TerminalPage(
+            id: id,
+            password: password,
+            isSharedPassword: isSharedPassword,
+            forceRelay: forceRelay,
+          ),
+        ),
+      );
    } else {
      if (isWeb) {
        Navigator.push(
@@ -2497,7 +2542,6 @@ connect(BuildContext context, String id,
              id: id,
              toolbarState: ToolbarState(),
              password: password,
-              forceRelay: forceRelay,
              isSharedPassword: isSharedPassword,
            ),
          ),
@@ -2507,7 +2551,10 @@ connect(BuildContext context, String id,
          context,
          MaterialPageRoute(
            builder: (BuildContext context) => RemotePage(
-                id: id, password: password, isSharedPassword: isSharedPassword),
+                id: id,
+                password: password,
+                isSharedPassword: isSharedPassword,
+                forceRelay: forceRelay),
          ),
        );
      }
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@@ -491,6 +491,7 @@ abstract class BasePeerCard extends StatelessWidget {
    bool isViewCamera = false,
    bool isTcpTunneling = false,
    bool isRDP = false,
+    bool isTerminal = false,
  }) {
    return MenuEntryButton<String>(
      childBuilder: (TextStyle? style) => Text(
@@ -506,6 +507,7 @@ abstract class BasePeerCard extends StatelessWidget {
          isViewCamera: isViewCamera,
          isTcpTunneling: isTcpTunneling,
          isRDP: isRDP,
+          isTerminal: isTerminal,
        );
      },
      padding: menuPadding,
@@ -541,6 +543,15 @@ abstract class BasePeerCard extends StatelessWidget {
    );
  }

+  @protected
+  MenuEntryBase<String> _terminalAction(BuildContext context) {
+    return _connectCommonAction(
+      context,
+      translate('Terminal'),
+      isTerminal: true,
+    );
+  }
+
  @protected
  MenuEntryBase<String> _tcpTunnelingAction(BuildContext context) {
    return _connectCommonAction(
@@ -892,6 +903,7 @@ class RecentPeerCard extends BasePeerCard {
      _connectAction(context),
      _transferFileAction(context),
      _viewCameraAction(context),
+      _terminalAction(context),
    ];

    final List favs = (await bind.mainGetFav()).toList();
@@ -952,6 +964,7 @@ class FavoritePeerCard extends BasePeerCard {
      _connectAction(context),
      _transferFileAction(context),
      _viewCameraAction(context),
+      _terminalAction(context),
    ];
    if (isDesktop && peer.platform != kPeerPlatformAndroid) {
      menuItems.add(_tcpTunnelingAction(context));
@@ -1006,6 +1019,7 @@ class DiscoveredPeerCard extends BasePeerCard {
      _connectAction(context),
      _transferFileAction(context),
      _viewCameraAction(context),
+      _terminalAction(context),
    ];

    final List favs = (await bind.mainGetFav()).toList();
@@ -1060,6 +1074,7 @@ class AddressBookPeerCard extends BasePeerCard {
      _connectAction(context),
      _transferFileAction(context),
      _viewCameraAction(context),
+      _terminalAction(context),
    ];
    if (isDesktop && peer.platform != kPeerPlatformAndroid) {
      menuItems.add(_tcpTunnelingAction(context));
@@ -1195,6 +1210,7 @@ class MyGroupPeerCard extends BasePeerCard {
      _connectAction(context),
      _transferFileAction(context),
      _viewCameraAction(context),
+      _terminalAction(context),
    ];
    if (isDesktop && peer.platform != kPeerPlatformAndroid) {
      menuItems.add(_tcpTunnelingAction(context));
@@ -1420,7 +1436,8 @@ void connectInPeerTab(BuildContext context, Peer peer, PeerTabIndex tab,
    {bool isFileTransfer = false,
    bool isViewCamera = false,
    bool isTcpTunneling = false,
-    bool isRDP = false}) async {
+    bool isRDP = false,
+    bool isTerminal = false}) async {
  var password = '';
  bool isSharedPassword = false;
  if (tab == PeerTabIndex.ab) {
@@ -1444,6 +1461,7 @@ void connectInPeerTab(BuildContext context, Peer peer, PeerTabIndex tab,
      password: password,
      isSharedPassword: isSharedPassword,
      isFileTransfer: isFileTransfer,
+      isTerminal: isTerminal,
      isViewCamera: isViewCamera,
      isTcpTunneling: isTcpTunneling,
      isRDP: isRDP);
--- a/flutter/lib/common/widgets/setting_widgets.dart
+++ b/flutter/lib/common/widgets/setting_widgets.dart
@@ -243,7 +243,8 @@ List<(String, String)> otherDefaultSettings() {
      (
        'Use all my displays for the remote session',
        kKeyUseAllMyDisplaysForTheRemoteSession
-      )
+      ),
+    ('Keep terminal sessions on disconnect', kOptionTerminalPersistent),
  ];

  return v;
--- a/flutter/lib/common/widgets/toolbar.dart
+++ b/flutter/lib/common/widgets/toolbar.dart
@@ -154,36 +154,38 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
        onPressed: () => ffi.cursorModel.reset()));
  }

+  // https://github.com/rustdesk/rustdesk/pull/9731
+  // Does not work for connection established by "accept".
  connectWithToken(
      {bool isFileTransfer = false,
      bool isViewCamera = false,
-      bool isTcpTunneling = false}) {
+      bool isTcpTunneling = false,
+      bool isTerminal = false}) {
    final connToken = bind.sessionGetConnToken(sessionId: ffi.sessionId);
    connect(context, id,
        isFileTransfer: isFileTransfer,
        isViewCamera: isViewCamera,
+        isTerminal: isTerminal,
        isTcpTunneling: isTcpTunneling,
        connToken: connToken);
  }

-  // transferFile
  if (isDefaultConn && isDesktop) {
    v.add(
      TTextMenu(
          child: Text(translate('Transfer file')),
          onPressed: () => connectWithToken(isFileTransfer: true)),
    );
-  }
-  // viewCamera
-  if (isDefaultConn && isDesktop) {
    v.add(
      TTextMenu(
          child: Text(translate('View camera')),
          onPressed: () => connectWithToken(isViewCamera: true)),
    );
-  }
-  // tcpTunneling
-  if (isDefaultConn && isDesktop) {
+    v.add(
+      TTextMenu(
+          child: Text(translate('Terminal')),
+          onPressed: () => connectWithToken(isTerminal: true)),
+    );
    v.add(
      TTextMenu(
          child: Text(translate('TCP tunneling')),
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -27,7 +27,6 @@ const String kPlatformAdditionsAmyuniVirtualDisplays =
 const String kPlatformAdditionsHasFileClipboard = "has_file_clipboard";
 const String kPlatformAdditionsSupportedPrivacyModeImpl =
    "supported_privacy_mode_impl";
-const String kPlatformAdditionsSupportViewCamera = "support_view_camera";

 const String kPeerPlatformWindows = "Windows";
 const String kPeerPlatformLinux = "Linux";
@@ -47,6 +46,7 @@ const String kAppTypeDesktopRemote = "remote";
 const String kAppTypeDesktopFileTransfer = "file transfer";
 const String kAppTypeDesktopViewCamera = "view camera";
 const String kAppTypeDesktopPortForward = "port forward";
+const String kAppTypeDesktopTerminal = "terminal";

 const String kWindowMainWindowOnTop = "main_window_on_top";
 const String kWindowGetWindowInfo = "get_window_info";
@@ -62,6 +62,7 @@ const String kWindowEventNewRemoteDesktop = "new_remote_desktop";
 const String kWindowEventNewFileTransfer = "new_file_transfer";
 const String kWindowEventNewViewCamera = "new_view_camera";
 const String kWindowEventNewPortForward = "new_port_forward";
+const String kWindowEventNewTerminal = "new_terminal";
 const String kWindowEventActiveSession = "active_session";
 const String kWindowEventActiveDisplaySession = "active_display_session";
 const String kWindowEventGetRemoteList = "get_remote_list";
@@ -103,6 +104,8 @@ const String kOptionEnableClipboard = "enable-clipboard";
 const String kOptionEnableFileTransfer = "enable-file-transfer";
 const String kOptionEnableAudio = "enable-audio";
 const String kOptionEnableCamera = "enable-camera";
+const String kOptionEnableTerminal = "enable-terminal";
+const String kOptionTerminalPersistent = "terminal-persistent";
 const String kOptionEnableTunnel = "enable-tunnel";
 const String kOptionEnableRemoteRestart = "enable-remote-restart";
 const String kOptionEnableBlockInput = "enable-block-input";
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@@ -327,10 +327,15 @@ class _ConnectionPageState extends State<ConnectionPage>

  /// Callback for the connect button.
  /// Connects to the selected peer.
-  void onConnect({bool isFileTransfer = false, bool isViewCamera = false}) {
+  void onConnect(
+      {bool isFileTransfer = false,
+      bool isViewCamera = false,
+      bool isTerminal = false}) {
    var id = _idController.id;
    connect(context, id,
-        isFileTransfer: isFileTransfer, isViewCamera: isViewCamera);
+        isFileTransfer: isFileTransfer,
+        isViewCamera: isViewCamera,
+        isTerminal: isTerminal);
  }

  /// UI for the remote ID TextField.
@@ -527,22 +532,23 @@ class _ConnectionPageState extends State<ConnectionPage>
                    borderRadius: BorderRadius.circular(8),
                  ),
                  child: Center(
-                    child: Obx(() {
-                      var offset = Offset(0, 0);
-                      return InkWell(
-                        child: _menuOpen.value
-                            ? Transform.rotate(
-                                angle: pi,
-                                child: Icon(IconFont.more, size: 14),
-                              )
-                            : Icon(IconFont.more, size: 14),
-                        onTapDown: (e) {
-                          offset = e.globalPosition;
-                        },
-                        onTap: () async {
-                          _menuOpen.value = true;
-                          final x = offset.dx;
-                          final y = offset.dy;
+                    child: StatefulBuilder(
+                      builder: (context, setState) {
+                        var offset = Offset(0, 0);
+                        return Obx(() => InkWell(
+                          child: _menuOpen.value
+                              ? Transform.rotate(
+                                  angle: pi,
+                                  child: Icon(IconFont.more, size: 14),
+                                )
+                              : Icon(IconFont.more, size: 14),
+                          onTapDown: (e) {
+                            offset = e.globalPosition;
+                          },
+                          onTap: () async {
+                            _menuOpen.value = true;
+                            final x = offset.dx;
+                            final y = offset.dy;
                          await mod_menu
                              .showMenu(
                            context: context,
@@ -556,6 +562,10 @@ class _ConnectionPageState extends State<ConnectionPage>
                                'View camera',
                                () => onConnect(isViewCamera: true)
                              ),
+                              (
+                                'Terminal',
+                                () => onConnect(isTerminal: true)
+                              ),
                            ]
                                .map((e) => MenuEntryButton<String>(
                                      childBuilder: (TextStyle? style) => Text(
@@ -583,8 +593,9 @@ class _ConnectionPageState extends State<ConnectionPage>
                            _menuOpen.value = false;
                          });
                        },
-                      );
-                    }),
+                        ));
+                      },
+                    ),
                  ),
                ),
              ]),
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -786,6 +786,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
          call.arguments['id'],
          isFileTransfer: call.arguments['isFileTransfer'],
          isViewCamera: call.arguments['isViewCamera'],
+          isTerminal: call.arguments['isTerminal'],
          isTcpTunneling: call.arguments['isTcpTunneling'],
          isRDP: call.arguments['isRDP'],
          password: call.arguments['password'],
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -1011,6 +1011,8 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
                enabled: enabled, fakeValue: fakeValue),
            _OptionCheckBox(context, 'Enable camera', kOptionEnableCamera,
                enabled: enabled, fakeValue: fakeValue),
+            _OptionCheckBox(context, 'Enable terminal', kOptionEnableTerminal,
+                enabled: enabled, fakeValue: fakeValue),
            _OptionCheckBox(
                context, 'Enable TCP tunneling', kOptionEnableTunnel,
                enabled: enabled, fakeValue: fakeValue),
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -355,6 +355,7 @@ Widget buildConnectionCard(Client client) {
        _CmHeader(client: client),
        client.type_() == ClientType.file ||
                client.type_() == ClientType.portForward ||
+                client.type_() == ClientType.terminal ||
                client.disconnected
            ? Offstage()
            : _PrivilegeBoard(client: client),
@@ -499,7 +500,36 @@ class _CmHeaderState extends State<_CmHeader>
                    "(${client.peerId})",
                    style: TextStyle(color: Colors.white, fontSize: 14),
                  ),
-                ).marginOnly(bottom: 10.0),
+                ),
+                if (client.type_() == ClientType.terminal)
+                  FittedBox(
+                    child: Text(
+                      translate("Terminal"),
+                      style: TextStyle(color: Colors.white70, fontSize: 12),
+                    ),
+                  ),
+                if (client.type_() == ClientType.file)
+                  FittedBox(
+                    child: Text(
+                      translate("File Transfer"),
+                      style: TextStyle(color: Colors.white70, fontSize: 12),
+                    ),
+                  ),
+                if (client.type_() == ClientType.camera)
+                  FittedBox(
+                    child: Text(
+                      translate("View Camera"),
+                      style: TextStyle(color: Colors.white70, fontSize: 12),
+                    ),
+                  ),
+                if (client.portForward.isNotEmpty)
+                  FittedBox(
+                    child: Text(
+                      "Port Forward: ${client.portForward}",
+                      style: TextStyle(color: Colors.white70, fontSize: 12),
+                    ),
+                  ),
+                SizedBox(height: 10.0),
                FittedBox(
                    child: Row(
                  children: [
--- a/flutter/lib/desktop/pages/terminal_connection_manager.dart
+++ b/flutter/lib/desktop/pages/terminal_connection_manager.dart
@@ -0,0 +1,98 @@
+import 'package:flutter/foundation.dart';
+import 'package:get/get.dart';
+import '../../models/model.dart';
+
+/// Manages terminal connections to ensure one FFI instance per peer
+class TerminalConnectionManager {
+  static final Map<String, FFI> _connections = {};
+  static final Map<String, int> _connectionRefCount = {};
+  
+  // Track service IDs per peer
+  static final Map<String, String> _serviceIds = {};
+
+  /// Get or create an FFI instance for a peer
+  static FFI getConnection({
+    required String peerId,
+    required String? password,
+    required bool? isSharedPassword,
+    required bool? forceRelay,
+    required String? connToken,
+  }) {
+    final existingFfi = _connections[peerId];
+    if (existingFfi != null && !existingFfi.closed) {
+      // Increment reference count
+      _connectionRefCount[peerId] = (_connectionRefCount[peerId] ?? 0) + 1;
+      debugPrint('[TerminalConnectionManager] Reusing existing connection for peer $peerId. Reference count: ${_connectionRefCount[peerId]}');
+      return existingFfi;
+    }
+
+    // Create new FFI instance for first terminal
+    debugPrint('[TerminalConnectionManager] Creating new terminal connection for peer $peerId');
+    final ffi = FFI(null);
+    ffi.start(
+      peerId,
+      password: password,
+      isSharedPassword: isSharedPassword,
+      forceRelay: forceRelay,
+      connToken: connToken,
+      isTerminal: true,
+    );
+    
+    _connections[peerId] = ffi;
+    _connectionRefCount[peerId] = 1;
+    
+    // Register the FFI instance with Get for dependency injection
+    Get.put<FFI>(ffi, tag: 'terminal_$peerId');
+    
+    debugPrint('[TerminalConnectionManager] New connection created. Total connections: ${_connections.length}');
+    return ffi;
+  }
+
+  /// Release a connection reference
+  static void releaseConnection(String peerId) {
+    final refCount = _connectionRefCount[peerId] ?? 0;
+    debugPrint('[TerminalConnectionManager] Releasing connection for peer $peerId. Current ref count: $refCount');
+    
+    if (refCount <= 1) {
+      // Last reference, close the connection
+      final ffi = _connections[peerId];
+      if (ffi != null) {
+        debugPrint('[TerminalConnectionManager] Closing connection for peer $peerId (last reference)');
+        ffi.close();
+        _connections.remove(peerId);
+        _connectionRefCount.remove(peerId);
+        Get.delete<FFI>(tag: 'terminal_$peerId');
+      }
+    } else {
+      // Decrement reference count
+      _connectionRefCount[peerId] = refCount - 1;
+      debugPrint('[TerminalConnectionManager] Connection still in use. New ref count: ${_connectionRefCount[peerId]}');
+    }
+  }
+
+  /// Check if a connection exists for a peer
+  static bool hasConnection(String peerId) {
+    final ffi = _connections[peerId];
+    return ffi != null && !ffi.closed;
+  }
+  
+  /// Get existing connection without creating new one
+  static FFI? getExistingConnection(String peerId) {
+    return _connections[peerId];
+  }
+
+  /// Get connection count for debugging
+  static int getConnectionCount() => _connections.length;
+  
+  /// Get terminal count for a peer
+  static int getTerminalCount(String peerId) => _connectionRefCount[peerId] ?? 0;
+  
+  /// Get service ID for a peer
+  static String? getServiceId(String peerId) => _serviceIds[peerId];
+  
+  /// Set service ID for a peer
+  static void setServiceId(String peerId, String serviceId) {
+    _serviceIds[peerId] = serviceId;
+    debugPrint('[TerminalConnectionManager] Service ID for $peerId: $serviceId');
+  }
+}
--- a/flutter/lib/desktop/pages/terminal_page.dart
+++ b/flutter/lib/desktop/pages/terminal_page.dart
@@ -0,0 +1,121 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
+import 'package:flutter_hbb/models/model.dart';
+import 'package:flutter_hbb/models/terminal_model.dart';
+import 'package:xterm/xterm.dart';
+import 'terminal_connection_manager.dart';
+
+class TerminalPage extends StatefulWidget {
+  const TerminalPage({
+    Key? key,
+    required this.id,
+    required this.password,
+    required this.tabController,
+    required this.isSharedPassword,
+    required this.terminalId,
+    this.forceRelay,
+    this.connToken,
+  }) : super(key: key);
+  final String id;
+  final String? password;
+  final DesktopTabController tabController;
+  final bool? forceRelay;
+  final bool? isSharedPassword;
+  final String? connToken;
+  final int terminalId;
+
+  @override
+  State<TerminalPage> createState() => _TerminalPageState();
+}
+
+class _TerminalPageState extends State<TerminalPage>
+    with AutomaticKeepAliveClientMixin {
+  late FFI _ffi;
+  late TerminalModel _terminalModel;
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Use shared FFI instance from connection manager
+    _ffi = TerminalConnectionManager.getConnection(
+      peerId: widget.id,
+      password: widget.password,
+      isSharedPassword: widget.isSharedPassword,
+      forceRelay: widget.forceRelay,
+      connToken: widget.connToken,
+    );
+
+    // Create terminal model with specific terminal ID
+    _terminalModel = TerminalModel(_ffi, widget.terminalId);
+    debugPrint(
+        '[TerminalPage] Terminal model created for terminal ${widget.terminalId}');
+
+    // Register this terminal model with FFI for event routing
+    _ffi.registerTerminalModel(widget.terminalId, _terminalModel);
+
+    // Initialize terminal connection
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      widget.tabController.onSelected?.call(widget.id);
+      
+      // Check if this is a new connection or additional terminal
+      // Note: When a connection exists, the ref count will be > 1 after this terminal is added
+      final isExistingConnection = TerminalConnectionManager.hasConnection(widget.id) && 
+          TerminalConnectionManager.getTerminalCount(widget.id) > 1;
+      
+      if (!isExistingConnection) {
+        // First terminal - show loading dialog, wait for onReady
+        _ffi.dialogManager
+            .showLoading(translate('Connecting...'), onCancel: closeConnection);
+      } else {
+        // Additional terminal - connection already established
+        // Open the terminal directly
+        _terminalModel.openTerminal();
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    // Unregister terminal model from FFI
+    _ffi.unregisterTerminalModel(widget.terminalId);
+    _terminalModel.dispose();
+    // Release connection reference instead of closing directly
+    TerminalConnectionManager.releaseConnection(widget.id);
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return Scaffold(
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+      body: TerminalView(
+        _terminalModel.terminal,
+        controller: _terminalModel.terminalController,
+        autofocus: true,
+        backgroundOpacity: 0.7,
+        padding: const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0),
+        onSecondaryTapDown: (details, offset) async {
+          final selection = _terminalModel.terminalController.selection;
+          if (selection != null) {
+            final text = _terminalModel.terminal.buffer.getText(selection);
+            _terminalModel.terminalController.clearSelection();
+            await Clipboard.setData(ClipboardData(text: text));
+          } else {
+            final data = await Clipboard.getData('text/plain');
+            final text = data?.text;
+            if (text != null) {
+              _terminalModel.terminal.paste(text);
+            }
+          }
+        },
+      ),
+    );
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+}
--- a/flutter/lib/desktop/pages/terminal_tab_page.dart
+++ b/flutter/lib/desktop/pages/terminal_tab_page.dart
@@ -0,0 +1,384 @@
+import 'dart:convert';
+
+import 'package:desktop_multi_window/desktop_multi_window.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/consts.dart';
+import 'package:flutter_hbb/models/state_model.dart';
+import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
+import 'package:flutter_hbb/utils/multi_window_manager.dart';
+import 'package:flutter_hbb/models/model.dart';
+import 'package:get/get.dart';
+
+import '../../models/platform_model.dart';
+import 'terminal_page.dart';
+import 'terminal_connection_manager.dart';
+import '../widgets/material_mod_popup_menu.dart' as mod_menu;
+import '../widgets/popup_menu.dart';
+import 'package:bot_toast/bot_toast.dart';
+
+class TerminalTabPage extends StatefulWidget {
+  final Map<String, dynamic> params;
+
+  const TerminalTabPage({Key? key, required this.params}) : super(key: key);
+
+  @override
+  State<TerminalTabPage> createState() => _TerminalTabPageState(params);
+}
+
+class _TerminalTabPageState extends State<TerminalTabPage> {
+  DesktopTabController get tabController => Get.find<DesktopTabController>();
+
+  static const IconData selectedIcon = Icons.terminal;
+  static const IconData unselectedIcon = Icons.terminal_outlined;
+  int _nextTerminalId = 1;
+
+  _TerminalTabPageState(Map<String, dynamic> params) {
+    Get.put(DesktopTabController(tabType: DesktopTabType.terminal));
+    tabController.onSelected = (id) {
+      WindowController.fromWindowId(windowId())
+          .setTitle(getWindowNameWithId(id));
+    };
+    tabController.onRemoved = (_, id) => onRemoveId(id);
+    final terminalId = params['terminalId'] ?? _nextTerminalId++;
+    tabController.add(_createTerminalTab(
+      peerId: params['id'],
+      terminalId: terminalId,
+      password: params['password'],
+      isSharedPassword: params['isSharedPassword'],
+      forceRelay: params['forceRelay'],
+      connToken: params['connToken'],
+    ));
+  }
+
+  TabInfo _createTerminalTab({
+    required String peerId,
+    required int terminalId,
+    String? password,
+    bool? isSharedPassword,
+    bool? forceRelay,
+    String? connToken,
+  }) {
+    final tabKey = '${peerId}_$terminalId';
+    return TabInfo(
+      key: tabKey,
+      label: '$peerId #$terminalId',
+      selectedIcon: selectedIcon,
+      unselectedIcon: unselectedIcon,
+      onTabCloseButton: () async {
+        // Close the terminal session first
+        final ffi = TerminalConnectionManager.getExistingConnection(peerId);
+        if (ffi != null) {
+          final terminalModel = ffi.terminalModels[terminalId];
+          if (terminalModel != null) {
+            await terminalModel.closeTerminal();
+          }
+        }
+        // Then close the tab
+        tabController.closeBy(tabKey);
+      },
+      page: TerminalPage(
+        key: ValueKey(tabKey),
+        id: peerId,
+        terminalId: terminalId,
+        password: password,
+        isSharedPassword: isSharedPassword,
+        tabController: tabController,
+        forceRelay: forceRelay,
+        connToken: connToken,
+      ),
+    );
+  }
+
+  Widget _tabMenuBuilder(String peerId, CancelFunc cancelFunc) {
+    final List<MenuEntryBase<String>> menu = [];
+    const EdgeInsets padding = EdgeInsets.only(left: 8.0, right: 5.0);
+
+    // New tab menu item
+    menu.add(MenuEntryButton<String>(
+      childBuilder: (TextStyle? style) => Text(
+        translate('New tab'),
+        style: style,
+      ),
+      proc: () {
+        _addNewTerminal(peerId);
+        cancelFunc();
+        // Also try to close any BotToast overlays
+        BotToast.cleanAll();
+      },
+      padding: padding,
+    ));
+
+    menu.add(MenuEntryDivider());
+
+    menu.add(MenuEntrySwitch<String>(
+      switchType: SwitchType.scheckbox,
+      text: translate('Keep terminal sessions on disconnect'),
+      getter: () async {
+        final ffi = Get.find<FFI>(tag: 'terminal_$peerId');
+        return bind.sessionGetToggleOptionSync(
+          sessionId: ffi.sessionId,
+          arg: kOptionTerminalPersistent,
+        );
+      },
+      setter: (bool v) async {
+        final ffi = Get.find<FFI>(tag: 'terminal_$peerId');
+        bind.sessionToggleOption(
+          sessionId: ffi.sessionId,
+          value: kOptionTerminalPersistent,
+        );
+      },
+      padding: padding,
+    ));
+
+    return mod_menu.PopupMenu<String>(
+      items: menu
+          .map((e) => e.build(
+                context,
+                const MenuConfig(
+                  commonColor: CustomPopupMenuTheme.commonColor,
+                  height: CustomPopupMenuTheme.height,
+                  dividerHeight: CustomPopupMenuTheme.dividerHeight,
+                ),
+              ))
+          .expand((i) => i)
+          .toList(),
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Add keyboard shortcut handler
+    HardwareKeyboard.instance.addHandler(_handleKeyEvent);
+
+    rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
+      print(
+          "[Remote Terminal] call ${call.method} with args ${call.arguments} from window $fromWindowId");
+      if (call.method == kWindowEventNewTerminal) {
+        final args = jsonDecode(call.arguments);
+        final id = args['id'];
+        windowOnTop(windowId());
+        // Allow multiple terminals for the same connection
+        final terminalId = args['terminalId'] ?? _nextTerminalId++;
+        tabController.add(_createTerminalTab(
+          peerId: id,
+          terminalId: terminalId,
+          password: args['password'],
+          isSharedPassword: args['isSharedPassword'],
+          forceRelay: args['forceRelay'],
+          connToken: args['connToken'],
+        ));
+      } else if (call.method == "onDestroy") {
+        tabController.clear();
+      } else if (call.method == kWindowActionRebuild) {
+        reloadCurrentWindow();
+      }
+    });
+    Future.delayed(Duration.zero, () {
+      restoreWindowPosition(WindowType.Terminal, windowId: windowId());
+    });
+  }
+
+  @override
+  void dispose() {
+    HardwareKeyboard.instance.removeHandler(_handleKeyEvent);
+    super.dispose();
+  }
+
+  bool _handleKeyEvent(KeyEvent event) {
+    if (event is KeyDownEvent) {
+      // Use Cmd+T on macOS, Ctrl+Shift+T on other platforms
+      if (event.logicalKey == LogicalKeyboardKey.keyT) {
+        if (isMacOS &&
+            HardwareKeyboard.instance.isMetaPressed &&
+            !HardwareKeyboard.instance.isShiftPressed) {
+          // macOS: Cmd+T (standard for new tab)
+          _addNewTerminalForCurrentPeer();
+          return true;
+        } else if (!isMacOS &&
+            HardwareKeyboard.instance.isControlPressed &&
+            HardwareKeyboard.instance.isShiftPressed) {
+          // Other platforms: Ctrl+Shift+T (to avoid conflict with Ctrl+T in terminal)
+          _addNewTerminalForCurrentPeer();
+          return true;
+        }
+      }
+
+      // Use Cmd+W on macOS, Ctrl+Shift+W on other platforms
+      if (event.logicalKey == LogicalKeyboardKey.keyW) {
+        if (isMacOS &&
+            HardwareKeyboard.instance.isMetaPressed &&
+            !HardwareKeyboard.instance.isShiftPressed) {
+          // macOS: Cmd+W (standard for close tab)
+          final currentTab = tabController.state.value.selectedTabInfo;
+          if (tabController.state.value.tabs.length > 1) {
+            tabController.closeBy(currentTab.key);
+            return true;
+          }
+        } else if (!isMacOS &&
+            HardwareKeyboard.instance.isControlPressed &&
+            HardwareKeyboard.instance.isShiftPressed) {
+          // Other platforms: Ctrl+Shift+W (to avoid conflict with Ctrl+W word delete)
+          final currentTab = tabController.state.value.selectedTabInfo;
+          if (tabController.state.value.tabs.length > 1) {
+            tabController.closeBy(currentTab.key);
+            return true;
+          }
+        }
+      }
+
+      // Use Alt+Left/Right for tab navigation (avoids conflicts)
+      if (HardwareKeyboard.instance.isAltPressed) {
+        if (event.logicalKey == LogicalKeyboardKey.arrowLeft) {
+          // Previous tab
+          final currentIndex = tabController.state.value.selected;
+          if (currentIndex > 0) {
+            tabController.jumpTo(currentIndex - 1);
+          }
+          return true;
+        } else if (event.logicalKey == LogicalKeyboardKey.arrowRight) {
+          // Next tab
+          final currentIndex = tabController.state.value.selected;
+          if (currentIndex < tabController.length - 1) {
+            tabController.jumpTo(currentIndex + 1);
+          }
+          return true;
+        }
+      }
+
+      // Check for Cmd/Ctrl + Number (switch to specific tab)
+      final numberKeys = [
+        LogicalKeyboardKey.digit1,
+        LogicalKeyboardKey.digit2,
+        LogicalKeyboardKey.digit3,
+        LogicalKeyboardKey.digit4,
+        LogicalKeyboardKey.digit5,
+        LogicalKeyboardKey.digit6,
+        LogicalKeyboardKey.digit7,
+        LogicalKeyboardKey.digit8,
+        LogicalKeyboardKey.digit9,
+      ];
+
+      for (int i = 0; i < numberKeys.length; i++) {
+        if (event.logicalKey == numberKeys[i] &&
+            ((isMacOS && HardwareKeyboard.instance.isMetaPressed) ||
+                (!isMacOS && HardwareKeyboard.instance.isControlPressed))) {
+          if (i < tabController.length) {
+            tabController.jumpTo(i);
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  void _addNewTerminal(String peerId) {
+    // Find first tab for this peer to get connection parameters
+    final firstTab = tabController.state.value.tabs.firstWhere(
+      (tab) => tab.key.startsWith('$peerId\_'),
+    );
+    if (firstTab.page is TerminalPage) {
+      final page = firstTab.page as TerminalPage;
+      final terminalId = _nextTerminalId++;
+      tabController.add(_createTerminalTab(
+        peerId: peerId,
+        terminalId: terminalId,
+        password: page.password,
+        isSharedPassword: page.isSharedPassword,
+        forceRelay: page.forceRelay,
+        connToken: page.connToken,
+      ));
+    }
+  }
+
+  void _addNewTerminalForCurrentPeer() {
+    final currentTab = tabController.state.value.selectedTabInfo;
+    final parts = currentTab.key.split('_');
+    if (parts.isNotEmpty) {
+      final peerId = parts[0];
+      _addNewTerminal(peerId);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final child = Scaffold(
+        backgroundColor: Theme.of(context).cardColor,
+        body: DesktopTab(
+          controller: tabController,
+          onWindowCloseButton: handleWindowCloseButton,
+          tail: _buildAddButton(),
+          selectedBorderColor: MyTheme.accent,
+          labelGetter: DesktopTab.tablabelGetter,
+          tabMenuBuilder: (key) {
+            // Extract peerId from tab key (format: "peerId_terminalId")
+            final parts = key.split('_');
+            if (parts.isEmpty) return Container();
+            final peerId = parts[0];
+            return _tabMenuBuilder(peerId, () {});
+          },
+        ));
+    final tabWidget = isLinux
+        ? buildVirtualWindowFrame(context, child)
+        : workaroundWindowBorder(
+            context,
+            Container(
+              decoration: BoxDecoration(
+                  border: Border.all(color: MyTheme.color(context).border!)),
+              child: child,
+            ));
+    return isMacOS || kUseCompatibleUiMode
+        ? tabWidget
+        : SubWindowDragToResizeArea(
+            child: tabWidget,
+            resizeEdgeSize: stateGlobal.resizeEdgeSize.value,
+            enableResizeEdges: subWindowManagerEnableResizeEdges,
+            windowId: stateGlobal.windowId,
+          );
+  }
+
+  void onRemoveId(String id) {
+    if (tabController.state.value.tabs.isEmpty) {
+      WindowController.fromWindowId(windowId()).close();
+    }
+  }
+
+  int windowId() {
+    return widget.params["windowId"];
+  }
+
+  Widget _buildAddButton() {
+    return ActionIcon(
+      message: 'New tab',
+      icon: IconFont.add,
+      onTap: () {
+        _addNewTerminalForCurrentPeer();
+      },
+      isClose: false,
+    );
+  }
+
+  Future<bool> handleWindowCloseButton() async {
+    final connLength = tabController.state.value.tabs.length;
+    if (connLength <= 1) {
+      tabController.clear();
+      return true;
+    } else {
+      final bool res;
+      if (!option2bool(kOptionEnableConfirmClosingTabs,
+          bind.mainGetLocalOption(key: kOptionEnableConfirmClosingTabs))) {
+        res = true;
+      } else {
+        res = await closeConfirmDialog();
+      }
+      if (res) {
+        tabController.clear();
+      }
+      return res;
+    }
+  }
+}
--- a/flutter/lib/desktop/pages/view_camera_page.dart
+++ b/flutter/lib/desktop/pages/view_camera_page.dart
@@ -515,8 +515,6 @@ class ImagePaint extends StatefulWidget {
 }

 class _ImagePaintState extends State<ImagePaint> {
-  bool _lastRemoteCursorMoved = false;
-
  String get id => widget.id;
  RxBool get cursorOverImage => widget.cursorOverImage;
  Widget Function(Widget)? get listenerBuilder => widget.listenerBuilder;
--- a/flutter/lib/desktop/screen/desktop_terminal_screen.dart
+++ b/flutter/lib/desktop/screen/desktop_terminal_screen.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:provider/provider.dart';
+
+import 'package:flutter_hbb/desktop/pages/terminal_tab_page.dart';
+
+class DesktopTerminalScreen extends StatelessWidget {
+  final Map<String, dynamic> params;
+
+  const DesktopTerminalScreen({Key? key, required this.params})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProvider.value(value: gFFI.ffiModel),
+      ],
+      child: Scaffold(
+        backgroundColor: isLinux ? Colors.transparent : null,
+        body: TerminalTabPage(
+          params: params,
+        ),
+      ),
+    );
+  }
+}
--- a/flutter/lib/desktop/widgets/tabbar_widget.dart
+++ b/flutter/lib/desktop/widgets/tabbar_widget.dart
@@ -54,6 +54,7 @@ enum DesktopTabType {
  fileTransfer,
  viewCamera,
  portForward,
+  terminal,
  install,
 }

--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -14,6 +14,7 @@ import 'package:flutter_hbb/desktop/screen/desktop_file_transfer_screen.dart';
 import 'package:flutter_hbb/desktop/screen/desktop_view_camera_screen.dart';
 import 'package:flutter_hbb/desktop/screen/desktop_port_forward_screen.dart';
 import 'package:flutter_hbb/desktop/screen/desktop_remote_screen.dart';
+import 'package:flutter_hbb/desktop/screen/desktop_terminal_screen.dart';
 import 'package:flutter_hbb/desktop/widgets/refresh_wrapper.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
@@ -91,6 +92,12 @@ Future<void> main(List<String> args) async {
          kAppTypeDesktopPortForward,
        );
        break;
+      case WindowType.Terminal:
+        desktopType = DesktopType.terminal;
+        runMultiWindow(
+          argument,
+          kAppTypeDesktopTerminal,
+        );
      default:
        break;
    }
@@ -211,6 +218,11 @@ void runMultiWindow(
        params: argument,
      );
      break;
+    case kAppTypeDesktopTerminal:
+      widget = DesktopTerminalScreen(
+        params: argument,
+      );
+      break;
    default:
      // no such appType
      exit(0);
@@ -257,6 +269,9 @@ void runMultiWindow(
    case kAppTypeDesktopPortForward:
      await restoreWindowPosition(WindowType.PortForward, windowId: kWindowId!);
      break;
+    case kAppTypeDesktopTerminal:
+      await restoreWindowPosition(WindowType.Terminal, windowId: kWindowId!);
+      break;
    default:
      // no such appType
      exit(0);
--- a/flutter/lib/mobile/pages/file_manager_page.dart
+++ b/flutter/lib/mobile/pages/file_manager_page.dart
@@ -12,11 +12,12 @@ import '../../common/widgets/dialog.dart';

 class FileManagerPage extends StatefulWidget {
  FileManagerPage(
-      {Key? key, required this.id, this.password, this.isSharedPassword})
+      {Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay})
      : super(key: key);
  final String id;
  final String? password;
  final bool? isSharedPassword;
+  final bool? forceRelay;

  @override
  State<StatefulWidget> createState() => _FileManagerPageState();
@@ -74,7 +75,8 @@ class _FileManagerPageState extends State<FileManagerPage> {
    gFFI.start(widget.id,
        isFileTransfer: true,
        password: widget.password,
-        isSharedPassword: widget.isSharedPassword);
+        isSharedPassword: widget.isSharedPassword,
+        forceRelay: widget.forceRelay);
    WidgetsBinding.instance.addPostFrameCallback((_) {
      gFFI.dialogManager
          .showLoading(translate('Connecting...'), onCancel: closeConnection);
--- a/flutter/lib/mobile/pages/home_page.dart
+++ b/flutter/lib/mobile/pages/home_page.dart
@@ -205,13 +205,13 @@ class WebHomePage extends StatelessWidget {
    }
    bool isFileTransfer = false;
    bool isViewCamera = false;
+    bool isTerminal = false;
    String? id;
    String? password;
    for (int i = 0; i < args.length; i++) {
      switch (args[i]) {
        case '--connect':
        case '--play':
-          isFileTransfer = false;
          id = args[i + 1];
          i++;
          break;
@@ -225,6 +225,11 @@ class WebHomePage extends StatelessWidget {
          id = args[i + 1];
          i++;
          break;
+        case '--terminal':
+          isTerminal = true;
+          id = args[i + 1];
+          i++;
+          break;
        case '--password':
          password = args[i + 1];
          i++;
@@ -234,7 +239,11 @@ class WebHomePage extends StatelessWidget {
      }
    }
    if (id != null) {
-      connect(context, id, isFileTransfer: isFileTransfer, isViewCamera: isViewCamera, password: password);
+      connect(context, id, 
+        isFileTransfer: isFileTransfer, 
+        isViewCamera: isViewCamera, 
+        isTerminal: isTerminal,
+        password: password);
    }
  }
 }
--- a/flutter/lib/mobile/pages/remote_page.dart
+++ b/flutter/lib/mobile/pages/remote_page.dart
@@ -40,12 +40,13 @@ void _disableAndroidSoftKeyboard({bool? isKeyboardVisible}) {
 }

 class RemotePage extends StatefulWidget {
-  RemotePage({Key? key, required this.id, this.password, this.isSharedPassword})
+  RemotePage({Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay})
      : super(key: key);

  final String id;
  final String? password;
  final bool? isSharedPassword;
+  final bool? forceRelay;

  @override
  State<RemotePage> createState() => _RemotePageState(id);
@@ -89,6 +90,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
      widget.id,
      password: widget.password,
      isSharedPassword: widget.isSharedPassword,
+      forceRelay: widget.forceRelay,
    );
    WidgetsBinding.instance.addPostFrameCallback((_) {
      SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
--- a/flutter/lib/mobile/pages/server_page.dart
+++ b/flutter/lib/mobile/pages/server_page.dart
@@ -17,7 +17,7 @@ import 'home_page.dart';

 class ServerPage extends StatefulWidget implements PageShape {
  @override
-  final title = translate("Share Screen");
+  final title = translate("Share screen");

  @override
  final icon = const Icon(Icons.mobile_screen_share);
@@ -649,8 +649,8 @@ class ConnectionManager extends StatelessWidget {
        children: serverModel.clients
            .map((client) => PaddingCard(
                title: translate(client.isFileTransfer
-                    ? "File Connection"
-                    : "Screen Connection"),
+                    ? "Transfer file"
+                    : "Share screen"),
                titleIcon: client.isFileTransfer
                    ? Icon(Icons.folder_outlined)
                    : Icon(Icons.mobile_screen_share),
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -815,7 +815,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
            !outgoingOnly &&
            !hideSecuritySettings)
          SettingsSection(
-            title: Text(translate("Share Screen")),
+            title: Text(translate("Share screen")),
            tiles: shareScreenTiles,
          ),
        if (!bind.isIncomingOnly()) defaultDisplaySection(),
--- a/flutter/lib/mobile/pages/terminal_page.dart
+++ b/flutter/lib/mobile/pages/terminal_page.dart
@@ -0,0 +1,106 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/models/model.dart';
+import 'package:flutter_hbb/models/terminal_model.dart';
+import 'package:xterm/xterm.dart';
+import '../../desktop/pages/terminal_connection_manager.dart';
+
+class TerminalPage extends StatefulWidget {
+  const TerminalPage({
+    Key? key,
+    required this.id,
+    required this.password,
+    required this.isSharedPassword,
+    this.forceRelay,
+    this.connToken,
+  }) : super(key: key);
+  final String id;
+  final String? password;
+  final bool? forceRelay;
+  final bool? isSharedPassword;
+  final String? connToken;
+  final terminalId = 0;
+
+  @override
+  State<TerminalPage> createState() => _TerminalPageState();
+}
+
+class _TerminalPageState extends State<TerminalPage>
+    with AutomaticKeepAliveClientMixin {
+  late FFI _ffi;
+  late TerminalModel _terminalModel;
+
+  @override
+  void initState() {
+    super.initState();
+
+    debugPrint(
+        '[TerminalPage] Initializing terminal ${widget.terminalId} for peer ${widget.id}');
+
+    // Use shared FFI instance from connection manager
+    _ffi = TerminalConnectionManager.getConnection(
+      peerId: widget.id,
+      password: widget.password,
+      isSharedPassword: widget.isSharedPassword,
+      forceRelay: widget.forceRelay,
+      connToken: widget.connToken,
+    );
+
+    // Create terminal model with specific terminal ID
+    _terminalModel = TerminalModel(_ffi, widget.terminalId);
+    debugPrint(
+        '[TerminalPage] Terminal model created for terminal ${widget.terminalId}');
+
+    // Register this terminal model with FFI for event routing
+    _ffi.registerTerminalModel(widget.terminalId, _terminalModel);
+
+    // Initialize terminal connection
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _ffi.dialogManager
+          .showLoading(translate('Connecting...'), onCancel: closeConnection);
+    });
+    _ffi.ffiModel.updateEventListener(_ffi.sessionId, widget.id);
+  }
+
+  @override
+  void dispose() {
+    // Unregister terminal model from FFI
+    _ffi.unregisterTerminalModel(widget.terminalId);
+    _terminalModel.dispose();
+    super.dispose();
+    TerminalConnectionManager.releaseConnection(widget.id);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return Scaffold(
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+      body: TerminalView(
+        _terminalModel.terminal,
+        controller: _terminalModel.terminalController,
+        autofocus: true,
+        backgroundOpacity: 0.7,
+        padding: const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0),
+        onSecondaryTapDown: (details, offset) async {
+          final selection = _terminalModel.terminalController.selection;
+          if (selection != null) {
+            final text = _terminalModel.terminal.buffer.getText(selection);
+            _terminalModel.terminalController.clearSelection();
+            await Clipboard.setData(ClipboardData(text: text));
+          } else {
+            final data = await Clipboard.getData('text/plain');
+            final text = data?.text;
+            if (text != null) {
+              _terminalModel.terminal.paste(text);
+            }
+          }
+        },
+      ),
+    );
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+}
--- a/flutter/lib/mobile/pages/view_camera_page.dart
+++ b/flutter/lib/mobile/pages/view_camera_page.dart
@@ -39,12 +39,13 @@ void _disableAndroidSoftKeyboard({bool? isKeyboardVisible}) {

 class ViewCameraPage extends StatefulWidget {
  ViewCameraPage(
-      {Key? key, required this.id, this.password, this.isSharedPassword})
+      {Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay})
      : super(key: key);

  final String id;
  final String? password;
  final bool? isSharedPassword;
+  final bool? forceRelay;

  @override
  State<ViewCameraPage> createState() => _ViewCameraPageState(id);
@@ -88,6 +89,7 @@ class _ViewCameraPageState extends State<ViewCameraPage>
      isViewCamera: true,
      password: widget.password,
      isSharedPassword: widget.isSharedPassword,
+      forceRelay: widget.forceRelay,
    );
    WidgetsBinding.instance.addPostFrameCallback((_) {
      SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -23,6 +23,7 @@ import 'package:flutter_hbb/models/server_model.dart';
 import 'package:flutter_hbb/models/user_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/models/desktop_render_texture.dart';
+import 'package:flutter_hbb/models/terminal_model.dart';
 import 'package:flutter_hbb/plugin/event.dart';
 import 'package:flutter_hbb/plugin/manager.dart';
 import 'package:flutter_hbb/plugin/widgets/desc_ui.dart';
@@ -311,6 +312,8 @@ class FfiModel with ChangeNotifier {
      } else if (name == 'chat_server_mode') {
        parent.target?.chatModel
            .receive(int.parse(evt['id'] as String), evt['text'] ?? '');
+      } else if (name == 'terminal_response') {
+        parent.target?.routeTerminalResponse(evt);
      } else if (name == 'file_dir') {
        parent.target?.fileModel.receiveFileDir(evt);
      } else if (name == 'empty_dirs') {
@@ -1076,9 +1079,14 @@ class FfiModel with ChangeNotifier {
              sessionId: sessionId, arg: kOptionTouchMode) !=
          '';
    }
-    // FIXME: handle ViewCamera ConnType independently.
    if (connType == ConnType.fileTransfer) {
      parent.target?.fileModel.onReady();
+    } else if (connType == ConnType.terminal) {
+      // Call onReady on all registered terminal models
+      final models = parent.target?._terminalModels.values ?? [];
+      for (final model in models) {
+        model.onReady();
+      }
    } else if (connType == ConnType.defaultConn ||
        connType == ConnType.viewCamera) {
      List<Display> newDisplays = [];
@@ -2828,7 +2836,14 @@ class ElevationModel with ChangeNotifier {
 }

 // The index values of `ConnType` are same as rust protobuf.
-enum ConnType { defaultConn, fileTransfer, portForward, rdp, viewCamera }
+enum ConnType {
+  defaultConn,
+  fileTransfer,
+  portForward,
+  rdp,
+  viewCamera,
+  terminal
+}

 /// Flutter state manager and data communication with the Rust core.
 class FFI {
@@ -2863,6 +2878,12 @@ class FFI {
  late final Peers favoritePeersModel; // global
  late final Peers lanPeersModel; // global

+  // Terminal model registry for multiple terminals
+  final Map<int, TerminalModel> _terminalModels = {};
+
+  // Getter for terminal models
+  Map<int, TerminalModel> get terminalModels => _terminalModels;
+
  FFI(SessionID? sId) {
    sessionId = sId ?? (isDesktop ? Uuid().v4obj() : _constSessionId);
    imageModel = ImageModel(WeakReference(this));
@@ -2910,6 +2931,7 @@ class FFI {
    bool isViewCamera = false,
    bool isPortForward = false,
    bool isRdp = false,
+    bool isTerminal = false,
    String? switchUuid,
    String? password,
    bool? isSharedPassword,
@@ -2925,7 +2947,10 @@ class FFI {
    assert(
        (!(isPortForward && isViewCamera)) &&
            (!(isViewCamera && isPortForward)) &&
-            (!(isPortForward && isFileTransfer)),
+            (!(isPortForward && isFileTransfer)) &&
+            (!(isTerminal && isFileTransfer)) &&
+            (!(isTerminal && isViewCamera)) &&
+            (!(isTerminal && isPortForward)),
        'more than one connect type');
    if (isFileTransfer) {
      connType = ConnType.fileTransfer;
@@ -2933,6 +2958,8 @@ class FFI {
      connType = ConnType.viewCamera;
    } else if (isPortForward) {
      connType = ConnType.portForward;
+    } else if (isTerminal) {
+      connType = ConnType.terminal;
    } else {
      chatModel.resetClientMode();
      connType = ConnType.defaultConn;
@@ -2953,6 +2980,7 @@ class FFI {
        isViewCamera: isViewCamera,
        isPortForward: isPortForward,
        isRdp: isRdp,
+        isTerminal: isTerminal,
        switchUuid: switchUuid ?? '',
        forceRelay: forceRelay ?? false,
        password: password ?? '',
@@ -3132,6 +3160,11 @@ class FFI {
  Future<void> close({bool closeSession = true}) async {
    closed = true;
    chatModel.close();
+    // Close all terminal models
+    for (final model in _terminalModels.values) {
+      model.dispose();
+    }
+    _terminalModels.clear();
    if (imageModel.image != null && !isWebDesktop) {
      await setCanvasConfig(
          sessionId,
@@ -3162,6 +3195,27 @@ class FFI {
  Future<bool> invokeMethod(String method, [dynamic arguments]) async {
    return await platformFFI.invokeMethod(method, arguments);
  }
+
+  // Terminal model management
+  void registerTerminalModel(int terminalId, TerminalModel model) {
+    debugPrint('[FFI] Registering terminal model for terminal $terminalId');
+    _terminalModels[terminalId] = model;
+  }
+
+  void unregisterTerminalModel(int terminalId) {
+    debugPrint('[FFI] Unregistering terminal model for terminal $terminalId');
+    _terminalModels.remove(terminalId);
+  }
+
+  void routeTerminalResponse(Map<String, dynamic> evt) {
+    final int terminalId = evt['terminal_id'] ?? 0;
+
+    // Route to specific terminal model if it exists
+    final model = _terminalModels[terminalId];
+    if (model != null) {
+      model.handleTerminalResponse(evt);
+    }
+  }
 }

 const kInvalidResolutionValue = -1;
@@ -3266,9 +3320,6 @@ class PeerInfo with ChangeNotifier {
  bool get isAmyuniIdd =>
      platformAdditions[kPlatformAdditionsIddImpl] == 'amyuni_idd';

-  bool get isSupportViewCamera =>
-      platformAdditions[kPlatformAdditionsSupportViewCamera] == true;
-
  Display? tryGetDisplay({int? display}) {
    if (displays.isEmpty) {
      return null;
--- a/flutter/lib/models/server_model.dart
+++ b/flutter/lib/models/server_model.dart
@@ -613,7 +613,13 @@ class ServerModel with ChangeNotifier {
  void showLoginDialog(Client client) {
    showClientDialog(
      client,
-      client.isFileTransfer ? "File Connection" : "Screen Connection",
+      client.isFileTransfer 
+          ? "Transfer file" 
+          : client.isViewCamera
+              ? "View camera"
+              : client.isTerminal 
+                  ? "Terminal" 
+                  : "Share screen",
      'Do you accept?',
      'android_new_connection_tip',
      () => sendLoginResponse(client, false),
@@ -692,7 +698,7 @@ class ServerModel with ChangeNotifier {
  void sendLoginResponse(Client client, bool res) async {
    if (res) {
      bind.cmLoginRes(connId: client.id, res: res);
-      if (!client.isFileTransfer) {
+      if (!client.isFileTransfer && !client.isTerminal) {
        parent.target?.invokeMethod("start_capture");
      }
      parent.target?.invokeMethod("cancel_notification", client.id);
@@ -806,6 +812,7 @@ enum ClientType {
  file,
  camera,
  portForward,
+  terminal,
 }

 class Client {
@@ -813,6 +820,7 @@ class Client {
  bool authorized = false;
  bool isFileTransfer = false;
  bool isViewCamera = false;
+  bool isTerminal = false;
  String portForward = "";
  String name = "";
  String peerId = ""; // peer user's id,show at app
@@ -839,6 +847,7 @@ class Client {
    isFileTransfer = json['is_file_transfer'];
    // TODO: no entry then default.
    isViewCamera = json['is_view_camera'];
+    isTerminal = json['is_terminal'] ?? false;
    portForward = json['port_forward'];
    name = json['name'];
    peerId = json['peer_id'];
@@ -861,6 +870,7 @@ class Client {
    data['authorized'] = authorized;
    data['is_file_transfer'] = isFileTransfer;
    data['is_view_camera'] = isViewCamera;
+    data['is_terminal'] = isTerminal;
    data['port_forward'] = portForward;
    data['name'] = name;
    data['peer_id'] = peerId;
@@ -883,6 +893,8 @@ class Client {
      return ClientType.file;
    } else if (isViewCamera) {
      return ClientType.camera;
+    } else if (isTerminal) {
+      return ClientType.terminal;
    } else if (portForward.isNotEmpty) {
      return ClientType.portForward;
    } else {
--- a/flutter/lib/models/terminal_model.dart
+++ b/flutter/lib/models/terminal_model.dart
@@ -0,0 +1,269 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:xterm/xterm.dart';
+
+import 'model.dart';
+import 'platform_model.dart';
+
+class TerminalModel with ChangeNotifier {
+  final String id; // peer id
+  final FFI parent;
+  final int terminalId;
+  late final Terminal terminal;
+  late final TerminalController terminalController;
+
+  bool _terminalOpened = false;
+  bool get terminalOpened => _terminalOpened;
+
+  bool _disposed = false;
+
+  final _inputBuffer = <String>[];
+
+  Future<void> _handleInput(String data) async {
+    if (_terminalOpened) {
+      // Send user input to remote terminal
+      try {
+        await bind.sessionSendTerminalInput(
+          sessionId: parent.sessionId,
+          terminalId: terminalId,
+          data: data,
+        );
+      } catch (e) {
+        debugPrint('[TerminalModel] Error sending terminal input: $e');
+      }
+    } else {
+      debugPrint('[TerminalModel] Terminal not opened yet, buffering input');
+      _inputBuffer.add(data);
+    }
+  }
+
+  TerminalModel(this.parent, [this.terminalId = 0]) : id = parent.id {
+    terminal = Terminal(maxLines: 10000);
+    terminalController = TerminalController();
+
+    // Setup terminal callbacks
+    terminal.onOutput = _handleInput;
+
+    terminal.onResize = (w, h, pw, ph) async {
+      // Validate all dimensions before using them
+      if (w > 0 && h > 0 && pw > 0 && ph > 0) {
+        debugPrint(
+            '[TerminalModel] Terminal resized to ${w}x$h (pixel: ${pw}x$ph)');
+        if (_terminalOpened) {
+          // Notify remote terminal of resize
+          try {
+            await bind.sessionResizeTerminal(
+              sessionId: parent.sessionId,
+              terminalId: terminalId,
+              rows: h,
+              cols: w,
+            );
+          } catch (e) {
+            debugPrint('[TerminalModel] Error resizing terminal: $e');
+          }
+        }
+      } else {
+        debugPrint(
+            '[TerminalModel] Invalid terminal dimensions: ${w}x$h (pixel: ${pw}x$ph)');
+      }
+    };
+  }
+
+  void onReady() {
+    parent.dialogManager.dismissAll();
+
+    // Fire and forget - don't block onReady
+    openTerminal().catchError((e) {
+      debugPrint('[TerminalModel] Error opening terminal: $e');
+    });
+  }
+
+  Future<void> openTerminal() async {
+    if (_terminalOpened) return;
+    // Request the remote side to open a terminal with default shell
+    // The remote side will decide which shell to use based on its OS
+
+    // Get terminal dimensions, ensuring they are valid
+    int rows = 24;
+    int cols = 80;
+
+    if (terminal.viewHeight > 0) {
+      rows = terminal.viewHeight;
+    }
+    if (terminal.viewWidth > 0) {
+      cols = terminal.viewWidth;
+    }
+
+    debugPrint(
+        '[TerminalModel] Opening terminal $terminalId, sessionId: ${parent.sessionId}, size: ${cols}x$rows');
+    try {
+      await bind
+          .sessionOpenTerminal(
+        sessionId: parent.sessionId,
+        terminalId: terminalId,
+        rows: rows,
+        cols: cols,
+      )
+          .timeout(
+        const Duration(seconds: 5),
+        onTimeout: () {
+          throw TimeoutException(
+              'sessionOpenTerminal timed out after 5 seconds');
+        },
+      );
+      debugPrint('[TerminalModel] sessionOpenTerminal called successfully');
+    } catch (e) {
+      debugPrint('[TerminalModel] Error calling sessionOpenTerminal: $e');
+      // Optionally show error to user
+      if (e is TimeoutException) {
+        terminal.write('Failed to open terminal: Connection timeout\r\n');
+      }
+    }
+  }
+
+  Future<void> closeTerminal() async {
+    if (_terminalOpened) {
+      try {
+        await bind
+            .sessionCloseTerminal(
+          sessionId: parent.sessionId,
+          terminalId: terminalId,
+        )
+            .timeout(
+          const Duration(seconds: 3),
+          onTimeout: () {
+            throw TimeoutException(
+                'sessionCloseTerminal timed out after 3 seconds');
+          },
+        );
+        debugPrint('[TerminalModel] sessionCloseTerminal called successfully');
+      } catch (e) {
+        debugPrint('[TerminalModel] Error calling sessionCloseTerminal: $e');
+        // Continue with cleanup even if close fails
+      }
+      _terminalOpened = false;
+      notifyListeners();
+    }
+  }
+
+  void handleTerminalResponse(Map<String, dynamic> evt) {
+    final String? type = evt['type'];
+    final int evtTerminalId = evt['terminal_id'] ?? 0;
+
+    // Only handle events for this terminal
+    if (evtTerminalId != terminalId) {
+      debugPrint(
+          '[TerminalModel] Ignoring event for terminal $evtTerminalId (not mine)');
+      return;
+    }
+
+    switch (type) {
+      case 'opened':
+        _handleTerminalOpened(evt);
+        break;
+      case 'data':
+        _handleTerminalData(evt);
+        break;
+      case 'closed':
+        _handleTerminalClosed(evt);
+        break;
+      case 'error':
+        _handleTerminalError(evt);
+        break;
+    }
+  }
+
+  void _handleTerminalOpened(Map<String, dynamic> evt) {
+    final bool success = evt['success'] ?? false;
+    final String message = evt['message'] ?? '';
+    final String? serviceId = evt['service_id'];
+
+    debugPrint(
+        '[TerminalModel] Terminal opened response: success=$success, message=$message, service_id=$serviceId');
+
+    if (success) {
+      _terminalOpened = true;
+
+      // Service ID is now saved on the Rust side in handle_terminal_response
+
+      // Process any buffered input
+      _processBufferedInputAsync().then((_) {
+        notifyListeners();
+      }).catchError((e) {
+        debugPrint('[TerminalModel] Error processing buffered input: $e');
+        notifyListeners();
+      });
+    } else {
+      terminal.write('Failed to open terminal: $message\r\n');
+    }
+  }
+
+  Future<void> _processBufferedInputAsync() async {
+    final buffer = List<String>.from(_inputBuffer);
+    _inputBuffer.clear();
+
+    for (final data in buffer) {
+      try {
+        await bind.sessionSendTerminalInput(
+          sessionId: parent.sessionId,
+          terminalId: terminalId,
+          data: data,
+        );
+      } catch (e) {
+        debugPrint('[TerminalModel] Error sending buffered input: $e');
+      }
+    }
+  }
+
+  void _handleTerminalData(Map<String, dynamic> evt) {
+    final data = evt['data'];
+
+    if (data != null) {
+      try {
+        String text = '';
+        if (data is String) {
+          // Try to decode as base64 first
+          try {
+            final bytes = base64Decode(data);
+            text = utf8.decode(bytes);
+          } catch (e) {
+            // If base64 decode fails, treat as plain text
+            text = data;
+          }
+        } else if (data is List) {
+          // Handle if data comes as byte array
+          text = utf8.decode(List<int>.from(data));
+        } else {
+          debugPrint('[TerminalModel] Unknown data type: ${data.runtimeType}');
+          return;
+        }
+
+        terminal.write(text);
+      } catch (e) {
+        debugPrint('[TerminalModel] Failed to process terminal data: $e');
+      }
+    }
+  }
+
+  void _handleTerminalClosed(Map<String, dynamic> evt) {
+    final int exitCode = evt['exit_code'] ?? 0;
+    terminal.write('\r\nTerminal closed with exit code: $exitCode\r\n');
+    _terminalOpened = false;
+    notifyListeners();
+  }
+
+  void _handleTerminalError(Map<String, dynamic> evt) {
+    final String message = evt['message'] ?? 'Unknown error';
+    terminal.write('\r\nTerminal error: $message\r\n');
+  }
+
+  @override
+  void dispose() {
+    if (_disposed) return;
+    _disposed = true;
+    // Terminal cleanup is handled server-side when service closes
+    super.dispose();
+  }
+}
--- a/flutter/lib/utils/multi_window_manager.dart
+++ b/flutter/lib/utils/multi_window_manager.dart
@@ -17,6 +17,7 @@ enum WindowType {
  FileTransfer,
  ViewCamera,
  PortForward,
+  Terminal,
  Unknown
 }

@@ -33,6 +34,8 @@ extension Index on int {
        return WindowType.ViewCamera;
      case 4:
        return WindowType.PortForward;
+      case 5:
+        return WindowType.Terminal;
      default:
        return WindowType.Unknown;
    }
@@ -61,6 +64,7 @@ class RustDeskMultiWindowManager {
  final List<int> _fileTransferWindows = List.empty(growable: true);
  final List<int> _viewCameraWindows = List.empty(growable: true);
  final List<int> _portForwardWindows = List.empty(growable: true);
+  final List<int> _terminalWindows = List.empty(growable: true);

  moveTabToNewWindow(int windowId, String peerId, String sessionId,
      WindowType windowType) async {
@@ -343,6 +347,32 @@ class RustDeskMultiWindowManager {
    );
  }

+  Future<MultiWindowCallResult> newTerminal(
+    String remoteId, {
+    String? password,
+    bool? isSharedPassword,
+    bool? forceRelay,
+    String? connToken,
+  }) async {
+    // Terminal windows should always create new windows, not reuse
+    // This avoids the MissingPluginException when trying to invoke
+    // new_terminal on an inactive window
+    var params = {
+      "type": WindowType.Terminal.index,
+      "id": remoteId,
+      "password": password,
+      "forceRelay": forceRelay,
+      "isSharedPassword": isSharedPassword,
+      "connToken": connToken,
+    };
+    final msg = jsonEncode(params);
+    
+    // Always create a new window for terminal
+    final windowId = await newSessionWindow(
+        WindowType.Terminal, remoteId, msg, _terminalWindows, false);
+    return MultiWindowCallResult(windowId, null);
+  }
+
  Future<MultiWindowCallResult> call(
      WindowType type, String methodName, dynamic args) async {
    final wnds = _findWindowsByType(type);
@@ -373,6 +403,8 @@ class RustDeskMultiWindowManager {
        return _viewCameraWindows;
      case WindowType.PortForward:
        return _portForwardWindows;
+      case WindowType.Terminal:
+        return _terminalWindows;
      case WindowType.Unknown:
        break;
    }
@@ -395,6 +427,8 @@ class RustDeskMultiWindowManager {
      case WindowType.PortForward:
        _portForwardWindows.clear();
        break;
+      case WindowType.Terminal:
+        _terminalWindows.clear();
      case WindowType.Unknown:
        break;
    }
--- a/flutter/lib/web/bridge.dart
+++ b/flutter/lib/web/bridge.dart
@@ -81,6 +81,7 @@ class RustdeskImpl {
      required bool isViewCamera,
      required bool isPortForward,
      required bool isRdp,
+      required bool isTerminal,
      required String switchUuid,
      required bool forceRelay,
      required String password,
@@ -94,7 +95,8 @@ class RustdeskImpl {
        'password': password,
        'is_shared_password': isSharedPassword,
        'isFileTransfer': isFileTransfer,
-        'isViewCamera': isViewCamera
+        'isViewCamera': isViewCamera,
+        'isTerminal': isTerminal
      })
    ]);
  }
@@ -1911,5 +1913,63 @@ class RustdeskImpl {
    throw UnimplementedError("sessionTakeScreenshot");
  }

+  Future<void> sessionOpenTerminal(
+      {required UuidValue sessionId,
+      required int terminalId,
+      required int rows,
+      required int cols,
+      dynamic hint}) {
+    return Future(() => js.context.callMethod('setByName', [
+          'open_terminal',
+          jsonEncode({
+            'terminal_id': terminalId,
+            'rows': rows,
+            'cols': cols,
+          })
+        ]));
+  }
+
+  Future<void> sessionSendTerminalInput(
+      {required UuidValue sessionId,
+      required int terminalId,
+      required String data,
+      dynamic hint}) {
+    return Future(() => js.context.callMethod('setByName', [
+          'send_terminal_input',
+          jsonEncode({
+            'terminal_id': terminalId,
+            'data': data,
+          })
+        ]));
+  }
+
+  Future<void> sessionResizeTerminal(
+      {required UuidValue sessionId,
+      required int terminalId,
+      required int rows,
+      required int cols,
+      dynamic hint}) {
+    return Future(() => js.context.callMethod('setByName', [
+          'resize_terminal',
+          jsonEncode({
+            'terminal_id': terminalId,
+            'rows': rows,
+            'cols': cols,
+          })
+        ]));
+  }
+
+  Future<void> sessionCloseTerminal(
+      {required UuidValue sessionId,
+      required int terminalId,
+      dynamic hint}) {
+    return Future(() => js.context.callMethod('setByName', [
+          'close_terminal',
+          jsonEncode({
+            'terminal_id': terminalId,
+          })
+        ]));
+  }
+
  void dispose() {}
 }