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

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

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

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

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

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

@@ -616,27 +616,39 @@ class GuardService(win32serviceutil.ServiceFramework):
                             token = win32ts.WTSQueryUserToken(session_id)
                             env = win32profile.CreateEnvironmentBlock(token, False)
                             startup = win32process.STARTUPINFO()
-                            startup.dwFlags = win32process.STARTF_USESHOWWINDOW
-                            startup.wShowWindow = win32con.SW_HIDE
+                            # 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
 
-                            self.log_info(f"Calling CreateProcessAsUser:")
-                            self.log_info(f"  lpApplicationName: {self.target_executable_path}")
-                            self.log_info(f"  lpCommandLine: {None}")
-                            self.log_info(f"  lpCurrentDirectory: {os.path.dirname(self.target_executable_path) if os.path.dirname(self.target_executable_path) != '' else 'Default'}")
+                            # --- 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
+                            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"  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
                             hProcess, hThread, dwPid, dwTid = win32process.CreateProcessAsUser(
                                 token,              # User token
-                                self.target_executable_path,  # Application name (the executable path)
-                                None,               # Command line (None since it's in app name)
+                                lpApplicationName,  # Application name (None)
+                                lpCommandLine,      # Command line (cmd.exe /K "...")
                                 None,               # Process attributes
                                 None,               # Thread attributes
                                 False,              # Inherit handles
                                 creation_flags,     # Creation flags (CREATE_NEW_CONSOLE)
                                 env,                # Environment block
-                                os.path.dirname(self.target_executable_path) if os.path.dirname(self.target_executable_path) != '' else None, # Current directory
+                                cwd,                # Current directory for cmd.exe
                                 startup             # Startup info
                             )
 
@@ -699,31 +711,33 @@ 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 or updates a scheduled task to run the OOTB app via cmd /K on user logon."""
         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 = ""
-
-        # 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)
+        # Action: Execute cmd.exe
+        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("'", "''")
+
+        # 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"
+        # Action: Run cmd.exe with /K to launch the target executable and keep window open
+        $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}"
         $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 logon."
 
         # Unregister existing task first (force)
         Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
@@ -731,13 +745,46 @@ class GuardService(win32serviceutil.ServiceFramework):
         # Register the new task
         Register-ScheduledTask -TaskName $taskName -Principal $principal -Action $action -Trigger $trigger -Settings $settings -Description $description -Force
         """
-        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}'")
         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):