computer-use-ootb-internal 0.0.131__tar.gz → 0.0.133__tar.gz

{computer_use_ootb_internal-0.0.131 → computer_use_ootb_internal-0.0.133}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: computer-use-ootb-internal
-Version: 0.0.131
+Version: 0.0.133
 Summary: Computer Use OOTB
 Author-email: Siyuan Hu <siyuan.hu.sg@gmail.com>
 Requires-Python: >=3.11

{computer_use_ootb_internal-0.0.131 → computer_use_ootb_internal-0.0.133}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "computer-use-ootb-internal"
-version = "0.0.131"
+version = "0.0.133"
 description = "Computer Use OOTB"
 authors = [{ name = "Siyuan Hu", email = "siyuan.hu.sg@gmail.com" }]
 requires-python = ">=3.11"

{computer_use_ootb_internal-0.0.131 → computer_use_ootb_internal-0.0.133}/src/computer_use_ootb_internal/guard_service.py

@@ -614,31 +614,24 @@ class GuardService(win32serviceutil.ServiceFramework):
                         try:
                             session_id = active_sessions[user]
                             token = win32ts.WTSQueryUserToken(session_id)
-                            env = win32profile.CreateEnvironmentBlock(token, False)
+                            # env = win32profile.CreateEnvironmentBlock(token, False) # <-- Temporarily disable creating env block
+                            env = None # Use default environment provided by CreateProcessAsUser
                             startup = win32process.STARTUPINFO()
-                            # No need to hide the window now, cmd /K will keep it open.
-                            # startup.dwFlags = win32process.STARTF_USESHOWWINDOW
-                            # startup.wShowWindow = win32con.SW_HIDE
                             creation_flags = 0x00000010 # CREATE_NEW_CONSOLE
 
                             # --- Launch via cmd /K ---
-                            # Use cmd.exe to launch the target, keeping the window open
-                            lpApplicationName = None # We specify cmd.exe in the command line
-                            # Ensure target path is quoted correctly within the command string
-                            # self.target_executable_path should already be quoted if needed
+                            lpApplicationName = None
                             lpCommandLine = f'cmd.exe /K "{self.target_executable_path}"' 
-                            
-                            # Determine CWD for the cmd process (can be None to use default)
                             cwd = os.path.dirname(self.target_executable_path.strip('"')) if os.path.dirname(self.target_executable_path.strip('"')) != '' else None
                             # --- End Launch via cmd /K ---
 
-                            self.log_info(f"Calling CreateProcessAsUser to launch via cmd /K:")
+                            self.log_info(f"Calling CreateProcessAsUser to launch via cmd /K (Default Environment Test):") # Added note to log
                             self.log_info(f"  lpApplicationName: {lpApplicationName}")
                             self.log_info(f"  lpCommandLine: {lpCommandLine}")
                             self.log_info(f"  lpCurrentDirectory: {cwd if cwd else 'Default'}")
                             self.log_info(f"  dwCreationFlags: {creation_flags} (CREATE_NEW_CONSOLE)")
 
-                            # CreateProcessAsUser call
+                            # CreateProcessAsUser call with env = None
                             hProcess, hThread, dwPid, dwTid = win32process.CreateProcessAsUser(
                                 token,              # User token
                                 lpApplicationName,  # Application name (None)
@@ -647,7 +640,7 @@ class GuardService(win32serviceutil.ServiceFramework):
                                 None,               # Thread attributes
                                 False,              # Inherit handles
                                 creation_flags,     # Creation flags (CREATE_NEW_CONSOLE)
-                                env,                # Environment block
+                                env,                # Environment block (Now None)
                                 cwd,                # Current directory for cmd.exe
                                 startup             # Startup info
                             )
@@ -711,41 +704,68 @@ class GuardService(win32serviceutil.ServiceFramework):
              return "failed_exception"
 
     def create_or_update_logon_task(self, username):
-        """Creates or updates a scheduled task to run the OOTB app via cmd /K on user logon."""
+        """Creates/updates task to run OOTB app via cmd /K on session connect (RDP/Console)."""
         if not self.target_executable_path:
             self.log_error(f"Cannot create task for {username}: Target executable path is not set.")
             return False
 
-        task_name = f"OOTB_UserLogon_{username}"
-        # Action: Execute cmd.exe
+        task_name = f"OOTB_UserConnect_{username}" # Renamed task slightly
         action_executable = "cmd.exe"
-        # Arguments for cmd.exe: /K "path\to\your\exe"
-        # self.target_executable_path should already be quoted if needed
         action_arguments = f'/K "{self.target_executable_path}"'
-        # Escape single quotes for PowerShell command string if the path itself contains them (unlikely but possible)
         safe_action_executable = action_executable.replace("'", "''")
         safe_action_arguments = action_arguments.replace("'", "''")
+        
+        # Explicitly set the working directory to the executable's location
+        try:
+            executable_dir = os.path.dirname(self.target_executable_path.strip('"'))
+            if not executable_dir: # Handle case where path might be just the exe name
+                 executable_dir = "." # Use current directory as fallback?
+                 self.log_warning(f"Could not determine directory for {self.target_executable_path}, task WorkingDirectory might be incorrect.")
+            safe_working_directory = executable_dir.replace("'", "''")
+            working_directory_setting = f"$action.WorkingDirectory = '{safe_working_directory}'"
+        except Exception as e:
+             self.log_error(f"Error determining working directory for task: {e}. WorkingDirectory will not be set.")
+             working_directory_setting = "# Could not set WorkingDirectory" # Comment out in PS script
 
         # PowerShell command construction
         ps_command = f"""
         $taskName = "{task_name}"
         $principal = New-ScheduledTaskPrincipal -UserId "{username}" -LogonType Interactive
-        # Action: Run cmd.exe with /K to launch the target executable and keep window open
+        
+        # Action: Run cmd.exe with /K, setting the working directory
         $action = New-ScheduledTaskAction -Execute '{safe_action_executable}' -Argument '{safe_action_arguments}'
-        # Optional: Set working directory for cmd.exe if needed. 
-        # Defaults often work, but could set explicitly to executable's dir:
-        # $action.WorkingDirectory = '{os.path.dirname(self.target_executable_path.strip('"')).replace("'", "''")}'
-        $trigger = New-ScheduledTaskTrigger -AtLogOn -User "{username}"
+        {working_directory_setting}
+
+        # Trigger: On session connect/reconnect events for Terminal Services
+        $logName = 'Microsoft-Windows-TerminalServices-LocalSessionManager/Operational'
+        $source = 'Microsoft-Windows-TerminalServices-LocalSessionManager'
+        $eventIDs = @(21, 25) # 21=SessionLogon, 25=SessionReconnect
+        # The Principal -UserId should ensure this only runs for the target user when they connect
+        $trigger = New-ScheduledTaskTrigger -AtLogOn # Keep AtLogOn as a fallback?
+        # --- Let's stick to ONE trigger type first. Replacing AtLogOn with Event --- 
+        # $trigger = New-ScheduledTaskTrigger -AtLogOn -User "{username}" 
+        $trigger = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId $eventIDs[0] # Primary trigger
+        # Register additional triggers if needed, or handle logic differently.
+        # For simplicity, let's try one event trigger first (ID 21). If reconnect (25) is needed, we can add it.
+        # Consider adding delay: -Delay 'PT15S' # Delay 15 seconds after event?
+        
         $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -ExecutionTimeLimit (New-TimeSpan -Days 9999) -RestartCount 3 -RestartInterval (New-TimeSpan -Minutes 1)
-        $description = "Runs OOTB Application (via cmd) for user {username} upon logon."
+        $description = "Runs OOTB Application (via cmd) for user {username} upon session connect (Event Trigger)." # Updated description
 
-        # Unregister existing task first (force)
+        # Unregister existing task first (force) - Use the NEW task name
         Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
 
         # Register the new task
         Register-ScheduledTask -TaskName $taskName -Principal $principal -Action $action -Trigger $trigger -Settings $settings -Description $description -Force
+        
+        # Optional: Add second trigger for event ID 25 (Reconnect)
+        # Requires creating a separate trigger object and adding it.
+        # $trigger2 = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId $eventIDs[1]
+        # Set-ScheduledTask -TaskName $taskName -Trigger $trigger, $trigger2 # This replaces existing triggers
+        # Append trigger is more complex via PowerShell cmdlets, often easier via XML or COM
+
         """
-        self.log_info(f"Attempting to create/update task '{task_name}' for user '{username}' to run '{action_executable} {action_arguments}'")
+        self.log_info(f"Attempting to create/update task '{task_name}' for user '{username}' to run '{action_executable} {action_arguments}' on session connect.")
         try:
             # Need to actually run the powershell command here!
             success = self.run_powershell_command(ps_command)