From 342ab77f441e3abb582e06c60467b3ad32469ef1 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Sat, 2 May 2026 09:08:14 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20recovery=20config=20=D0=B8=20=D1=80=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=80=20RDP=20sessions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../windows/hardening-recovery.ps1              |  1 +
 .../windows/worktime-session-collector.ps1      | 17 +++++++++++++----
 windows/hardening-recovery.ps1                  |  1 +
 windows/worktime-session-collector.ps1          | 17 +++++++++++++----
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1 b/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1
index 05632e6..95afd22 100755
--- a/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1
+++ b/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1
@@ -116,6 +116,7 @@ $config = New-ActivityWatchDeploymentConfig `
     -LogsRoot $effectiveLogsRoot `
     -CollectorScript $effectiveCollector `
     -EndpointCollectorScript $effectiveEndpointCollector `
+    -SessionCollectorScript $effectiveSessionCollector `
     -RulesPath $effectiveRules `
     -PolicyPath $effectivePolicy `
     -PollSeconds $effectivePollSeconds `
diff --git a/install-kit-awindows-20260427-211240/windows/worktime-session-collector.ps1 b/install-kit-awindows-20260427-211240/windows/worktime-session-collector.ps1
index 214be90..3750b6a 100644
--- a/install-kit-awindows-20260427-211240/windows/worktime-session-collector.ps1
+++ b/install-kit-awindows-20260427-211240/windows/worktime-session-collector.ps1
@@ -70,16 +70,25 @@ function Get-SessionRecords {
                 continue
             }
 
+            $sessionName = ''
+            $sessionIdIndex = 2
+            if ($parts[1] -match '^\d+$') {
+                $sessionIdIndex = 1
+            }
+            else {
+                $sessionName = $parts[1]
+            }
+
             $sessionId = 0
-            if ($parts[2] -match '^\d+$') {
-                $sessionId = [int]$parts[2]
+            if ($parts[$sessionIdIndex] -match '^\d+$') {
+                $sessionId = [int]$parts[$sessionIdIndex]
             }
 
             $records += [pscustomobject]@{
                 username    = $parts[0]
-                sessionName = $parts[1]
+                sessionName = $sessionName
                 sessionId   = $sessionId
-                state       = $parts[3]
+                state       = $parts[$sessionIdIndex + 1]
             }
         }
     }
diff --git a/windows/hardening-recovery.ps1 b/windows/hardening-recovery.ps1
index 05632e6..95afd22 100755
--- a/windows/hardening-recovery.ps1
+++ b/windows/hardening-recovery.ps1
@@ -116,6 +116,7 @@ $config = New-ActivityWatchDeploymentConfig `
     -LogsRoot $effectiveLogsRoot `
     -CollectorScript $effectiveCollector `
     -EndpointCollectorScript $effectiveEndpointCollector `
+    -SessionCollectorScript $effectiveSessionCollector `
     -RulesPath $effectiveRules `
     -PolicyPath $effectivePolicy `
     -PollSeconds $effectivePollSeconds `
diff --git a/windows/worktime-session-collector.ps1 b/windows/worktime-session-collector.ps1
index 214be90..3750b6a 100644
--- a/windows/worktime-session-collector.ps1
+++ b/windows/worktime-session-collector.ps1
@@ -70,16 +70,25 @@ function Get-SessionRecords {
                 continue
             }
 
+            $sessionName = ''
+            $sessionIdIndex = 2
+            if ($parts[1] -match '^\d+$') {
+                $sessionIdIndex = 1
+            }
+            else {
+                $sessionName = $parts[1]
+            }
+
             $sessionId = 0
-            if ($parts[2] -match '^\d+$') {
-                $sessionId = [int]$parts[2]
+            if ($parts[$sessionIdIndex] -match '^\d+$') {
+                $sessionId = [int]$parts[$sessionIdIndex]
             }
 
             $records += [pscustomobject]@{
                 username    = $parts[0]
-                sessionName = $parts[1]
+                sessionName = $sessionName
                 sessionId   = $sessionId
-                state       = $parts[3]
+                state       = $parts[$sessionIdIndex + 1]
             }
         }
     }