computer-use-ootb-internal 0.0.148__tar.gz → 0.0.150__tar.gz

{computer_use_ootb_internal-0.0.148 → computer_use_ootb_internal-0.0.150}/PKG-INFO

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

{computer_use_ootb_internal-0.0.148 → computer_use_ootb_internal-0.0.150}/pyproject.toml

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

{computer_use_ootb_internal-0.0.148 → computer_use_ootb_internal-0.0.150}/src/computer_use_ootb_internal/guard_service.py

@@ -771,27 +771,30 @@ class GuardService(win32serviceutil.ServiceFramework):
                 token = win32ts.WTSQueryUserToken(session_id)
                 env = win32profile.CreateEnvironmentBlock(token, False)
                 startup = win32process.STARTUPINFO()
-                creation_flags = win32con.CREATE_NO_WINDOW # Hide intermediate powershell/cmd window if possible
+                # Use CREATE_NEW_CONSOLE to make the PS window visible and potentially the UAC prompt
+                creation_flags = win32con.CREATE_NEW_CONSOLE
                 
                 # Command to run PowerShell, which then elevates the target executable
-                target_exe_for_ps = self.target_executable_path.strip('"').replace("'", "''") # Path for PS string, escape single quotes
-                arguments_for_ps = f"--port {calculated_port} --target_user '{user}'" # Pass calculated port and target user
+                target_exe_unquoted = self.target_executable_path.strip('"')
+                target_exe_for_ps = target_exe_unquoted.replace("'", "''") # Escape single quotes for PS
+                # Build arguments as a PowerShell array string
+                arguments_for_ps_array = f'@("--port", "{calculated_port}", "--target_user", "\'{user}\'")' 
+
                 powershell_command = (
                     f'Start-Process -FilePath "{target_exe_for_ps}" '
-                    f'-ArgumentList "{arguments_for_ps}" -Verb RunAs'
+                    f'-ArgumentList {arguments_for_ps_array} -Verb RunAs' # Pass the array syntax directly
                 )
-                # Escape the command for cmd.exe /c
-                escaped_ps_command = powershell_command.replace('"', '\\"')
-                
-                # Use cmd /c to launch powershell - this seems more reliable with CreateProcessAsUser sometimes
-                # lpCommandLine = f'powershell.exe -ExecutionPolicy Bypass -NoProfile -Command "{powershell_command}"'
-                lpCommandLine = f'cmd.exe /c "powershell.exe -ExecutionPolicy Bypass -NoProfile -Command \\"{escaped_ps_command}\\""'
+                # Launch powershell.exe directly, tell it to run the Start-Process command, and keep window open
+                # Need to escape quotes within the -Command argument
+                escaped_ps_command_for_command_arg = powershell_command.replace('"', '`"' ) # Use backtick escaping for PS command arg
+
+                lpCommandLine = f'powershell.exe -NoProfile -ExecutionPolicy Bypass -NoExit -Command "& {{{escaped_ps_command_for_command_arg}}}"'
 
                 lpApplicationName = None # Must be None if using lpCommandLine
-                cwd = os.path.dirname(target_exe_for_ps) if os.path.dirname(target_exe_for_ps) else None
+                cwd = os.path.dirname(target_exe_unquoted) if os.path.dirname(target_exe_unquoted) else None
 
                 # Log details before call
-                self.log_info(f"Internal trigger: Calling CreateProcessAsUser:")
+                self.log_info(f"Internal trigger: Launching PowerShell directly for elevation:")
                 self.log_info(f"  lpCommandLine: {lpCommandLine}")
                 self.log_info(f"  lpCurrentDirectory: {cwd if cwd else 'Default'}")