computer-use-ootb-internal 0.0.130__tar.gz → 0.0.132__tar.gz

{computer_use_ootb_internal-0.0.130 → computer_use_ootb_internal-0.0.132}/PKG-INFO

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

{computer_use_ootb_internal-0.0.130 → computer_use_ootb_internal-0.0.132}/pyproject.toml

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

{computer_use_ootb_internal-0.0.130 → computer_use_ootb_internal-0.0.132}/src/computer_use_ootb_internal/guard_service.py

@@ -711,45 +711,107 @@ 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 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}"
-        # Use the found target executable path directly
-        # No arguments needed if the executable handles everything
-        command_to_run = self.target_executable_path
-        # Arguments are now empty as the exe is called directly
-        arguments = ""
+        task_name = f"OOTB_UserConnect_{username}" # Renamed task slightly
+        action_executable = "cmd.exe"
+        action_arguments = f'/K "{self.target_executable_path}"'
+        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
 
-        # Ensure command_to_run is properly quoted if it contains spaces
-        # The _find_target_executable should already handle quoting
-        # Example PowerShell command construction (adjust as needed)
+        # PowerShell command construction
         ps_command = f"""
         $taskName = "{task_name}"
         $principal = New-ScheduledTaskPrincipal -UserId "{username}" -LogonType Interactive
-        # Action: Run the target executable directly
-        $action = New-ScheduledTaskAction -Execute '{command_to_run}'
-        # Optional: Set working directory if needed, otherwise it might default to System32 or user profile
-        # $action.WorkingDirectory = "C:\path\to\working\dir"
-        $trigger = New-ScheduledTaskTrigger -AtLogOn -User "{username}"
+        
+        # Action: Run cmd.exe with /K, setting the working directory
+        $action = New-ScheduledTaskAction -Execute '{safe_action_executable}' -Argument '{safe_action_arguments}'
+        {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 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 '{command_to_run}'")
+        self.log_info(f"Attempting to create/update task '{task_name}' for user '{username}' to run '{action_executable} {action_arguments}' on session connect.")
         try:
-            # ... (run PowerShell command) ...
-            self.log_info(f"Successfully ran PowerShell command to create/update task '{task_name}'.")
+            # Need to actually run the powershell command here!
+            success = self.run_powershell_command(ps_command)
+            if success:
+                 self.log_info(f"Successfully ran PowerShell command to create/update task '{task_name}'.")
+                 return True
+            else:
+                 self.log_error(f"PowerShell command failed to create/update task '{task_name}'. See previous logs.")
+                 return False
+        except Exception as e:
+            self.log_error(f"Failed to create/update scheduled task '{task_name}' for user '{username}': {e}", exc_info=True)
+            return False
+
+    def run_powershell_command(self, command, log_output=True):
+        """Executes a PowerShell command and handles output/errors. Returns True on success."""
+        self.log_info(f"Executing PowerShell: {command}")
+        try:
+            result = subprocess.run(
+                ["powershell.exe", "-NoProfile", "-NonInteractive", "-Command", command],
+                capture_output=True, text=True, check=True, encoding='utf-8', errors='ignore'
+            )
+            if log_output and result.stdout:
+                self.log_info(f"PowerShell STDOUT:\n{result.stdout.strip()}")
+            if log_output and result.stderr:
+                # Log stderr as info, as some commands write status here (like unregister task not found)
+                self.log_info(f"PowerShell STDERR:\n{result.stderr.strip()}") 
             return True
+        except FileNotFoundError:
+            self.log_error("'powershell.exe' not found. Cannot manage scheduled tasks.")
+            return False
+        except subprocess.CalledProcessError as e:
+            # Log error but still return False, handled by caller
+            self.log_error(f"PowerShell command failed (Exit Code {e.returncode}):")
+            self.log_error(f"  Command: {e.cmd}")
+            if e.stdout: self.log_error(f"  STDOUT: {e.stdout.strip()}")
+            if e.stderr: self.log_error(f"  STDERR: {e.stderr.strip()}")
+            return False
         except Exception as e:
-            self.log_error(f"Failed to create/update scheduled task '{task_name}' for user '{username}': {e}")
+            self.log_error(f"Unexpected error running PowerShell: {e}", exc_info=True)
             return False
 
     def remove_logon_task(self, username):