computer-use-ootb-internal 0.0.155__tar.gz → 0.0.157__tar.gz

{computer_use_ootb_internal-0.0.155 → computer_use_ootb_internal-0.0.157}/PKG-INFO

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

{computer_use_ootb_internal-0.0.155 → computer_use_ootb_internal-0.0.157}/pyproject.toml

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

{computer_use_ootb_internal-0.0.155 → computer_use_ootb_internal-0.0.157}/src/computer_use_ootb_internal/guard_service.py

@@ -776,30 +776,29 @@ class GuardService(win32serviceutil.ServiceFramework):
                 
                 # Command to run PowerShell, which then elevates the target executable
                 target_exe_unquoted = self.target_executable_path.strip('"')
-                target_exe_for_ps = target_exe_unquoted.replace("'", "''") # Escape single quotes for PS
+                target_exe_for_ps = target_exe_unquoted.replace("'", "''") # Escape single quotes for PS strings
                 target_exe_dir_for_ps = os.path.dirname(target_exe_unquoted).replace("'", "''")
                 
-                # Build the second argument for cmd.exe /K, as used in the successful test command
-                # Format: "<target_exe>" --port <port> --target_user ''<user>'' 
-                cmd_k_second_arg_content = f'""{target_exe_for_ps}"" --port {calculated_port} --target_user ''{user}'''
-                # Escape single quotes within this second arg for the outer PowerShell command string
-                cmd_k_second_arg_for_ps_command = cmd_k_second_arg_content.replace("'", "''")
-
-                # Build the full Start-Process command string matching the working test command
-                start_process_cmd = (
-                    f"Start-Process -FilePath cmd.exe "
-                    f"-ArgumentList @('/K', '{cmd_k_second_arg_for_ps_command}') "
-                    f"-WorkingDirectory '{target_exe_dir_for_ps}' "
-                    f"-Verb RunAs"
+                # Build the second argument for the @() array, ensuring inner quotes are correct for PS
+                # Format exactly like the working command: "<exe_path>" --port <port> --target_user ''<user>''
+                cmd_k_second_arg_content = f'""{target_exe_for_ps}"" --port {calculated_port} --target_user ''{user}''' # Use Python's f-string interpolation correctly
+                # Escape single quotes within this content for the PowerShell string literal ''
+                cmd_k_second_arg_for_ps_array_element = cmd_k_second_arg_content.replace("'", "''")
+
+                # Construct the PowerShell script block content
+                # Use $cmdArgs variable inside the script block for clarity and robustness
+                ps_script_block_content = (
+                    f"$cmdArgs = @('/K', '{cmd_k_second_arg_for_ps_array_element}'); "
+                    f"Start-Process -FilePath cmd.exe -ArgumentList $cmdArgs -WorkingDirectory '{target_exe_dir_for_ps}' -Verb RunAs"
                 )
 
-                # Launch powershell.exe directly, tell it to run the Start-Process command, and keep window open
-                # Use outer single quotes for -Command argument value to simplify inner quoting
-                # No need to escape inner double quotes when using outer single quotes
-                # Escape any literal single quotes within start_process_cmd itself (shouldn't be needed here but good practice)
-                start_process_cmd_escaped_for_single_quotes = start_process_cmd.replace("'", "''")
-                lpCommandLine = f'powershell.exe -NoProfile -ExecutionPolicy Bypass -NoExit -Command \'{start_process_cmd_escaped_for_single_quotes}\''
+                # Escape this content for the outer -Command '...' argument
+                # Only need to escape literal single quotes (replace ' with '')
+                ps_script_block_content_escaped = ps_script_block_content.replace("'", "''")
 
+                # Final command line using the script block { ... } syntax for -Command
+                lpCommandLine = f"powershell.exe -NoProfile -ExecutionPolicy Bypass -NoExit -Command '{{ {ps_script_block_content_escaped} }}'" # Note the double braces {{}} to escape them in the f-string
+                
                 lpApplicationName = None # Must be None if using lpCommandLine
                 cwd = os.path.dirname(target_exe_unquoted) if os.path.dirname(target_exe_unquoted) else None