@midscene/computer 1.10.7 → 1.10.8-beta-20260723091821.0

package/dist/es/cli.mjs

@@ -750,7 +750,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
     }
     async healthCheck() {
         console.log('[HealthCheck] Starting health check...');
-        console.log("[HealthCheck] @midscene/computer v1.10.7");
+        console.log("[HealthCheck] @midscene/computer v1.10.8-beta-20260723091821.0");
         console.log('[HealthCheck] Taking screenshot...');
         const screenshotTimeout = 15000;
         let timeoutId;
@@ -2148,7 +2148,7 @@ class ComputerMidsceneTools extends BaseMidsceneTools {
 const tools = new ComputerMidsceneTools();
 runToolsCLI(tools, 'midscene-computer', {
     stripPrefix: 'computer_',
-    version: "1.10.7",
+    version: "1.10.8-beta-20260723091821.0",
     extraCommands: createReportCliCommands()
 }).catch((e)=>{
     process.exit(reportCLIError(e));

package/dist/es/index.mjs

@@ -750,7 +750,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
     }
     async healthCheck() {
         console.log('[HealthCheck] Starting health check...');
-        console.log("[HealthCheck] @midscene/computer v1.10.7");
+        console.log("[HealthCheck] @midscene/computer v1.10.8-beta-20260723091821.0");
         console.log('[HealthCheck] Taking screenshot...');
         const screenshotTimeout = 15000;
         let timeoutId;
@@ -2189,7 +2189,7 @@ class ComputerMidsceneTools extends BaseMidsceneTools {
     }
 }
 function version() {
-    const currentVersion = "1.10.7";
+    const currentVersion = "1.10.8-beta-20260723091821.0";
     console.log(`@midscene/computer v${currentVersion}`);
     return currentVersion;
 }

package/dist/lib/cli.js

@@ -776,7 +776,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
     }
     async healthCheck() {
         console.log('[HealthCheck] Starting health check...');
-        console.log("[HealthCheck] @midscene/computer v1.10.7");
+        console.log("[HealthCheck] @midscene/computer v1.10.8-beta-20260723091821.0");
         console.log('[HealthCheck] Taking screenshot...');
         const screenshotTimeout = 15000;
         let timeoutId;
@@ -2175,7 +2175,7 @@ class ComputerMidsceneTools extends base_tools_namespaceObject.BaseMidsceneTools
 const tools = new ComputerMidsceneTools();
 (0, cli_namespaceObject.runToolsCLI)(tools, 'midscene-computer', {
     stripPrefix: 'computer_',
-    version: "1.10.7",
+    version: "1.10.8-beta-20260723091821.0",
     extraCommands: (0, core_namespaceObject.createReportCliCommands)()
 }).catch((e)=>{
     process.exit((0, cli_namespaceObject.reportCLIError)(e));

package/dist/lib/index.js

@@ -802,7 +802,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
     }
     async healthCheck() {
         console.log('[HealthCheck] Starting health check...');
-        console.log("[HealthCheck] @midscene/computer v1.10.7");
+        console.log("[HealthCheck] @midscene/computer v1.10.8-beta-20260723091821.0");
         console.log('[HealthCheck] Taking screenshot...');
         const screenshotTimeout = 15000;
         let timeoutId;
@@ -2247,7 +2247,7 @@ class ComputerMidsceneTools extends base_tools_namespaceObject.BaseMidsceneTools
 }
 const env_namespaceObject = require("@midscene/shared/env");
 function version() {
-    const currentVersion = "1.10.7";
+    const currentVersion = "1.10.8-beta-20260723091821.0";
     console.log(`@midscene/computer v${currentVersion}`);
     return currentVersion;
 }

package/native/rdp/CMakeLists.txt

@@ -66,16 +66,32 @@ if(BUILD_TESTING)
     tests/connection_policy_test.cpp
   )
 
+  add_executable(
+    rdp-session-policy-test
+    tests/session_policy_test.cpp
+  )
+
   target_include_directories(
     rdp-connection-policy-test
     PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/include
   )
 
+  target_include_directories(
+    rdp-session-policy-test
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+  )
+
   add_test(
     NAME rdp-connection-policy-test
     COMMAND rdp-connection-policy-test
   )
+
+  add_test(
+    NAME rdp-session-policy-test
+    COMMAND rdp-session-policy-test
+  )
 endif()
 
 if(APPLE)

package/native/rdp/include/rdp_helper_session.hpp

@@ -77,6 +77,9 @@ class FreeRdpSessionTransport final : public SessionTransport {
   // Records that at least one paint has reached the local framebuffer and
   // wakes Connect().
   void MarkFramePainted(std::optional<RawFrame> first_frame = std::nullopt);
+  // Records a framebuffer update even when it is too blank or uniform to count
+  // as the first informative frame.
+  void MarkFramebufferUpdated();
   bool HasFramePainted() const;
   BOOL CallOriginalEndPaint(rdpContext* context);
   // Mark the session as no longer active and wake any first-frame waiter.
@@ -98,6 +101,9 @@ class FreeRdpSessionTransport final : public SessionTransport {
   // RDP session exposes a zero-filled (all black) buffer until the first paint
   // is processed, so screenshots taken before this is > 0 would be blank.
   std::atomic<uint64_t> frames_painted_{0};
+  // Number of valid framebuffer updates observed before the first informative
+  // frame. This distinguishes a silent desktop from a blank or locked one.
+  std::atomic<uint64_t> framebuffer_updates_{0};
   // Tracks whether the session is still alive while Connect() waits for the
   // first frame, so a drop during that window wakes the wait immediately
   // instead of stalling until the timeout.
@@ -114,7 +120,9 @@ class FreeRdpSessionTransport final : public SessionTransport {
 
   void ResetStateLocked();
   void ClearSessionErrorLocked();
-  void SetSessionError(std::string message, std::string code);
+  bool RecordEventLoopFailureIfActive(bool operation_failed,
+                                      bool disconnect_requested,
+                                      std::string message);
   std::string LastFreeRdpErrorLocked() const;
   void StopInstance(bool preserve_session_error);
   void EventLoop();

package/native/rdp/include/rdp_helper_session_policy.hpp

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <string_view>
+
+namespace midscene::rdp {
+
+constexpr bool ShouldReportEventLoopFailure(bool operation_failed,
+                                            bool disconnect_requested,
+                                            bool session_running,
+                                            bool session_connected) noexcept {
+  return (operation_failed || disconnect_requested) && session_running &&
+         session_connected;
+}
+
+inline std::string BuildFirstFrameTimeoutMessage(
+    uint64_t framebuffer_updates,
+    std::string_view failure_reason) {
+  std::string message;
+  if (framebuffer_updates == 0) {
+    message =
+        "Connected to the RDP server but received no desktop frame within "
+        "timeout; the remote desktop may be blank or locked";
+  } else {
+    message = "Connected to the RDP server and received " +
+              std::to_string(framebuffer_updates) + " framebuffer update";
+    if (framebuffer_updates != 1) {
+      message += "s";
+    }
+    message +=
+        ", but none passed the informative-frame check within timeout; the "
+        "remote desktop may be blank, locked, or still loading";
+  }
+  if (!failure_reason.empty()) {
+    message += " (" + std::string(failure_reason) + ")";
+  }
+  return message;
+}
+
+}  // namespace midscene::rdp

package/native/rdp/src/session.cpp

@@ -37,6 +37,7 @@
 #include <winpr/synch.h>
 
 #include "rdp_helper_connection_policy.hpp"
+#include "rdp_helper_session_policy.hpp"
 
 namespace midscene::rdp {
 
@@ -512,6 +513,7 @@ BOOL MidsceneEndPaint(rdpContext* context) {
     ok = typed_context->owner->CallOriginalEndPaint(context);
     const bool already_painted = typed_context->owner->HasFramePainted();
     if (ok && framebuffer_invalidated) {
+      typed_context->owner->MarkFramebufferUpdated();
       if (already_painted) {
         typed_context->owner->MarkFramePainted();
       } else if (auto first_frame = CaptureInformativeFramebuffer(context);
@@ -978,6 +980,7 @@ ConnectionInfo FreeRdpSessionTransport::Connect(const ConnectionConfig& config)
     mouse_x_ = 0;
     mouse_y_ = 0;
     frames_painted_.store(0, std::memory_order_relaxed);
+    framebuffer_updates_.store(0, std::memory_order_relaxed);
     {
       std::lock_guard<std::mutex> frame_lock(frame_mutex_);
       first_frame_.reset();
@@ -1061,18 +1064,15 @@ ConnectionInfo FreeRdpSessionTransport::Connect(const ConnectionConfig& config)
 
   if (!painted) {
     std::string reason;
+    const uint64_t framebuffer_updates =
+        framebuffer_updates_.load(std::memory_order_relaxed);
     {
       std::lock_guard<std::mutex> lock(mutex_);
       reason = connected_ ? std::string() : LastFreeRdpErrorLocked();
     }
     StopInstance(false);
-    std::string message =
-        "Connected to the RDP server but received no desktop frame within "
-        "timeout; the remote desktop may be blank or locked";
-    if (!reason.empty()) {
-      message += " (" + reason + ")";
-    }
-    throw std::runtime_error(message);
+    throw std::runtime_error(
+        BuildFirstFrameTimeoutMessage(framebuffer_updates, reason));
   }
 
   return info;
@@ -1357,6 +1357,7 @@ void FreeRdpSessionTransport::ResetStateLocked() {
   connected_ = false;
   gdi_initialized_ = false;
   frames_painted_.store(0, std::memory_order_relaxed);
+  framebuffer_updates_.store(0, std::memory_order_relaxed);
   {
     std::lock_guard<std::mutex> frame_lock(frame_mutex_);
     first_frame_.reset();
@@ -1402,6 +1403,10 @@ void FreeRdpSessionTransport::MarkFramePainted(
   frame_cv_.notify_all();
 }
 
+void FreeRdpSessionTransport::MarkFramebufferUpdated() {
+  framebuffer_updates_.fetch_add(1, std::memory_order_relaxed);
+}
+
 bool FreeRdpSessionTransport::HasFramePainted() const {
   return frames_painted_.load(std::memory_order_relaxed) > 0;
 }
@@ -1418,12 +1423,22 @@ void FreeRdpSessionTransport::ClearSessionErrorLocked() {
   last_error_.reset();
 }
 
-void FreeRdpSessionTransport::SetSessionError(std::string message, std::string code) {
+bool FreeRdpSessionTransport::RecordEventLoopFailureIfActive(
+    bool operation_failed,
+    bool disconnect_requested,
+    std::string message) {
   std::lock_guard<std::mutex> lock(mutex_);
+  if (!ShouldReportEventLoopFailure(operation_failed, disconnect_requested,
+                                    running_, connected_)) {
+    return false;
+  }
   last_error_ = ErrorPayload{
-      std::move(code),
+      "session_lost",
       message.empty() ? "RDP session was lost" : std::move(message),
   };
+  connected_ = false;
+  running_ = false;
+  return true;
 }
 
 std::string FreeRdpSessionTransport::LastFreeRdpErrorLocked() const {
@@ -1522,11 +1537,9 @@ void FreeRdpSessionTransport::EventLoop() {
     const DWORD count = freerdp_get_event_handles(
         instance->context, handles, static_cast<DWORD>(std::size(handles)));
     if (count == 0) {
-      SetSessionError("freerdp_get_event_handles returned no handles", "session_lost");
-      {
-        std::lock_guard<std::mutex> lock(mutex_);
-        connected_ = false;
-        running_ = false;
+      if (!RecordEventLoopFailureIfActive(
+              true, false, "freerdp_get_event_handles returned no handles")) {
+        return;
       }
       std::fprintf(stderr,
                    "RDP session event loop failed: freerdp_get_event_handles returned no handles\n");
@@ -1537,12 +1550,10 @@ void FreeRdpSessionTransport::EventLoop() {
 
     const DWORD status = WaitForMultipleObjects(count, handles, FALSE, 100);
     if (status == WAIT_FAILED) {
-      SetSessionError("WaitForMultipleObjects failed in the RDP event loop",
-                      "session_lost");
-      {
-        std::lock_guard<std::mutex> lock(mutex_);
-        connected_ = false;
-        running_ = false;
+      if (!RecordEventLoopFailureIfActive(
+              true, false,
+              "WaitForMultipleObjects failed in the RDP event loop")) {
+        return;
       }
       std::fprintf(stderr,
                    "RDP session event loop failed: WaitForMultipleObjects failed\n");
@@ -1568,11 +1579,9 @@ void FreeRdpSessionTransport::EventLoop() {
     }
 
     if (!ok || should_disconnect) {
-      SetSessionError(failure_reason, "session_lost");
-      {
-        std::lock_guard<std::mutex> lock(mutex_);
-        connected_ = false;
-        running_ = false;
+      if (!RecordEventLoopFailureIfActive(!ok, should_disconnect,
+                                          failure_reason)) {
+        return;
       }
       std::fprintf(stderr, "RDP session event loop failed: %s\n",
                    failure_reason.c_str());

package/native/rdp/tests/session_policy_test.cpp

@@ -0,0 +1,77 @@
+#include <iostream>
+#include <string>
+#include <string_view>
+
+#include "rdp_helper_session_policy.hpp"
+
+namespace {
+
+bool ExpectBool(std::string_view name, bool actual, bool expected) {
+  if (actual == expected) {
+    return true;
+  }
+
+  std::cerr << name << ": expected " << expected << ", actual=" << actual
+            << '\n';
+  return false;
+}
+
+bool ExpectMessage(std::string_view name,
+                   const std::string& actual,
+                   std::string_view expected) {
+  if (actual == expected) {
+    return true;
+  }
+
+  std::cerr << name << ": expected \"" << expected << "\", actual=\""
+            << actual << "\"\n";
+  return false;
+}
+
+}  // namespace
+
+int main() {
+  bool passed = true;
+  passed &= ExpectBool(
+      "active transport failure",
+      midscene::rdp::ShouldReportEventLoopFailure(true, false, true, true),
+      true);
+  passed &= ExpectBool(
+      "intentional shutdown transport failure",
+      midscene::rdp::ShouldReportEventLoopFailure(true, false, false, false),
+      false);
+  passed &= ExpectBool(
+      "active server disconnect",
+      midscene::rdp::ShouldReportEventLoopFailure(false, true, true, true),
+      true);
+  passed &= ExpectBool(
+      "healthy active session",
+      midscene::rdp::ShouldReportEventLoopFailure(false, false, true, true),
+      false);
+
+  passed &= ExpectMessage(
+      "no framebuffer updates",
+      midscene::rdp::BuildFirstFrameTimeoutMessage(0, ""),
+      "Connected to the RDP server but received no desktop frame within "
+      "timeout; the remote desktop may be blank or locked");
+  passed &= ExpectMessage(
+      "non-informative framebuffer updates",
+      midscene::rdp::BuildFirstFrameTimeoutMessage(3, ""),
+      "Connected to the RDP server and received 3 framebuffer updates, but "
+      "none passed the informative-frame check within timeout; the remote "
+      "desktop may be blank, locked, or still loading");
+  passed &= ExpectMessage(
+      "single non-informative framebuffer update",
+      midscene::rdp::BuildFirstFrameTimeoutMessage(1, ""),
+      "Connected to the RDP server and received 1 framebuffer update, but "
+      "none passed the informative-frame check within timeout; the remote "
+      "desktop may be blank, locked, or still loading");
+  passed &= ExpectMessage(
+      "session loss reason",
+      midscene::rdp::BuildFirstFrameTimeoutMessage(
+          0, "ERRCONNECT_CONNECT_TRANSPORT_FAILED"),
+      "Connected to the RDP server but received no desktop frame within "
+      "timeout; the remote desktop may be blank or locked "
+      "(ERRCONNECT_CONNECT_TRANSPORT_FAILED)");
+  return passed ? 0 : 1;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/computer",
-  "version": "1.10.7",
+  "version": "1.10.8-beta-20260723091821.0",
   "description": "Midscene.js Computer Desktop Automation",
   "license": "MIT",
   "repository": {
@@ -33,8 +33,8 @@
     "@computer-use/libnut": "^4.2.0",
     "clipboardy": "^4.0.0",
     "screenshot-desktop": "^1.15.3",
-    "@midscene/core": "1.10.7",
-    "@midscene/shared": "1.10.7"
+    "@midscene/core": "1.10.8-beta-20260723091821.0",
+    "@midscene/shared": "1.10.8-beta-20260723091821.0"
   },
   "optionalDependencies": {
     "node-mac-permissions": "2.5.0"