From 6a8e79d4a97ab72dbca90dc6a29218cbb5e0132d Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Wed, 11 Nov 2026 02:13:59 +0800
Subject: [PATCH] [fix] restrict sensitive information in release logs

---
 .../src/gui/application/gui_application.cpp   | 16 ++++---
 .../clipboard/clipboard_controller.cpp        |  6 +--
 .../features/input/keyboard_controller.cpp    |  4 +-
 .../features/settings/settings_manager.cpp    |  3 +-
 .../src/gui/runtime/connection_runtime.cpp    | 42 +++++++++----------
 .../src/gui/runtime/device_trust_runtime.cpp  |  2 +-
 apps/desktop/src/gui/runtime/gui_runtime.cpp  | 22 +++++-----
 .../src/gui/runtime/peer_data_callbacks.cpp   | 21 +++++-----
 .../src/gui/runtime/peer_event_handler.cpp    | 18 ++++----
 .../src/gui/runtime/privacy_runtime.cpp       |  8 ++--
 apps/desktop/src/log/rd_log.cpp               |  9 ++--
 .../platform/linux/gui/tray/linux_tray.cpp    |  2 +-
 .../application/local_host_application.cpp    |  4 +-
 .../portable_service_integration.cpp          |  4 +-
 .../gui/runtime/windows_service_runtime.cpp   |  3 +-
 apps/desktop/src/thumbnail/thumbnail.cpp      |  2 +-
 apps/desktop/src/tools/file_transfer.cpp      |  4 +-
 .../src/version_checker/version_checker.cpp   |  6 +--
 deps/submodules/minirtc                       |  2 +-
 19 files changed, 87 insertions(+), 91 deletions(-)

diff --git a/apps/desktop/src/gui/application/gui_application.cpp b/apps/desktop/src/gui/application/gui_application.cpp
index 53daee74..a3d9f3e9 100644
--- a/apps/desktop/src/gui/application/gui_application.cpp
+++ b/apps/desktop/src/gui/application/gui_application.cpp
@@ -2335,7 +2335,7 @@ void GuiApplication::BindStreamCallbacks() {
       std::lock_guard lock(props->privacy_status_mutex_);
       props->privacy_command_pending_ = false;
       if (!relock) props->privacy_status_received_ = false;
-      LOG_WARN("Privacy command send failed, remote_id={}", props->remote_id_);
+      LOG_WARN("Privacy command send failed");
     }
   };
   stream->on_toggle_privacy([send_privacy] { send_privacy(false); });
@@ -2981,16 +2981,15 @@ void GuiApplication::ShareLocalCursorState() {
     const int result = SendControllerData(recipient.remote_id, message.c_str(),
                                           message.size(), mouse_label_.c_str());
     if (result != 0) {
-      LOG_WARN("Send cursor state to [{}] failed, ret={}",
-               recipient.remote_id, result);
+      LOG_WARN("Send cursor state failed, ret={}", result);
       continue;
     }
 
     if (!delivery.has_sent ||
         delivery.last_sent.render_mode != outgoing.render_mode ||
         delivery.last_sent.hidden_reason != outgoing.hidden_reason) {
-      LOG_INFO("Send cursor presentation to [{}]: mode={}, reason={}",
-               recipient.remote_id, static_cast<int>(outgoing.render_mode),
+      LOG_INFO("Send cursor presentation: mode={}, reason={}",
+               static_cast<int>(outgoing.render_mode),
                static_cast<int>(outgoing.hidden_reason));
     }
     delivery.last_sent = outgoing;
@@ -3143,10 +3142,9 @@ void GuiApplication::HandlePasswordChangeResult() {
         uncertain ? "console_password_uncertain" : "console_password_rejected");
 #endif
     if (uncertain) {
-      LOG_WARN("Password change outcome is unknown: {}; re-authenticating",
-               error);
+      LOG_WARN("Password change outcome is unknown; re-authenticating");
     } else {
-      LOG_WARN("Password change failed: {}", error);
+      LOG_WARN("Password change failed");
       if (!settings_.ClearPendingPasswordChange()) {
         LOG_WARN("Could not clear rejected pending password change");
       }
@@ -3168,7 +3166,7 @@ void GuiApplication::HandlePasswordChangeResult() {
     LOG_WARN("Password changed on server; pending recovery record retained");
   }
 
-  LOG_INFO("Password changed successfully for [{}]", client_id_);
+  LOG_INFO("Password changed successfully");
 #if defined(__linux__) && !defined(__OHOS__)
   HeadlessConsole::Instance().NotifyKey("console_password_confirmed");
 #endif
diff --git a/apps/desktop/src/gui/features/clipboard/clipboard_controller.cpp b/apps/desktop/src/gui/features/clipboard/clipboard_controller.cpp
index 0f0cb92e..fcf930da 100644
--- a/apps/desktop/src/gui/features/clipboard/clipboard_controller.cpp
+++ b/apps/desktop/src/gui/features/clipboard/clipboard_controller.cpp
@@ -362,8 +362,7 @@ void ClipboardController::SendDeferredLocalText() {
       session->peer_, last_text_.data(), last_text_.size(),
       session->clipboard_label_.c_str());
   if (ret != 0) {
-    LOG_WARN("Failed to send deferred clipboard data to peer [{}], ret={}",
-             session->remote_id_, ret);
+    LOG_WARN("Failed to send deferred clipboard data, ret={}", ret);
     return;
   }
   deferred_local_session_.reset();
@@ -390,8 +389,7 @@ int ClipboardController::SendToPeers(const std::string &text) {
         MiniRtcSendReliableDataFrame(props->peer_, text.data(), text.size(),
                               props->clipboard_label_.c_str());
     if (ret != 0) {
-      LOG_WARN("Failed to send clipboard data to peer [{}], ret={}",
-               remote_id.c_str(), ret);
+      LOG_WARN("Failed to send clipboard data, ret={}", ret);
       return ret;
     }
   }
diff --git a/apps/desktop/src/gui/features/input/keyboard_controller.cpp b/apps/desktop/src/gui/features/input/keyboard_controller.cpp
index 841418ad..4511e678 100644
--- a/apps/desktop/src/gui/features/input/keyboard_controller.cpp
+++ b/apps/desktop/src/gui/features/input/keyboard_controller.cpp
@@ -379,8 +379,8 @@ bool KeyboardController::ReleaseRemotePressedKeysLocked(
   if (state_it != remote_states_.end()) {
     const auto& keys = state_it->second.pressed_keys;
     if (!keys.empty()) {
-      LOG_WARN("Releasing {} remote keyboard keys for remote_id={}, reason={}",
-               keys.size(), remote_id, reason ? reason : "unknown");
+      LOG_WARN("Releasing {} remote keyboard keys, reason={}", keys.size(),
+               reason ? reason : "unknown");
     }
     // Stage before erasing: subsequent dispatcher retries must still see the
     // keys if injection fails, even though active/heartbeat state is gone.
diff --git a/apps/desktop/src/gui/features/settings/settings_manager.cpp b/apps/desktop/src/gui/features/settings/settings_manager.cpp
index 06e1f6bb..277d2c10 100644
--- a/apps/desktop/src/gui/features/settings/settings_manager.cpp
+++ b/apps/desktop/src/gui/features/settings/settings_manager.cpp
@@ -60,8 +60,7 @@ bool RestrictCachePermissions(const std::filesystem::path &path,
     close(fd);
   }
   if (error) {
-    LOG_WARN("Cannot restrict credential cache permissions for {}: {}",
-             path.string(),
+    LOG_WARN("Cannot restrict credential cache permissions: {}",
              std::error_code(error, std::generic_category()).message());
   }
   return error == 0;
diff --git a/apps/desktop/src/gui/runtime/connection_runtime.cpp b/apps/desktop/src/gui/runtime/connection_runtime.cpp
index 48889509..f31160ef 100644
--- a/apps/desktop/src/gui/runtime/connection_runtime.cpp
+++ b/apps/desktop/src/gui/runtime/connection_runtime.cpp
@@ -184,7 +184,7 @@ void GuiRuntime::HandlePresenceProbeTimeout() {
     offline_warning_text_ =
         localization::device_offline[localization_language_index_];
     show_offline_warning_window_ = true;
-    LOG_WARN("Presence probe timed out for [{}]", presence_remote_id);
+    LOG_WARN("Presence probe timed out");
   }
 }
 
@@ -383,8 +383,7 @@ void GuiRuntime::CloseRemoteSession(std::shared_ptr<RemoteSession> props) {
        thumbnail = thumbnail_, queued_at]() mutable {
         if (props->peer_events_) props->peer_events_->Deactivate();
         if (peer && !props->lan_session_) {
-          LOG_INFO("[{}] Background leave connection [{}]", props->local_id_,
-                   props->remote_id_);
+          LOG_INFO("Background leave connection");
           MiniRtcLeaveConnection(peer, props->remote_id_.c_str());
           MiniRtcDestroyPeer(&peer);
         }
@@ -405,13 +404,12 @@ void GuiRuntime::CloseRemoteSession(std::shared_ptr<RemoteSession> props) {
                   props->remote_host_name_,
                   props->remember_password_ ? props->remote_password_ : "",
                   platform, direct ? &target : nullptr) != 0) {
-            LOG_ERROR("[{}] Failed to save recent connection", props->remote_id_);
+            LOG_ERROR("Failed to save recent connection");
           }
         }
         const auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
             std::chrono::steady_clock::now() - queued_at).count();
-        LOG_INFO("[{}] Session cleanup completed in {} ms", props->remote_id_,
-                 elapsed);
+        LOG_INFO("Session cleanup completed in {} ms", elapsed);
       });
 }
 
@@ -433,8 +431,7 @@ void GuiRuntime::CloseServerController(const std::string& remote_id) {
       [peer = peer_, transmission_id = std::string(client_id_), remote_id] {
         if (PeerDisconnectPeerConnection(peer, transmission_id.c_str(),
                                      remote_id.c_str()) != 0) {
-          LOG_WARN("[{}] Could not queue controller disconnect notification",
-                   remote_id);
+          LOG_WARN("Could not queue controller disconnect notification");
         }
       });
 }
@@ -482,7 +479,7 @@ void GuiRuntime::CloseConnectionPeer() {
   connection_peer_cleanup_ = session_cleanup_queue_.PostTask(
       [peer, handler = peer_events_, id = std::string(client_id_)]() mutable {
         handler->Deactivate();
-        LOG_INFO("[{}] Background connection peer cleanup", id);
+        LOG_INFO("Background connection peer cleanup");
         if (!IsLocalPeer(peer)) MiniRtcLeaveConnection(peer, id.c_str());
         UnbindLocalPeer(peer);
         MiniRtcDestroyPeer(&peer);
@@ -534,7 +531,8 @@ void GuiRuntime::HandleSessionCleanup() {
     try {
       it->second.get();
     } catch (const std::exception& error) {
-      LOG_ERROR("[{}] Session cleanup failed: {}", it->first, error.what());
+      LOG_ERROR("Session cleanup failed");
+      LOG_DEBUG("Session cleanup failed for [{}]: {}", it->first, error.what());
     }
     if (auto pending = pending_reconnects_.find(it->first);
         pending != pending_reconnects_.end()) {
@@ -568,7 +566,8 @@ void GuiRuntime::WaitForSessionCleanup() {
     try {
       task.get();
     } catch (const std::exception& error) {
-      LOG_ERROR("[{}] Session cleanup failed: {}", id, error.what());
+      LOG_ERROR("Session cleanup failed");
+      LOG_DEBUG("Session cleanup failed for [{}]: {}", id, error.what());
     }
   }
   session_cleanup_tasks_.clear();
@@ -641,7 +640,7 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
   if (session_cleanup_tasks_.count(remote_id)) {
     pending_reconnects_[remote_id] = {password ? password : "",
                                       remember_password, background};
-    LOG_INFO("[{}] Reconnect queued until previous peer is destroyed", remote_id);
+    LOG_INFO("Reconnect queued until previous peer is destroyed");
     return 0;
   }
   // Wall requests, including deferred reconnects, must not replace the single
@@ -654,14 +653,15 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
       offline_warning_text_ =
           localization::device_offline[localization_language_index_];
       show_offline_warning_window_ = true;
-      LOG_WARN("Presence probe failed for [{}], ret={}", remote_id, ret);
+      LOG_WARN("Presence probe failed, ret={}", ret);
     } else {
-      LOG_INFO("Presence probe requested for [{}] before connect", remote_id);
+      LOG_INFO("Presence probe requested before connect");
     }
     return -1;
   }
 
-  LOG_INFO("Connect to [{}]", remote_id);
+  LOG_INFO("Connecting to remote device");
+  LOG_DEBUG("Connect to [{}]", remote_id);
   if (!background) focused_remote_id_ = remote_id;
 
   auto stale = FindRemoteSession(remote_id);
@@ -676,8 +676,7 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
       if (it != remote_sessions_.end() && it->second == stale) {
         remote_sessions_.erase(it);
         exists = false;
-        LOG_INFO("[{}] Recreating stale remote session before connect",
-                 remote_id);
+        LOG_INFO("Recreating stale remote session before connect");
       }
     }
     if (exists && !stale->closing_.load() &&
@@ -694,7 +693,7 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
                                  : std::string(password),
             remember_password, background};
         CloseRemoteSession(stale);
-        LOG_INFO("[{}] Reconnecting after terminal peer status {}", remote_id,
+        LOG_INFO("Reconnecting after terminal peer status {}",
                  static_cast<int>(status));
         return 0;
       }
@@ -727,7 +726,7 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
         if (!background) show_connection_status_window_ = true;
 
         if (!props->peer_) {
-          LOG_INFO("Create peer [{}] instance failed", props->local_id_);
+          LOG_INFO("Create peer instance failed");
           return -1;
         }
 
@@ -753,9 +752,10 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
     }
 
     if (peer_to_init) {
-      LOG_INFO("[{}] Create peer instance successful", local_id);
+      LOG_INFO("Create peer instance successful");
+      LOG_DEBUG("Local peer id: [{}]", local_id);
       MiniRtcInit(peer_to_init);
-      LOG_INFO("[{}] Peer init finish", local_id);
+      LOG_INFO("Peer initialization finished");
     }
   }
 
diff --git a/apps/desktop/src/gui/runtime/device_trust_runtime.cpp b/apps/desktop/src/gui/runtime/device_trust_runtime.cpp
index ddeb2acc..af3839cd 100644
--- a/apps/desktop/src/gui/runtime/device_trust_runtime.cpp
+++ b/apps/desktop/src/gui/runtime/device_trust_runtime.cpp
@@ -159,7 +159,7 @@ void GuiRuntime::TickControllerTrust() {
     auto callback = events->EnterCallback();
     if (!callback) continue;
     if (action.kind < 0) {
-      LOG_WARN("Reject controller [{}]: trusted device verification required", action.id);
+      LOG_WARN("Reject controller: trusted device verification required");
       transfers_.Cancel(events.get(), action.id);
       remote_input_.Disconnect(action.id);
       CloseServerController(action.id);
diff --git a/apps/desktop/src/gui/runtime/gui_runtime.cpp b/apps/desktop/src/gui/runtime/gui_runtime.cpp
index ed973a25..e86438a5 100644
--- a/apps/desktop/src/gui/runtime/gui_runtime.cpp
+++ b/apps/desktop/src/gui/runtime/gui_runtime.cpp
@@ -53,9 +53,10 @@ GuiRuntime::GuiRuntime()
           },
           [](const std::string& id, int64_t queued_ms, int64_t execution_ms,
              InputOutcome outcome) {
-            LOG_WARN("Remote input result: peer={} queue_ms={} execution_ms={} "
-                     "result={}",
-                     id, queued_ms, execution_ms, InputOutcomeName(outcome));
+            LOG_DEBUG("Remote input result for peer={}", id);
+            LOG_WARN(
+                "Remote input result: queue_ms={} execution_ms={} result={}",
+                queued_ms, execution_ms, InputOutcomeName(outcome));
           },
           [this] { return devices_.ResetToInitialDisplay(); },
           [this](const std::string& id, unsigned mask) {
@@ -128,8 +129,7 @@ void GuiRuntime::SendRemoteInput(const RemoteAction& action) {
         : MiniRtcSendReliableDataFrame(
               props->peer_, message.data(), message.size(),
               mouse ? props->mouse_label_.c_str() : props->keyboard_label_.c_str());
-    if (result != 0)
-      LOG_WARN("Send remote input failed, remote_id={}, ret={}", id, result);
+    if (result != 0) LOG_WARN("Send remote input failed, ret={}", result);
   }
 }
 
@@ -258,8 +258,7 @@ int GuiRuntime::CreateConnectionPeer() {
     } else if (!credential_recovery_in_progress_) {
       credential_recovery_in_progress_ = true;
       credential_recovery_attempt_pending_ = true;
-      LOG_INFO("Recovering an interrupted password change for [{}]",
-               client_id_);
+      LOG_INFO("Recovering an interrupted password change");
     }
     try_pending_identity = credential_recovery_in_progress_ &&
                            credential_recovery_attempt_pending_ &&
@@ -352,7 +351,8 @@ int GuiRuntime::CreateConnectionPeer() {
     peer_ = MiniRtcCreatePeer(&params_);
   }
   if (peer_) {
-    LOG_INFO("Create peer instance [{}] successful", client_id_);
+    LOG_INFO("Create peer instance successful");
+    LOG_DEBUG("Local client id: [{}]", client_id_);
 #ifdef _WIN32
     if (managed_host_frontend_) {
       if (!local_host_) local_host_ = std::make_shared<LocalHostChannel>(false);
@@ -378,9 +378,9 @@ int GuiRuntime::CreateConnectionPeer() {
     }
 #endif
     MiniRtcInit(peer_);
-    LOG_INFO("Peer [{}] init finish", client_id_);
+    LOG_INFO("Peer initialization finished");
   } else {
-    LOG_INFO("Create peer [{}] instance failed", client_id_);
+    LOG_INFO("Create peer instance failed");
   }
 
   if (0 == devices_.EnsureCaptureReady()) {
@@ -440,7 +440,7 @@ void GuiRuntime::HandleRecentConnections() {
               platform, direct ? &target : nullptr) == 0)
         reload_recent_connections_ = true;
       else
-        LOG_ERROR("[{}] Failed to save recent connection", props->remote_id_);
+        LOG_ERROR("Failed to save recent connection");
     }
   }
   if (session_cleanup_tasks_.empty() && reload_recent_connections_ && thumbnail_) {
diff --git a/apps/desktop/src/gui/runtime/peer_data_callbacks.cpp b/apps/desktop/src/gui/runtime/peer_data_callbacks.cpp
index 982d6149..a8a24db2 100644
--- a/apps/desktop/src/gui/runtime/peer_data_callbacks.cpp
+++ b/apps/desktop/src/gui/runtime/peer_data_callbacks.cpp
@@ -327,10 +327,11 @@ void PeerEventHandler::OnReceiveDataBuffer(
             bound_peer, wire_id.data(), wire_id.size(),
             static_cast<MiniRtcVideoQuality>(settings.quality), settings.frame_rate,
             static_cast<MiniRtcVideoDegradationPreference>(settings.preference)) == 0;
-    LOG_INFO("Video settings: peer={} source={} request={} quality={} fps={} "
-             "preference={} accepted={}",
-             remote_id, source_id, settings.request_id, settings.quality,
-             settings.frame_rate, settings.preference, remote_action.vs.accepted);
+    LOG_INFO(
+        "Video settings: source={} request={} quality={} fps={} preference={} "
+        "accepted={}",
+        source_id, settings.request_id, settings.quality, settings.frame_rate,
+        settings.preference, remote_action.vs.accepted);
     remote_action.type = ControlType::video_settings_status;
     const auto message = remote_action.to_json();
     PeerSendReliableDataFrameToPeer(bound_peer, message.data(), message.size(),
@@ -373,9 +374,9 @@ void PeerEventHandler::OnReceiveDataBuffer(
         source_id != runtime->keyboard_label_) return;
     if (runtime->remote_input_.Push(remote_id, remote_action) ==
         RemoteInputDispatcher::Result::overflow)
-      LOG_WARN("Remote input queue overflow: peer={}, clearing stale input and "
-               "releasing keys/buttons",
-               remote_id);
+      LOG_WARN(
+          "Remote input queue overflow: clearing stale input and releasing "
+          "keys/buttons");
     return;
   }
   if (remote_action.type == ControlType::audio_capture) {
@@ -500,7 +501,7 @@ void PeerEventHandler::OnReceiveDataBuffer(
         if (props->remote_host_name_.empty()) {
           props->remote_host_name_ = std::string(remote_action.i.host_name,
                                                  remote_action.i.host_name_size);
-          LOG_INFO("Remote hostname: [{}]", props->remote_host_name_);
+          LOG_DEBUG("Remote hostname: [{}]", props->remote_host_name_);
 
           for (int i = 0; i < remote_action.i.display_num; i++) {
             props->display_info_list_.push_back(
@@ -526,7 +527,7 @@ void PeerEventHandler::OnReceiveDataBuffer(
             runtime->codec_status_controllers_.erase(remote_id);
         }
       }
-      LOG_INFO("Remote hostname: [{}]", host_name);
+      LOG_DEBUG("Remote hostname: [{}]", host_name);
       if (source_id == runtime->control_data_label_) {
         runtime->SetControllerPrivacySupport(
             remote_id, remote_action.i.supports_privacy_screen);
@@ -602,7 +603,7 @@ InputOutcome GuiRuntime::ApplyRemoteInput(const std::string& remote_id,
     const auto now = std::chrono::steady_clock::now();
     auto [position, first] = last_remote_pointer_input_time_.try_emplace(remote_id, now);
     position->second = now;
-    if (first) LOG_INFO("Remote pointer input received: peer={}", remote_id);
+    if (first) LOG_INFO("Remote pointer input received");
   }
 
   if (remote_action.type == ControlType::mouse) {
diff --git a/apps/desktop/src/gui/runtime/peer_event_handler.cpp b/apps/desktop/src/gui/runtime/peer_event_handler.cpp
index c9d3b7e0..ab06bab9 100644
--- a/apps/desktop/src/gui/runtime/peer_event_handler.cpp
+++ b/apps/desktop/src/gui/runtime/peer_event_handler.cpp
@@ -76,7 +76,7 @@ void PeerEventHandler::SendClientInfo(MiniRtcPeerPtr* peer,
                                   {"platform", HostPlatformName(kClientPlatform)}};
   const std::string payload = message.dump();
   if (PeerSendSignalMessage(peer, payload.data(), payload.size()) != 0) {
-    LOG_WARN("[{}] failed to report client information", client_id);
+    LOG_WARN("Failed to report client information");
   }
 }
 
@@ -195,8 +195,7 @@ void PeerEventHandler::OnSignalMessage(const char* message, size_t size,
       const std::string response_user_id = j["user_id"].get<std::string>();
       if (!response_user_id.empty() &&
           response_user_id != runtime->client_id_) {
-        LOG_WARN("Ignore password change response for unexpected id [{}]",
-                 response_user_id);
+        LOG_WARN("Ignore password change response for unexpected device");
         return;
       }
     }
@@ -235,7 +234,7 @@ void PeerEventHandler::OnSignalStatus(MiniRtcSignalStatus status, const char* us
     } else if (MiniRtcSignalStatus::MiniRtcSignalConnected == status) {
       runtime->signal_connected_ = true;
       runtime->need_to_send_recent_connections_ = true;
-      LOG_INFO("[{}] connected to signal server", client_id);
+      LOG_INFO("Connected to signal server");
       SendClientInfo(runtime->peer_, client_id);
       std::lock_guard<std::mutex> lock(runtime->password_change_mutex_);
       if (runtime->credential_recovery_in_progress_) {
@@ -276,7 +275,7 @@ void PeerEventHandler::OnSignalStatus(MiniRtcSignalStatus status, const char* us
       props->signal_connected_ = false;
     } else if (MiniRtcSignalStatus::MiniRtcSignalConnected == status) {
       props->signal_connected_ = true;
-      LOG_INFO("[{}] connected to signal server", remote_id);
+      LOG_INFO("Connected to signal server");
       SendClientInfo(props->peer_, client_id);
     } else if (MiniRtcSignalStatus::MiniRtcSignalFailed == status) {
       props->signal_connected_ = false;
@@ -372,8 +371,7 @@ void PeerEventHandler::DispatchConnectionStatus(MiniRtcConnectionStatus status,
               MiniRtcSendReliableDataFrame(props->peer_, msg.data(), msg.size(),
                                     runtime->control_data_label_.c_str());
           if (ret != 0) {
-            LOG_WARN("[{}] host information send failed, ret={}", remote_id,
-                     ret);
+            LOG_WARN("Host information send failed, ret={}", ret);
           }
         }
 
@@ -579,7 +577,7 @@ void PeerEventHandler::OnNetStatusReport(
               sizeof(runtime->self_hosted_id_) - 1);
       runtime->self_hosted_id_[sizeof(runtime->self_hosted_id_) - 1] = '\0';
 
-      LOG_INFO("Use self-hosted client id [{}] and save to cache file", id);
+      LOG_DEBUG("Use self-hosted client id [{}] and save to cache file", id);
 
       runtime->settings_.PersistSelfHostedIdentity(client_id);
     } else {
@@ -600,7 +598,7 @@ void PeerEventHandler::OnNetStatusReport(
           ->client_id_with_password_[sizeof(runtime->client_id_with_password_) -
                                      1] = '\0';
 
-      LOG_INFO("Use client id [{}] and save id into cache file", id);
+      LOG_DEBUG("Use client id [{}] and save id into cache file", id);
       runtime->settings_.Save();
     }
 #if defined(__linux__) && !defined(__OHOS__)
@@ -673,7 +671,7 @@ std::string GuiRuntime::BuildHostInformation(bool advertise_trust) {
 void GuiRuntime::AnnounceHostCapabilities(const std::string& id) {
   const auto message = BuildHostInformation();
   const int ret = SendControllerData(id, message.data(), message.size(), control_data_label_.c_str());
-  if (ret != 0) LOG_WARN("[{}] host information send failed, ret={}", id, ret);
+  if (ret != 0) LOG_WARN("Host information send failed, ret={}", ret);
 }
 
 }  // namespace crossdesk
diff --git a/apps/desktop/src/gui/runtime/privacy_runtime.cpp b/apps/desktop/src/gui/runtime/privacy_runtime.cpp
index 615874d5..67be0578 100644
--- a/apps/desktop/src/gui/runtime/privacy_runtime.cpp
+++ b/apps/desktop/src/gui/runtime/privacy_runtime.cpp
@@ -38,8 +38,8 @@ void GuiRuntime::SetControllerPrivacySupport(const std::string& remote_id,
     if (found->second == MiniRtcConnectionStatus::MiniRtcConnectionConnecting ||
         found->second == MiniRtcConnectionStatus::MiniRtcConnectionGathering) {
       privacy_sessions_.RememberSupport(remote_id, supported);
-      LOG_INFO("Privacy: retained early controller capability, peer={}, supported={}",
-               remote_id, supported);
+      LOG_INFO("Privacy: retained early controller capability, supported={}",
+               supported);
     }
     return;
   }
@@ -68,7 +68,7 @@ void GuiRuntime::QueuePrivacyCommand(const std::string& remote_id,
       !privacy_sessions_.Supports(remote_id)) return;
   std::lock_guard lock(privacy_commands_mutex_);
   if (privacy_commands_.size() >= 32) return;
-  LOG_INFO("Privacy: queued controller command, peer={}, flag={}", remote_id,
+  LOG_INFO("Privacy: queued controller command, flag={}",
            static_cast<int>(command.flag));
   privacy_commands_.emplace_back(remote_id, command);
 }
@@ -149,7 +149,7 @@ void GuiRuntime::HandlePrivacy() {
                                           control_data_label_.c_str());
     if (result != 0) {
       sent = false;
-      LOG_WARN("Privacy status send failed, peer={}, ret={}", id, result);
+      LOG_WARN("Privacy status send failed, ret={}", result);
     }
   }
   if (sent) {
diff --git a/apps/desktop/src/log/rd_log.cpp b/apps/desktop/src/log/rd_log.cpp
index 306fa35e..f14248d8 100644
--- a/apps/desktop/src/log/rd_log.cpp
+++ b/apps/desktop/src/log/rd_log.cpp
@@ -50,8 +50,10 @@ void InitLogger(const std::string& log_dir, const std::string& logger_name) {
   if (g_logger) {
     if (directory != g_log_dir || logger_name != g_logger_name) {
       g_logger->warn(
-          "InitLogger called after logger initialized. Keeping logger {} in {}",
-          g_logger_name, g_log_dir);
+          "InitLogger called after logger initialized. Keeping existing "
+          "logger");
+      SPDLOG_LOGGER_DEBUG(g_logger, "Keeping logger {} in {}", g_logger_name,
+                          g_log_dir);
     }
     return;
   }
@@ -88,7 +90,8 @@ std::shared_ptr<spdlog::logger> get_logger() {
                           : spdlog::level::info);
     logger->flush_on(spdlog::level::info);
     spdlog::register_logger(logger);
-    logger->info("Logger initialized: path={}", file_sink->filename());
+    logger->info("Logger initialized");
+    SPDLOG_LOGGER_DEBUG(logger, "Log file: {}", file_sink->filename());
     g_logger = std::move(logger);
   });
 
diff --git a/apps/desktop/src/platform/linux/gui/tray/linux_tray.cpp b/apps/desktop/src/platform/linux/gui/tray/linux_tray.cpp
index 7e35bbee..19e7d62b 100644
--- a/apps/desktop/src/platform/linux/gui/tray/linux_tray.cpp
+++ b/apps/desktop/src/platform/linux/gui/tray/linux_tray.cpp
@@ -1193,7 +1193,7 @@ struct LinuxTrayImpl {
       icon_rgba.assign(pixels, pixels + static_cast<size_t>(width) *
                                            static_cast<size_t>(height) * 4);
       stbi_image_free(pixels);
-      LOG_INFO("Loaded Linux tray icon: {}", candidate.string());
+      LOG_DEBUG("Loaded Linux tray icon: {}", candidate.string());
       return true;
     }
 
diff --git a/apps/desktop/src/platform/windows/gui/application/local_host_application.cpp b/apps/desktop/src/platform/windows/gui/application/local_host_application.cpp
index 11fc8ef5..4c64d584 100644
--- a/apps/desktop/src/platform/windows/gui/application/local_host_application.cpp
+++ b/apps/desktop/src/platform/windows/gui/application/local_host_application.cpp
@@ -56,7 +56,9 @@ bool GuiRuntime::ForwardUserSessionData(const std::string& id,
       (user_stream || user_control || host_info || preview || audio)) {
     if (!local_host_->Send({{"op", "data"}, {"id", id}, {"epoch", epoch}, {"stream", stream},
         {"bytes", Json::binary(std::vector<uint8_t>(data, data + size))}})) {
-      LOG_WARN("Cannot forward user-session data for [{}] on {}; reconnecting local frontend", id, stream);
+      LOG_WARN(
+          "Cannot forward user-session data on {}; reconnecting local frontend",
+          stream);
       local_gui_ready_ = false;
       // Reset the mirrored sessions so an incomplete reliable stream fails
       // explicitly. Never fall through to file/clipboard handling as SYSTEM.
diff --git a/apps/desktop/src/platform/windows/gui/application/portable_service_integration.cpp b/apps/desktop/src/platform/windows/gui/application/portable_service_integration.cpp
index 89e785bf..1e597733 100644
--- a/apps/desktop/src/platform/windows/gui/application/portable_service_integration.cpp
+++ b/apps/desktop/src/platform/windows/gui/application/portable_service_integration.cpp
@@ -46,9 +46,7 @@ bool InstallServiceWithElevation() {
   std::error_code error;
   if (!std::filesystem::is_regular_file(service_path, error) ||
       !std::filesystem::is_regular_file(helper_path, error)) {
-    LOG_ERROR("Portable service install failed: service binaries missing, "
-              "service={}, helper={}",
-              service_path.string(), helper_path.string());
+    LOG_ERROR("Portable service install failed: service binaries missing");
     return false;
   }
 
diff --git a/apps/desktop/src/platform/windows/gui/runtime/windows_service_runtime.cpp b/apps/desktop/src/platform/windows/gui/runtime/windows_service_runtime.cpp
index be2a8cc5..64f3df3a 100644
--- a/apps/desktop/src/platform/windows/gui/runtime/windows_service_runtime.cpp
+++ b/apps/desktop/src/platform/windows/gui/runtime/windows_service_runtime.cpp
@@ -298,8 +298,7 @@ void GuiRuntime::HandleWindowsServiceIntegration() {
     if (managed_host_frontend_ && id.rfind("lan/", 0) != 0) continue;
     const int ret = SendControllerData(id, msg.data(), msg.size(),
                                        control_data_label_.c_str());
-    if (ret != 0)
-      LOG_WARN("Windows service status send failed, peer={}, ret={}", id, ret);
+    if (ret != 0) LOG_WARN("Windows service status send failed, ret={}", ret);
   }
 #endif
 }
diff --git a/apps/desktop/src/thumbnail/thumbnail.cpp b/apps/desktop/src/thumbnail/thumbnail.cpp
index 89ad58a6..555fe5c4 100644
--- a/apps/desktop/src/thumbnail/thumbnail.cpp
+++ b/apps/desktop/src/thumbnail/thumbnail.cpp
@@ -434,7 +434,7 @@ std::vector<std::filesystem::path> Thumbnail::FindThumbnailPath(
   std::vector<std::filesystem::path> thumbnails_path;
 
   if (!std::filesystem::is_directory(directory)) {
-    LOG_ERROR("No such directory [{}]", directory.string());
+    LOG_ERROR("Thumbnail directory does not exist");
     return thumbnails_path;
   }
 
diff --git a/apps/desktop/src/tools/file_transfer.cpp b/apps/desktop/src/tools/file_transfer.cpp
index 58bdf644..f26c758d 100644
--- a/apps/desktop/src/tools/file_transfer.cpp
+++ b/apps/desktop/src/tools/file_transfer.cpp
@@ -44,8 +44,8 @@ std::filesystem::path FileReceiver::GetDefaultDesktopPath() {
   std::error_code ec;
   std::filesystem::create_directories(desktop_path, ec);
   if (ec) {
-    LOG_ERROR("FileReceiver: failed to create desktop directory [{}]: {}",
-              desktop_path.string().c_str(), ec.message().c_str());
+    LOG_ERROR("FileReceiver: failed to create desktop directory: {}",
+              ec.message().c_str());
   }
 
   return desktop_path;
diff --git a/apps/desktop/src/version_checker/version_checker.cpp b/apps/desktop/src/version_checker/version_checker.cpp
index 83c94158..8a299aa5 100644
--- a/apps/desktop/src/version_checker/version_checker.cpp
+++ b/apps/desktop/src/version_checker/version_checker.cpp
@@ -98,9 +98,9 @@ void ConfigureLinuxCaCerts(httplib::Client* cli) {
   }
 
   cli->set_ca_cert_path(ca_file, ca_dir);
-  LOG_INFO("Configured version.json TLS CA bundle: file={}, dir={}",
-           ca_file.empty() ? "<none>" : ca_file,
-           ca_dir.empty() ? "<none>" : ca_dir);
+  LOG_DEBUG("Configured version.json TLS CA bundle: file={}, dir={}",
+            ca_file.empty() ? "<none>" : ca_file,
+            ca_dir.empty() ? "<none>" : ca_dir);
 }
 #endif
 
diff --git a/deps/submodules/minirtc b/deps/submodules/minirtc
index a42d4ee6..f0ef2c49 160000
--- a/deps/submodules/minirtc
+++ b/deps/submodules/minirtc
@@ -1 +1 @@
-Subproject commit a42d4ee62e916923c52fd919e98310a56f8a7c09
+Subproject commit f0ef2c49f145b6f4bfbb497ec089ee9e53687214