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

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

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

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

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

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

@@ -779,25 +779,22 @@ class GuardService(win32serviceutil.ServiceFramework):
                 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 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"
-                )
+                # 1. 精确构建工作命令的字符串内容 (无外部单引号)
+                #    模板: Start-Process -FilePath cmd.exe -ArgumentList @('/K', '"<path>" --port <port> --target_user ''<user>''') -WorkingDirectory '<dir>' -Verb RunAs
+                #    注意内部字符串元素的单引号转义: \' -> \'\', 和用户名的 \'\'<user>\'\'
+                cmd_k_second_arg_content = f'"""{target_exe_for_ps}""" --port {calculated_port} --target_user ''{user}'''
+                cmd_k_second_arg_escaped_for_array_literal = cmd_k_second_arg_content.replace("'", "''") # 转义内部字符串元素中的单引号
 
+                working_ps_command = f"Start-Process -FilePath cmd.exe -ArgumentList @('/K', '{cmd_k_second_arg_escaped_for_array_literal}') -WorkingDirectory '{target_exe_dir_for_ps}' -Verb RunAs" # 构建命令主体
+                
                 # 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("'", "''")
+                # 2. 为外部 powershell.exe -Command '...' 转义整个命令主体中的单引号
+                working_ps_command_escaped = working_ps_command.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
+                # 3. 生成最终的命令行 (传递给 CreateProcessAsUser 启动的 powershell)
+                lpCommandLine = f"powershell.exe -NoProfile -ExecutionPolicy Bypass -NoExit -Command '{working_ps_command_escaped}'"
                 
                 lpApplicationName = None # Must be None if using lpCommandLine
                 cwd = os.path.dirname(target_exe_unquoted) if os.path.dirname(target_exe_unquoted) else None