computer-use-ootb-internal 0.0.158__py3-none-any.whl → 0.0.160__py3-none-any.whl

computer_use_ootb_internal/guard_service.py

@@ -779,30 +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
-                # 1. 构建 @() 数组的第二个参数字符串，严格遵守模板格式
-                #    格式: '"<exe_path>" --port <port> --target_user ''<username>'''
-                cmd_k_second_arg_content = f'""{target_exe_for_ps}"" --port {calculated_port} --target_user ''{user}'' ' # NOTE: Trailing space might be important
-                # Escape single quotes within this content for the PowerShell string literal ''
-                # 2. 为 PowerShell 数组元素中的字符串字面量转义单引号 (将 ' 替换为 '')
-                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
-                # 3. 构建完整的 PowerShell 脚本块内容
-                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"
-                )
-                
-                # Escape this content for the outer -Command '...' argument
-                # Only need to escape literal single quotes (replace ' with '')
-                # 4. 为外部 powershell.exe -Command '...' 的参数转义脚本块内容中的单引号
-                ps_script_block_content_escaped = ps_script_block_content.replace("'", "''")
-
-                # Final command line using the script block { ... } syntax for -Command
-                # 5. 生成最终的命令行
-                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
+                # 1. 准备 PowerShell 命令中需要的变量 (进行基本的 PowerShell 字符串转义)
+                ps_target_exe = target_exe_for_ps 
+                ps_working_dir = target_exe_dir_for_ps
+                # 用户名 'altair' 在最终命令里需要 ''altair'' 格式
+                ps_user_arg_format = user.replace("'", "''") # 先转义用户名本身的单引号
+
+                # 2. 构建最终的、完整的 PowerShell 命令字符串，严格按照模板
+                #    模板: Start-Process -FilePath cmd.exe -ArgumentList @('/K', '"<exe_path>" --port <port> --target_user ''<username>''') -WorkingDirectory '<working_dir>' -Verb RunAs
+                ps_command_string = f"Start-Process -FilePath cmd.exe -ArgumentList @('/K', '"""{ps_target_exe}""" --port {calculated_port} --target_user ''''{ps_user_arg_format}''''') -WorkingDirectory '{ps_working_dir}' -Verb RunAs"
+
+                # 3. 为 powershell.exe -Command '...' 参数转义整个命令字符串中的单引号
+                ps_command_string_escaped = ps_command_string.replace("'", "''")
+
+                # 4. 生成最终传递给 CreateProcessAsUser 的命令行
+                #    依然使用 powershell.exe -NoExit -Command '{ ... }' 以便观察，虽然不一定有效
+                lpCommandLine = f"powershell.exe -NoProfile -ExecutionPolicy Bypass -NoExit -Command '{{ {ps_command_string_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

{computer_use_ootb_internal-0.0.158.dist-info → computer_use_ootb_internal-0.0.160.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.158.dist-info → computer_use_ootb_internal-0.0.160.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=KvMkczJTxPhUcRwPS9qwhYqQ1odYfNYCJ9oUruivTuU,53644
+computer_use_ootb_internal/guard_service.py,sha256=3AEUuKM0t_bqhhs34Jj-6bVg5njl_GlOtyLJfqn-19s,53106
 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.158.dist-info/METADATA,sha256=wxfP8mD70Q8Z0A89yvz46zc7v6Ml3nzzb9mEfq8s0qU,1048
-computer_use_ootb_internal-0.0.158.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.158.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.158.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.160.dist-info/METADATA,sha256=7KuMFe3UmnWC4ptHq25An_UUVvZXyACS948t8x8AKJs,1048
+computer_use_ootb_internal-0.0.160.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.160.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.160.dist-info/RECORD,,