fix https://github.com/rustdesk/rustdesk/issues/609#issuecomment-3931613118

2026-02-24 03:18:38 +08:00 · 2026-02-20 13:03:37 +08:00
63 changed files with 71 additions and 459 deletions
--- a/flutter/lib/common/hbbs/hbbs.dart
+++ b/flutter/lib/common/hbbs/hbbs.dart
@@ -25,7 +25,6 @@ enum UserStatus { kDisabled, kNormal, kUnverified }
 // Is all the fields of the user needed?
 class UserPayload {
  String name = '';
-  String displayName = '';
  String email = '';
  String note = '';
  String? verifier;
@@ -34,7 +33,6 @@ class UserPayload {

  UserPayload.fromJson(Map<String, dynamic> json)
      : name = json['name'] ?? '',
-        displayName = json['display_name'] ?? '',
        email = json['email'] ?? '',
        note = json['note'] ?? '',
        verifier = json['verifier'],
@@ -48,7 +46,6 @@ class UserPayload {
  Map<String, dynamic> toJson() {
    final Map<String, dynamic> map = {
      'name': name,
-      'display_name': displayName,
      'status': status == UserStatus.kDisabled
          ? 0
          : status == UserStatus.kUnverified
@@ -61,14 +58,9 @@ class UserPayload {
  Map<String, dynamic> toGroupCacheJson() {
    final Map<String, dynamic> map = {
      'name': name,
-      'display_name': displayName,
    };
    return map;
  }
-
-  String get displayNameOrName {
-    return displayName.trim().isEmpty ? name : displayName;
-  }
 }

 class PeerPayload {
--- a/flutter/lib/common/widgets/my_group.dart
+++ b/flutter/lib/common/widgets/my_group.dart
@@ -158,18 +158,12 @@ class _MyGroupState extends State<MyGroup> {
    return Obx(() {
      final userItems = gFFI.groupModel.users.where((p0) {
        if (searchAccessibleItemNameText.isNotEmpty) {
-          final search = searchAccessibleItemNameText.value.toLowerCase();
-          return p0.name.toLowerCase().contains(search) ||
-              p0.displayNameOrName.toLowerCase().contains(search);
+          return p0.name
+              .toLowerCase()
+              .contains(searchAccessibleItemNameText.value.toLowerCase());
        }
        return true;
      }).toList();
-      // Count occurrences of each displayNameOrName to detect duplicates
-      final displayNameCount = <String, int>{};
-      for (final u in userItems) {
-        final dn = u.displayNameOrName;
-        displayNameCount[dn] = (displayNameCount[dn] ?? 0) + 1;
-      }
      final deviceGroupItems = gFFI.groupModel.deviceGroups.where((p0) {
        if (searchAccessibleItemNameText.isNotEmpty) {
          return p0.name
@@ -183,8 +177,7 @@ class _MyGroupState extends State<MyGroup> {
          itemCount: deviceGroupItems.length + userItems.length,
          itemBuilder: (context, index) => index < deviceGroupItems.length
              ? _buildDeviceGroupItem(deviceGroupItems[index])
-              : _buildUserItem(userItems[index - deviceGroupItems.length],
-                  displayNameCount));
+              : _buildUserItem(userItems[index - deviceGroupItems.length]));
      var maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
      return Obx(() => stateGlobal.isPortrait.isFalse
          ? listView(false)
@@ -192,14 +185,8 @@ class _MyGroupState extends State<MyGroup> {
    });
  }

-  Widget _buildUserItem(UserPayload user, Map<String, int> displayNameCount) {
+  Widget _buildUserItem(UserPayload user) {
    final username = user.name;
-    final dn = user.displayNameOrName;
-    final isDuplicate = (displayNameCount[dn] ?? 0) > 1;
-    final displayName =
-        isDuplicate && user.displayName.trim().isNotEmpty
-            ? '${user.displayName} (@$username)'
-            : dn;
    return InkWell(onTap: () {
      isSelectedDeviceGroup.value = false;
      if (selectedAccessibleItemName.value != username) {
@@ -235,14 +222,14 @@ class _MyGroupState extends State<MyGroup> {
                    alignment: Alignment.center,
                    child: Center(
                      child: Text(
-                        displayName.characters.first.toUpperCase(),
+                        username.characters.first.toUpperCase(),
                        style: TextStyle(color: Colors.white),
                        textAlign: TextAlign.center,
                      ),
                    ),
                  ),
                ).marginOnly(right: 4),
-                if (isMe) Flexible(child: Text(displayName)),
+                if (isMe) Flexible(child: Text(username)),
                if (isMe)
                  Flexible(
                    child: Container(
@@ -259,7 +246,7 @@ class _MyGroupState extends State<MyGroup> {
                      ),
                    ),
                  ),
-                if (!isMe) Expanded(child: Text(displayName)),
+                if (!isMe) Expanded(child: Text(username)),
              ],
            ).paddingSymmetric(vertical: 4),
          ),
--- a/flutter/lib/common/widgets/peers_view.dart
+++ b/flutter/lib/common/widgets/peers_view.dart
@@ -570,14 +570,11 @@ class MyGroupPeerView extends BasePeersView {
  static bool filter(Peer peer) {
    final model = gFFI.groupModel;
    if (model.searchAccessibleItemNameText.isNotEmpty) {
-      final text = model.searchAccessibleItemNameText.value.toLowerCase();
-      final searchPeersOfUser = model.users.any((user) =>
-          user.name == peer.loginName &&
-          (user.name.toLowerCase().contains(text) ||
-              user.displayNameOrName.toLowerCase().contains(text)));
-      final searchPeersOfDeviceGroup =
-          peer.device_group_name.toLowerCase().contains(text) &&
-              model.deviceGroups.any((g) => g.name == peer.device_group_name);
+      final text = model.searchAccessibleItemNameText.value;
+      final searchPeersOfUser = peer.loginName.contains(text) &&
+          model.users.any((user) => user.name == peer.loginName);
+      final searchPeersOfDeviceGroup = peer.device_group_name.contains(text) &&
+          model.deviceGroups.any((g) => g.name == peer.device_group_name);
      if (!searchPeersOfUser && !searchPeersOfDeviceGroup) {
        return false;
      }
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -2016,9 +2016,7 @@ class _AccountState extends State<_Account> {

  Widget accountAction() {
    return Obx(() => _Button(
-        gFFI.userModel.userName.value.isEmpty
-            ? 'Login'
-            : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
+        gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
        () => {
              gFFI.userModel.userName.value.isEmpty
                  ? loginDialog()
@@ -2039,10 +2037,6 @@ class _AccountState extends State<_Account> {
          offstage: gFFI.userModel.userName.value.isEmpty,
          child: Column(
            children: [
-              if (gFFI.userModel.displayName.value.trim().isNotEmpty &&
-                  gFFI.userModel.displayName.value.trim() !=
-                      gFFI.userModel.userName.value.trim())
-                text('Display Name', gFFI.userModel.displayName.value.trim()),
              text('Username', gFFI.userModel.userName.value),
              // text('Group', gFFI.groupModel.groupName.value),
            ],
@@ -2136,9 +2130,7 @@ class _PluginState extends State<_Plugin> {

  Widget accountAction() {
    return Obx(() => _Button(
-        gFFI.userModel.userName.value.isEmpty
-            ? 'Login'
-            : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
+        gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
        () => {
              gFFI.userModel.userName.value.isEmpty
                  ? loginDialog()
--- a/flutter/lib/desktop/pages/terminal_page.dart
+++ b/flutter/lib/desktop/pages/terminal_page.dart
@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
@@ -16,7 +15,6 @@ class TerminalPage extends StatefulWidget {
    required this.tabController,
    required this.isSharedPassword,
    required this.terminalId,
-    required this.tabKey,
    this.forceRelay,
    this.connToken,
  }) : super(key: key);
@@ -27,8 +25,6 @@ class TerminalPage extends StatefulWidget {
  final bool? isSharedPassword;
  final String? connToken;
  final int terminalId;
-  /// Tab key for focus management, passed from parent to avoid duplicate construction
-  final String tabKey;
  final SimpleWrapper<State<TerminalPage>?> _lastState = SimpleWrapper(null);

  FFI get ffi => (_lastState.value! as _TerminalPageState)._ffi;
@@ -46,16 +42,11 @@ class _TerminalPageState extends State<TerminalPage>
  late FFI _ffi;
  late TerminalModel _terminalModel;
  double? _cellHeight;
-  final FocusNode _terminalFocusNode = FocusNode(canRequestFocus: false);
-  StreamSubscription<DesktopTabState>? _tabStateSubscription;

  @override
  void initState() {
    super.initState();

-    // Listen for tab selection changes to request focus
-    _tabStateSubscription = widget.tabController.state.listen(_onTabStateChanged);
-
    // Use shared FFI instance from connection manager
    _ffi = TerminalConnectionManager.getConnection(
      peerId: widget.id,
@@ -73,13 +64,6 @@ class _TerminalPageState extends State<TerminalPage>
    _terminalModel.onResizeExternal = (w, h, pw, ph) {
      _cellHeight = ph * 1.0;

-      // Enable focus once terminal has valid dimensions (first valid resize)
-      if (!_terminalFocusNode.canRequestFocus && w > 0 && h > 0) {
-        _terminalFocusNode.canRequestFocus = true;
-        // Auto-focus if this tab is currently selected
-        _requestFocusIfSelected();
-      }
-
      // Schedule the setState for the next frame
      WidgetsBinding.instance.addPostFrameCallback((_) {
        if (mounted) {
@@ -115,42 +99,14 @@ class _TerminalPageState extends State<TerminalPage>

  @override
  void dispose() {
-    // Cancel tab state subscription to prevent memory leak
-    _tabStateSubscription?.cancel();
    // Unregister terminal model from FFI
    _ffi.unregisterTerminalModel(widget.terminalId);
    _terminalModel.dispose();
-    _terminalFocusNode.dispose();
    // Release connection reference instead of closing directly
    TerminalConnectionManager.releaseConnection(widget.id);
    super.dispose();
  }

-  void _onTabStateChanged(DesktopTabState state) {
-    // Check if this tab is now selected and request focus
-    if (state.selected >= 0 && state.selected < state.tabs.length) {
-      final selectedTab = state.tabs[state.selected];
-      if (selectedTab.key == widget.tabKey && mounted) {
-        _requestFocusIfSelected();
-      }
-    }
-  }
-
-  void _requestFocusIfSelected() {
-    if (!mounted || !_terminalFocusNode.canRequestFocus) return;
-    // Use post-frame callback to ensure widget is fully laid out in focus tree
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      // Re-check conditions after frame: mounted, focusable, still selected, not already focused
-      if (!mounted || !_terminalFocusNode.canRequestFocus || _terminalFocusNode.hasFocus) return;
-      final state = widget.tabController.state.value;
-      if (state.selected >= 0 && state.selected < state.tabs.length) {
-        if (state.tabs[state.selected].key == widget.tabKey) {
-          _terminalFocusNode.requestFocus();
-        }
-      }
-    });
-  }
-
  // This method ensures that the number of visible rows is an integer by computing the
  // extra space left after dividing the available height by the height of a single
  // terminal row (`_cellHeight`) and distributing it evenly as top and bottom padding.
@@ -175,9 +131,7 @@ class _TerminalPageState extends State<TerminalPage>
          return TerminalView(
            _terminalModel.terminal,
            controller: _terminalModel.terminalController,
-            focusNode: _terminalFocusNode,
-            // Note: autofocus is not used here because focus is managed manually
-            // via _onTabStateChanged() to handle tab switching properly.
+            autofocus: true,
            backgroundOpacity: 0.7,
            padding: _calculatePadding(heightPx),
            onSecondaryTapDown: (details, offset) async {
--- a/flutter/lib/desktop/pages/terminal_tab_page.dart
+++ b/flutter/lib/desktop/pages/terminal_tab_page.dart
@@ -34,8 +34,6 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
  static const IconData selectedIcon = Icons.terminal;
  static const IconData unselectedIcon = Icons.terminal_outlined;
  int _nextTerminalId = 1;
-  // Lightweight idempotency guard for async close operations
-  final Set<String> _closingTabs = {};

  _TerminalTabPageState(Map<String, dynamic> params) {
    Get.put(DesktopTabController(tabType: DesktopTabType.terminal));
@@ -72,12 +70,28 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
      label: tabLabel,
      selectedIcon: selectedIcon,
      unselectedIcon: unselectedIcon,
-      onTabCloseButton: () => _closeTab(tabKey),
+      onTabCloseButton: () async {
+        if (await desktopTryShowTabAuditDialogCloseCancelled(
+          id: tabKey,
+          tabController: tabController,
+        )) {
+          return;
+        }
+        // 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,
-        tabKey: tabKey,
        password: password,
        isSharedPassword: isSharedPassword,
        tabController: tabController,
@@ -87,149 +101,6 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
    );
  }

-  /// Unified tab close handler for all close paths (button, shortcut, programmatic).
-  /// Shows audit dialog, cleans up session if not persistent, then removes the UI tab.
-  Future<void> _closeTab(String tabKey) async {
-    // Idempotency guard: skip if already closing this tab
-    if (_closingTabs.contains(tabKey)) return;
-    _closingTabs.add(tabKey);
-
-    try {
-      // Snapshot peerTabCount BEFORE any await to avoid race with concurrent
-      // _closeAllTabs clearing tabController (which would make the live count
-      // drop to 0 and incorrectly trigger session persistence).
-      // Note: the snapshot may become stale if other individual tabs are closed
-      // during the audit dialog, but this is an acceptable trade-off.
-      int? snapshotPeerTabCount;
-      final parsed = _parseTabKey(tabKey);
-      if (parsed != null) {
-        final (peerId, _) = parsed;
-        snapshotPeerTabCount = tabController.state.value.tabs.where((t) {
-          final p = _parseTabKey(t.key);
-          return p != null && p.$1 == peerId;
-        }).length;
-      }
-
-      if (await desktopTryShowTabAuditDialogCloseCancelled(
-        id: tabKey,
-        tabController: tabController,
-      )) {
-        return;
-      }
-
-      // Close terminal session if not in persistent mode.
-      // Wrapped separately so session cleanup failure never blocks UI tab removal.
-      try {
-        await _closeTerminalSessionIfNeeded(tabKey,
-            peerTabCount: snapshotPeerTabCount);
-      } catch (e) {
-        debugPrint('[TerminalTabPage] Session cleanup failed for $tabKey: $e');
-      }
-      // Always close the tab from UI, regardless of session cleanup result
-      tabController.closeBy(tabKey);
-    } catch (e) {
-      debugPrint('[TerminalTabPage] Error closing tab $tabKey: $e');
-    } finally {
-      _closingTabs.remove(tabKey);
-    }
-  }
-
-  /// Close all tabs with session cleanup.
-  /// Used for window-level close operations (onDestroy, handleWindowCloseButton).
-  /// UI tabs are removed immediately; session cleanup runs in parallel with a
-  /// bounded timeout so window close is not blocked indefinitely.
-  Future<void> _closeAllTabs() async {
-    final tabKeys = tabController.state.value.tabs.map((t) => t.key).toList();
-    // Remove all UI tabs immediately (same instant behavior as the old tabController.clear())
-    tabController.clear();
-    // Run session cleanup in parallel with bounded timeout (closeTerminal() has internal 3s timeout).
-    // Skip tabs already being closed by a concurrent _closeTab() to avoid duplicate FFI calls.
-    final futures = tabKeys
-        .where((tabKey) => !_closingTabs.contains(tabKey))
-        .map((tabKey) async {
-      try {
-        await _closeTerminalSessionIfNeeded(tabKey, persistAll: true);
-      } catch (e) {
-        debugPrint('[TerminalTabPage] Session cleanup failed for $tabKey: $e');
-      }
-    }).toList();
-    if (futures.isNotEmpty) {
-      await Future.wait(futures).timeout(
-        const Duration(seconds: 4),
-        onTimeout: () {
-          debugPrint(
-              '[TerminalTabPage] Session cleanup timed out for batch close');
-          return [];
-        },
-      );
-    }
-  }
-
-  /// Close the terminal session on server side based on persistent mode.
-  ///
-  /// [persistAll] controls behavior when persistent mode is enabled:
-  /// - `true` (window close): persist all sessions, don't close any.
-  /// - `false` (tab close): only persist the last session for the peer,
-  ///   close others so only the most recent disconnected session survives.
-  Future<void> _closeTerminalSessionIfNeeded(String tabKey,
-      {bool persistAll = false, int? peerTabCount}) async {
-    final parsed = _parseTabKey(tabKey);
-    if (parsed == null) return;
-    final (peerId, terminalId) = parsed;
-
-    final ffi = TerminalConnectionManager.getExistingConnection(peerId);
-    if (ffi == null) return;
-
-    final isPersistent = bind.sessionGetToggleOptionSync(
-      sessionId: ffi.sessionId,
-      arg: kOptionTerminalPersistent,
-    );
-
-    if (isPersistent) {
-      if (persistAll) {
-        // Window close: persist all sessions
-        return;
-      }
-      // Tab close: only persist if this is the last tab for this peer.
-      // Use the snapshot value if provided (avoids race with concurrent tab removal).
-      final effectivePeerTabCount = peerTabCount ??
-          tabController.state.value.tabs.where((t) {
-            final p = _parseTabKey(t.key);
-            return p != null && p.$1 == peerId;
-          }).length;
-      if (effectivePeerTabCount <= 1) {
-        // Last tab for this peer — persist the session
-        return;
-      }
-      // Not the last tab — fall through to close the session
-    }
-
-    final terminalModel = ffi.terminalModels[terminalId];
-    if (terminalModel != null) {
-      // closeTerminal() has internal 3s timeout, no need for external timeout
-      await terminalModel.closeTerminal();
-    }
-  }
-
-  /// Parse tabKey (format: "peerId_terminalId") into its components.
-  /// Note: peerId may contain underscores, so we use lastIndexOf('_').
-  /// Returns null if tabKey format is invalid.
-  (String peerId, int terminalId)? _parseTabKey(String tabKey) {
-    final lastUnderscore = tabKey.lastIndexOf('_');
-    if (lastUnderscore <= 0) {
-      debugPrint('[TerminalTabPage] Invalid tabKey format: $tabKey');
-      return null;
-    }
-    final terminalIdStr = tabKey.substring(lastUnderscore + 1);
-    final terminalId = int.tryParse(terminalIdStr);
-    if (terminalId == null) {
-      debugPrint('[TerminalTabPage] Invalid terminalId in tabKey: $tabKey');
-      return null;
-    }
-    final peerId = tabKey.substring(0, lastUnderscore);
-    return (peerId, terminalId);
-  }
-
  Widget _tabMenuBuilder(String peerId, CancelFunc cancelFunc) {
    final List<MenuEntryBase<String>> menu = [];
    const EdgeInsets padding = EdgeInsets.only(left: 8.0, right: 5.0);
@@ -313,8 +184,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
      } else if (call.method == kWindowEventRestoreTerminalSessions) {
        _restoreSessions(call.arguments);
      } else if (call.method == "onDestroy") {
-        // Clean up sessions before window destruction (bounded wait)
-        await _closeAllTabs();
+        tabController.clear();
      } else if (call.method == kWindowActionRebuild) {
        reloadCurrentWindow();
      } else if (call.method == kWindowEventActiveSession) {
@@ -398,7 +268,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
          // macOS: Cmd+W (standard for close tab)
          final currentTab = tabController.state.value.selectedTabInfo;
          if (tabController.state.value.tabs.length > 1) {
-            _closeTab(currentTab.key);
+            tabController.closeBy(currentTab.key);
            return true;
          }
        } else if (!isMacOS &&
@@ -407,7 +277,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
          // 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) {
-            _closeTab(currentTab.key);
+            tabController.closeBy(currentTab.key);
            return true;
          }
        }
@@ -486,10 +356,12 @@ class _TerminalTabPageState extends State<TerminalTabPage> {

  void _addNewTerminalForCurrentPeer({int? terminalId}) {
    final currentTab = tabController.state.value.selectedTabInfo;
-    final parsed = _parseTabKey(currentTab.key);
-    if (parsed == null) return;
-    final (peerId, _) = parsed;
-    _addNewTerminal(peerId, terminalId: terminalId);
+    final tabKey = currentTab.key;
+    final lastUnderscore = tabKey.lastIndexOf('_');
+    if (lastUnderscore > 0) {
+      final peerId = tabKey.substring(0, lastUnderscore);
+      _addNewTerminal(peerId, terminalId: terminalId);
+    }
  }

  @override
@@ -503,9 +375,11 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
          selectedBorderColor: MyTheme.accent,
          labelGetter: DesktopTab.tablabelGetter,
          tabMenuBuilder: (key) {
-            final parsed = _parseTabKey(key);
-            if (parsed == null) return Container();
-            final (peerId, _) = parsed;
+            // Extract peerId from tab key (format: "peerId_terminalId")
+            // Use lastIndexOf to handle peerIds containing underscores
+            final lastUnderscore = key.lastIndexOf('_');
+            if (lastUnderscore <= 0) return Container();
+            final peerId = key.substring(0, lastUnderscore);
            return _tabMenuBuilder(peerId, () {});
          },
        ));
@@ -560,7 +434,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
      }
    }
    if (connLength <= 1) {
-      await _closeAllTabs();
+      tabController.clear();
      return true;
    } else {
      final bool res;
@@ -571,7 +445,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
        res = await closeConfirmDialog();
      }
      if (res) {
-        await _closeAllTabs();
+        tabController.clear();
      }
      return res;
    }
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -688,7 +688,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
              SettingsTile(
                title: Obx(() => Text(gFFI.userModel.userName.value.isEmpty
                    ? translate('Login')
-                    : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})')),
+                    : '${translate('Logout')} (${gFFI.userModel.userName.value})')),
                leading: Icon(Icons.person),
                onPressed: (context) {
                  if (gFFI.userModel.userName.value.isEmpty) {
--- a/flutter/lib/models/terminal_model.dart
+++ b/flutter/lib/models/terminal_model.dart
@@ -24,13 +24,6 @@ class TerminalModel with ChangeNotifier {
  bool _disposed = false;

  final _inputBuffer = <String>[];
-  // Buffer for output data received before terminal view has valid dimensions.
-  // This prevents NaN errors when writing to terminal before layout is complete.
-  final _pendingOutputChunks = <String>[];
-  int _pendingOutputSize = 0;
-  static const int _kMaxOutputBufferChars = 8 * 1024;
-  // View ready state: true when terminal has valid dimensions, safe to write
-  bool _terminalViewReady = false;

  bool get isPeerWindows => parent.ffiModel.pi.platform == kPeerPlatformWindows;

@@ -81,12 +74,6 @@ class TerminalModel with ChangeNotifier {
        // This piece of code must be placed before the conditional check in order to initialize properly.
        onResizeExternal?.call(w, h, pw, ph);

-        // Mark terminal view as ready and flush any buffered output on first valid resize.
-        // Must be after onResizeExternal so the view layer has valid dimensions before flushing.
-        if (!_terminalViewReady) {
-          _markViewReady();
-        }
-
        if (_terminalOpened) {
          // Notify remote terminal of resize
          try {
@@ -154,7 +141,7 @@ class TerminalModel with ChangeNotifier {
      debugPrint('[TerminalModel] Error calling sessionOpenTerminal: $e');
      // Optionally show error to user
      if (e is TimeoutException) {
-        _writeToTerminal('Failed to open terminal: Connection timeout\r\n');
+        terminal.write('Failed to open terminal: Connection timeout\r\n');
      }
    }
  }
@@ -296,7 +283,7 @@ class TerminalModel with ChangeNotifier {
            }));
      }
    } else {
-      _writeToTerminal('Failed to open terminal: $message\r\n');
+      terminal.write('Failed to open terminal: $message\r\n');
    }
  }

@@ -340,83 +327,29 @@ class TerminalModel with ChangeNotifier {
          return;
        }

-        _writeToTerminal(text);
+        terminal.write(text);
      } catch (e) {
        debugPrint('[TerminalModel] Failed to process terminal data: $e');
      }
    }
  }

-  /// Write text to terminal, buffering if the view is not yet ready.
-  /// All terminal output should go through this method to avoid NaN errors
-  /// from writing before the terminal view has valid layout dimensions.
-  void _writeToTerminal(String text) {
-    if (!_terminalViewReady) {
-      // If a single chunk exceeds the cap, keep only its tail.
-      // Note: truncation may split a multi-byte ANSI escape sequence,
-      // which can cause a brief visual glitch on flush. This is acceptable
-      // because it only affects the pre-layout buffering window and the
-      // terminal will self-correct on subsequent output.
-      if (text.length >= _kMaxOutputBufferChars) {
-        final truncated =
-            text.substring(text.length - _kMaxOutputBufferChars);
-        _pendingOutputChunks
-          ..clear()
-          ..add(truncated);
-        _pendingOutputSize = truncated.length;
-      } else {
-        _pendingOutputChunks.add(text);
-        _pendingOutputSize += text.length;
-        // Drop oldest chunks if exceeds limit (whole chunks to preserve ANSI sequences)
-        while (_pendingOutputSize > _kMaxOutputBufferChars &&
-            _pendingOutputChunks.length > 1) {
-          final removed = _pendingOutputChunks.removeAt(0);
-          _pendingOutputSize -= removed.length;
-        }
-      }
-      return;
-    }
-    terminal.write(text);
-  }
-
-  void _flushOutputBuffer() {
-    if (_pendingOutputChunks.isEmpty) return;
-    debugPrint(
-        '[TerminalModel] Flushing $_pendingOutputSize buffered chars (${_pendingOutputChunks.length} chunks)');
-    for (final chunk in _pendingOutputChunks) {
-      terminal.write(chunk);
-    }
-    _pendingOutputChunks.clear();
-    _pendingOutputSize = 0;
-  }
-
-  /// Mark terminal view as ready and flush buffered output.
-  void _markViewReady() {
-    if (_terminalViewReady) return;
-    _terminalViewReady = true;
-    _flushOutputBuffer();
-  }
-
  void _handleTerminalClosed(Map<String, dynamic> evt) {
    final int exitCode = evt['exit_code'] ?? 0;
-    _writeToTerminal('\r\nTerminal closed with exit code: $exitCode\r\n');
+    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';
-    _writeToTerminal('\r\nTerminal error: $message\r\n');
+    terminal.write('\r\nTerminal error: $message\r\n');
  }

  @override
  void dispose() {
    if (_disposed) return;
    _disposed = true;
-    // Clear buffers to free memory
-    _inputBuffer.clear();
-    _pendingOutputChunks.clear();
-    _pendingOutputSize = 0;
    // Terminal cleanup is handled server-side when service closes
    super.dispose();
  }
--- a/flutter/lib/models/user_model.dart
+++ b/flutter/lib/models/user_model.dart
@@ -16,23 +16,9 @@ bool refreshingUser = false;

 class UserModel {
  final RxString userName = ''.obs;
-  final RxString displayName = ''.obs;
  final RxBool isAdmin = false.obs;
  final RxString networkError = ''.obs;
  bool get isLogin => userName.isNotEmpty;
-  String get displayNameOrUserName =>
-      displayName.value.trim().isEmpty ? userName.value : displayName.value;
-  String get accountLabelWithHandle {
-    final username = userName.value.trim();
-    if (username.isEmpty) {
-      return '';
-    }
-    final preferred = displayName.value.trim();
-    if (preferred.isEmpty || preferred == username) {
-      return username;
-    }
-    return '$preferred (@$username)';
-  }
  WeakReference<FFI> parent;

  UserModel(this.parent) {
@@ -112,8 +98,7 @@ class UserModel {
  _updateLocalUserInfo() {
    final userInfo = getLocalUserInfo();
    if (userInfo != null) {
-      userName.value = (userInfo['name'] ?? '').toString();
-      displayName.value = (userInfo['display_name'] ?? '').toString();
+      userName.value = userInfo['name'];
    }
  }

@@ -125,12 +110,10 @@ class UserModel {
      await gFFI.groupModel.reset();
    }
    userName.value = '';
-    displayName.value = '';
  }

  _parseAndUpdateUser(UserPayload user) {
    userName.value = user.name;
-    displayName.value = user.displayName;
    isAdmin.value = user.isAdmin;
    bind.mainSetLocalOption(key: 'user_info', value: jsonEncode(user));
    if (isWeb) {
--- a/libs/hbb_common
+++ b/libs/hbb_common
--- a/res/msi/preprocess.py
+++ b/res/msi/preprocess.py
@@ -336,9 +336,7 @@ def gen_custom_ARPSYSTEMCOMPONENT_True(args, dist_dir):
            f'{indent}<RegistryValue Type="integer" Name="Language" Value="[ProductLanguage]" />\n'
        )

-        # EstimatedSize in uninstall registry must be in KB.
-        estimated_size_bytes = get_folder_size(dist_dir)
-        estimated_size = max(1, (estimated_size_bytes + 1023) // 1024)
+        estimated_size = get_folder_size(dist_dir)
        lines_new.append(
            f'{indent}<RegistryValue Type="integer" Name="EstimatedSize" Value="{estimated_size}" />\n'
        )
--- a/src/client.rs
+++ b/src/client.rs
@@ -2630,13 +2630,10 @@ impl LoginConfigHandler {
            display_name =
                serde_json::from_str::<serde_json::Value>(&LocalConfig::get_option("user_info"))
                    .map(|x| {
-                        x.get("display_name")
-                            .and_then(|x| x.as_str())
-                            .map(|x| x.trim())
-                            .filter(|x| !x.is_empty())
-                            .or_else(|| x.get("name").and_then(|x| x.as_str()))
-                            .map(|x| x.to_owned())
+                        x.get("name")
+                            .map(|x| x.as_str().unwrap_or_default())
                            .unwrap_or_default()
+                            .to_owned()
                    })
                    .unwrap_or_default();
        }
--- a/src/hbbs_http/account.rs
+++ b/src/hbbs_http/account.rs
@@ -80,8 +80,6 @@ pub enum UserStatus {
 pub struct UserPayload {
    pub name: String,
    #[serde(default)]
-    pub display_name: Option<String>,
-    #[serde(default)]
    pub email: Option<String>,
    #[serde(default)]
    pub note: Option<String>,
@@ -270,12 +268,7 @@ impl OidcSession {
                            );
                            LocalConfig::set_option(
                                "user_info".to_owned(),
-                                serde_json::json!({
-                                    "name": auth_body.user.name,
-                                    "display_name": auth_body.user.display_name,
-                                    "status": auth_body.user.status
-                                })
-                                .to_string(),
+                                serde_json::json!({ "name": auth_body.user.name, "status": auth_body.user.status }).to_string(),
                            );
                        }
                    }
--- a/src/lang/ar.rs
+++ b/src/lang/ar.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "متابعة مع {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/be.rs
+++ b/src/lang/be.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Працягнуць з {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/bg.rs
+++ b/src/lang/bg.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Продължи с {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ca.rs
+++ b/src/lang/ca.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Continua amb {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "使用 {} 登录"),
-        ("Display Name", "显示名称"),
    ].iter().cloned().collect();
 }
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Pokračovat s {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Fortsæt med {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Bildschirm während ausgehender Sitzungen aktiv halten"),
        ("keep-awake-during-incoming-sessions-label", "Bildschirm während eingehender Sitzungen aktiv halten"),
        ("Continue with {}", "Fortfahren mit {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/el.rs
+++ b/src/lang/el.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Συνέχεια με {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", ""),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Continuar con {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/et.rs
+++ b/src/lang/et.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Jätka koos {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/eu.rs
+++ b/src/lang/eu.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "{} honekin jarraitu"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/fa.rs
+++ b/src/lang/fa.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "ادامه با {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/fi.rs
+++ b/src/lang/fi.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Jatka käyttäen {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Maintenir l’écran allumé lors des sessions sortantes"),
        ("keep-awake-during-incoming-sessions-label", "Maintenir l’écran allumé lors des sessions entrantes"),
        ("Continue with {}", "Continuer avec {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ge.rs
+++ b/src/lang/ge.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "{}-ით გაგრძელება"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/he.rs
+++ b/src/lang/he.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "המשך עם {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/hr.rs
+++ b/src/lang/hr.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Nastavi sa {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/hu.rs
+++ b/src/lang/hu.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Képernyő aktív állapotban tartása a kimenő munkamenetek során"),
        ("keep-awake-during-incoming-sessions-label", "Képernyő aktív állapotban tartása a bejövő munkamenetek során"),
        ("Continue with {}", "Folytatás a következővel: {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Lanjutkan dengan {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Mantieni lo schermo attivo durante le sessioni in uscita"),
        ("keep-awake-during-incoming-sessions-label", "Mantieni lo schermo attivo durante le sessioni in ingresso"),
        ("Continue with {}", "Continua con {}"),
-        ("Display Name", "Visualizza nome"),
    ].iter().cloned().collect();
 }
--- a/src/lang/ja.rs
+++ b/src/lang/ja.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "{} で続行"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ko.rs
+++ b/src/lang/ko.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "발신 세션 중 화면 켜짐 유지"),
        ("keep-awake-during-incoming-sessions-label", "수신 세션 중 화면 켜짐 유지"),
        ("Continue with {}", "{}(으)로 계속"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/kz.rs
+++ b/src/lang/kz.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", ""),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/lt.rs
+++ b/src/lang/lt.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Tęsti su {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/lv.rs
+++ b/src/lang/lv.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Turpināt ar {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/nb.rs
+++ b/src/lang/nb.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Fortsett med {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/nl.rs
+++ b/src/lang/nl.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Houd het scherm open tijdens de uitgaande sessies."),
        ("keep-awake-during-incoming-sessions-label", "Houd het scherm open tijdens de inkomende sessies."),
        ("Continue with {}", "Ga verder met {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Utrzymuj urządzenie w stanie aktywnym podczas sesji wychodzących"),
        ("keep-awake-during-incoming-sessions-label", "Utrzymuj urządzenie w stanie aktywnym podczas sesji przychodzących"),
        ("Continue with {}", "Kontynuuj z {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/pt_PT.rs
+++ b/src/lang/pt_PT.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", ""),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Manter tela ativa durante sessões de saída"),
        ("keep-awake-during-incoming-sessions-label", "Manter tela ativa durante sessões de entrada"),
        ("Continue with {}", "Continuar com {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ro.rs
+++ b/src/lang/ro.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Continuă cu {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Не отключать экран во время исходящих сеансов"),
        ("keep-awake-during-incoming-sessions-label", "Не отключать экран во время входящих сеансов"),
        ("Continue with {}", "Продолжить с {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sc.rs
+++ b/src/lang/sc.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Sighi cun {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Pokračovať s {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sl.rs
+++ b/src/lang/sl.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Nadaljuj z {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sq.rs
+++ b/src/lang/sq.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Vazhdo me {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sr.rs
+++ b/src/lang/sr.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Nastavi sa {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sv.rs
+++ b/src/lang/sv.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Fortsätt med {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ta.rs
+++ b/src/lang/ta.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "{} உடன் தொடர்"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", ""),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/th.rs
+++ b/src/lang/th.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "ทำต่อด้วย {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "Giden oturumlar süresince ekranı açık tutun"),
        ("keep-awake-during-incoming-sessions-label", "Gelen oturumlar süresince ekranı açık tutun"),
        ("Continue with {}", "{} ile devam et"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "在連出工作階段期間保持螢幕喚醒"),
        ("keep-awake-during-incoming-sessions-label", "在連入工作階段期間保持螢幕喚醒"),
        ("Continue with {}", "使用 {} 登入"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/uk.rs
+++ b/src/lang/uk.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Продовжити з {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/vi.rs
+++ b/src/lang/vi.rs
@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", ""),
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Tiếp tục với {}"),
-        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/server/terminal_service.rs
+++ b/src/server/terminal_service.rs
@@ -777,32 +777,6 @@ impl TerminalServiceProxy {
    ) -> Result<Option<TerminalResponse>> {
        let mut response = TerminalResponse::new();

-        // When the client requests a terminal_id that doesn't exist but there are
-        // surviving persistent sessions, remap the lowest-ID session to the requested
-        // terminal_id. This handles the case where _nextTerminalId resets to 1 on
-        // reconnect but the server-side sessions have non-contiguous IDs (e.g. {2: htop}).
-        //
-        // The client's requested terminal_id may not match any surviving session ID
-        // (e.g. _nextTerminalId incremented beyond the surviving IDs). This remap is a
-        // one-time handle reassignment — only the first reconnect triggers it because
-        // needs_session_sync is cleared afterward. Remaining sessions are communicated
-        // back via `persistent_sessions` with their original server-side IDs.
-        if !service.sessions.contains_key(&open.terminal_id)
-            && service.needs_session_sync
-            && !service.sessions.is_empty()
-        {
-            if let Some(&lowest_id) = service.sessions.keys().min() {
-                log::info!(
-                    "Remapping persistent session {} -> {} for reconnection",
-                    lowest_id,
-                    open.terminal_id
-                );
-                if let Some(session_arc) = service.sessions.remove(&lowest_id) {
-                    service.sessions.insert(open.terminal_id, session_arc);
-                }
-            }
-        }
-
        // Check if terminal already exists
        if let Some(session_arc) = service.sessions.get(&open.terminal_id) {
            // Reconnect to existing terminal
@@ -850,7 +824,7 @@ impl TerminalServiceProxy {

        // Create new terminal session
        log::info!(
-            "Creating new terminal {} for service {}",
+            "Creating new terminal {} for service: {}",
            open.terminal_id,
            service.service_id
        );
--- a/src/ui/chatbox.html
+++ b/src/ui/chatbox.html
@@ -12,7 +12,11 @@
            include "common.tis";
            var p = view.parameters;
            view.refresh = function() {
+                var draft_input = $(input);
+                var draft = draft_input ? (draft_input.value || "") : "";
                $(body).content(<ChatBox msgs={p.msgs} callback={p.callback} />);
+                var next_input = $(input);
+                if (next_input) next_input.value = draft;
                view.focus = $(input);
            }
            function self.closing() {
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -358,22 +358,6 @@ function getUserName() {
    return '';
 }

-function getAccountLabelWithHandle() {
-    try {
-        var user = JSON.parse(handler.get_local_option("user_info"));
-        var username = (user.name || '').trim();
-        if (!username) {
-            return '';
-        }
-        var displayName = (user.display_name || '').trim();
-        if (!displayName || displayName == username) {
-            return username;
-        }
-        return displayName + " (@" + username + ")";
-    } catch(e) {}
-    return '';
-}
-
 // Shared dialog functions
 function open_custom_server_dialog() {
    var configOptions = handler.get_options();
@@ -509,7 +493,7 @@ class MyIdMenu: Reactor.Component {
    }

    function renderPop() {
-        var accountLabel = handler.get_local_option("access_token") ? getAccountLabelWithHandle() : '';
+        var username = handler.get_local_option("access_token") ? getUserName() : '';
        return <popup>
            <menu.context #config-options>
                {!disable_settings && <li #enable-keyboard><span>{svg_checkmark}</span>{translate('Enable keyboard/mouse')}</li>}
@@ -537,8 +521,8 @@ class MyIdMenu: Reactor.Component {
                {!disable_settings && <DirectServer />}
                {!disable_settings && false && handler.using_public_server() && <li #allow-always-relay><span>{svg_checkmark}</span>{translate('Always connect via relay')}</li>}
                {!disable_change_id && handler.is_ok_change_id() ? <div .separator /> : ""}
-                {!disable_account && (accountLabel ?
-                <li #logout>{translate('Logout')} ({accountLabel})</li> :
+                {!disable_account && (username ?
+                <li #logout>{translate('Logout')} ({username})</li> :
                <li #login>{translate('Login')}</li>)}
                {!disable_change_id && !disable_settings && handler.is_ok_change_id() && key_confirmed && connect_status > 0 ? <li #change-id>{translate('Change ID')}</li> : ""}
                <div .separator />
@@ -1446,9 +1430,6 @@ checkConnectStatus();

 function set_local_user_info(user) {
    var user_info = {name: user.name};
-    if (user.display_name) {
-        user_info.display_name = user.display_name;
-    }
    if (user.status) {
        user_info.status = user.status;
    }