computer-use-ootb-internal 0.0.153__py3-none-any.whl → 0.0.154__py3-none-any.whl

computer_use_ootb_internal/guard_service.py

@@ -777,19 +777,31 @@ 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
-                # Ensure username is single-quoted within the argument string for the target app
-                arguments_for_ps = f"--port {calculated_port} --target_user '{user}'" 
+                target_exe_dir_for_ps = os.path.dirname(target_exe_unquoted).replace("'", "''")
+                
+                # Build the arguments for the target executable itself
+                target_arguments = f'--port {calculated_port} --target_user \'{user}\'' # Single quotes around user
+
+                # Build the arguments for cmd.exe /K
+                # Needs outer quotes for /K, inner quotes around exe path
+                # Format: /K ""C:\Path\To\Exe" --arg1 val1 --arg2 'val2'"
+                cmd_k_arguments = f'/K """{target_exe_for_ps}"" {target_arguments}"'
+                # Escape inner quotes for PowerShell string evaluation if needed, though often works directly
+                cmd_k_arguments_escaped = cmd_k_arguments.replace('"', '""' ) # Double up double quotes for PS
 
-                # Build the Start-Process command string, using escaped double quotes for paths/args
+                # Build the Start-Process command to launch cmd.exe elevated
                 start_process_cmd = (
-                    f'Start-Process -FilePath \"{target_exe_for_ps}\" '
-                    f'-ArgumentList \"{arguments_for_ps}\" -Verb RunAs'
+                    f'Start-Process -FilePath cmd.exe '
+                    f'-ArgumentList "{cmd_k_arguments_escaped}" '
+                    f'-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. Directly use start_process_cmd.
-                # The single quotes around the username in arguments_for_ps are handled correctly inside the double quotes of ArgumentList.
-                lpCommandLine = f'powershell.exe -NoProfile -ExecutionPolicy Bypass -NoExit -Command \'{start_process_cmd}\''
+                # 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}\''
 
                 lpApplicationName = None # Must be None if using lpCommandLine
                 cwd = os.path.dirname(target_exe_unquoted) if os.path.dirname(target_exe_unquoted) else None

{computer_use_ootb_internal-0.0.153.dist-info → computer_use_ootb_internal-0.0.154.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.153.dist-info → computer_use_ootb_internal-0.0.154.dist-info}/RECORD

@@ -2,7 +2,7 @@ computer_use_ootb_internal/README.md,sha256=FxpW95lyub2iX73ZDfK6ML7SdEKg060H5I6G
 computer_use_ootb_internal/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 computer_use_ootb_internal/app_teachmode.py,sha256=hiUTiX4jl1-5yqs3AwrOjNmToL5LbUb42o5XS4fiKAA,23805
 computer_use_ootb_internal/dependency_check.py,sha256=y8RMEP6RXQzTgU1MS_1piBLtz4J-Hfn9RjUZg59dyvo,1333
-computer_use_ootb_internal/guard_service.py,sha256=JvHqI4N9DSYUwLW7NS6khWu6Qo8WpS5dCF8AyYvUGOQ,52502
+computer_use_ootb_internal/guard_service.py,sha256=kUfUe2511txaAkU3FL1zkDBvDUqLRHL2p-b_9eJ855U,53358
 computer_use_ootb_internal/requirements-lite.txt,sha256=5DAHomz4A_P2BmTIXNkNqkHbnIF0AyZ4_1XAlb1LaYs,290
 computer_use_ootb_internal/run_teachmode_ootb_args.py,sha256=eUPpfA7bB3bdBBiIBIxKJSS-Jpz2G6R46fpDO440Jyo,7687
 computer_use_ootb_internal/service_manager.py,sha256=SD8jzfn0VVXBOr_nP6zmBWSC2TzrU_sp2e5JJkSlQFU,9734
@@ -34,7 +34,7 @@ computer_use_ootb_internal/computer_use_demo/tools/run.py,sha256=xhXdnBK1di9muaO
 computer_use_ootb_internal/computer_use_demo/tools/screen_capture.py,sha256=L8qfvtUkPPQGt92N-2Zfw5ZTDBzLsDps39uMnX3_uSA,6857
 computer_use_ootb_internal/preparation/__init__.py,sha256=AgtGHcBpiTkxJjF0xwcs3yyQ6SyUvhL3G0vD2XO-zJw,63
 computer_use_ootb_internal/preparation/star_rail_prepare.py,sha256=r0b19M_c1sXkN3_MRFjql8w_ThC9nZUe8zbSLYUvKS8,4635
-computer_use_ootb_internal-0.0.153.dist-info/METADATA,sha256=Vy90fSlT5SLodG9hsCqr0NoFxzNzADnJtjF6bHgEOxI,1048
-computer_use_ootb_internal-0.0.153.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.153.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.153.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.154.dist-info/METADATA,sha256=oOwVgjQ-craFAFQ85NzkSPw7qYiO5_80eDxHNPWe0ak,1048
+computer_use_ootb_internal-0.0.154.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.154.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.154.dist-info/RECORD,,