computer-use-ootb-internal 0.0.134__py3-none-any.whl → 0.0.135__py3-none-any.whl

computer_use_ootb_internal/guard_service.py

@@ -709,48 +709,42 @@ class GuardService(win32serviceutil.ServiceFramework):
             return False
 
         task_name = f"OOTB_UserConnect_{username}" # Renamed task slightly
-        action_executable = "cmd.exe"
-        action_arguments = f'/K "{self.target_executable_path}"'
+        # Action: Run a simple test command instead of the main executable
+        action_executable = 'cmd.exe'
+        test_output_file = f"C:\Users\{username}\task_test_{task_name}.txt" # User-specific file
+        action_arguments = f"/C echo Task {task_name} ran at %DATE% %TIME% > \"{test_output_file}\"" # Quote the path
         safe_action_executable = action_executable.replace("'", "''")
         safe_action_arguments = action_arguments.replace("'", "''")
         
-        # Explicitly set the working directory to the executable's location
+        # Explicitly set the working directory to the executable's location (Might not matter for echo, but keep for consistency)
         try:
             executable_dir = os.path.dirname(self.target_executable_path.strip('"'))
-            if not executable_dir: # Handle case where path might be just the exe name
-                 executable_dir = "." # Use current directory as fallback?
-                 self.log_warning(f"Could not determine directory for {self.target_executable_path}, task WorkingDirectory might be incorrect.")
+            if not executable_dir: executable_dir = "."
             safe_working_directory = executable_dir.replace("'", "''")
             working_directory_setting = f"$action.WorkingDirectory = '{safe_working_directory}'"
         except Exception as e:
-             self.log_error(f"Error determining working directory for task: {e}. WorkingDirectory will not be set.")
-             working_directory_setting = "# Could not set WorkingDirectory" # Comment out in PS script
+             self.log_error(f"Error determining working directory for task: {e}. WD will not be set.")
+             working_directory_setting = "# Could not set WorkingDirectory"
 
         # PowerShell command construction
         ps_command = f"""
         $taskName = "{task_name}"
         $principal = New-ScheduledTaskPrincipal -UserId "{username}" -LogonType Interactive
         
-        # Action: Run cmd.exe with /K, setting the working directory
+        # Action: Run the SIMPLE test command
         $action = New-ScheduledTaskAction -Execute '{safe_action_executable}' -Argument '{safe_action_arguments}'
-        {working_directory_setting}
+        # {working_directory_setting} # Working directory less relevant for this test
 
-        # Trigger: On session connect/reconnect events for Terminal Services
+        # Trigger: On session connect (Event ID 21)
         $logName = 'Microsoft-Windows-TerminalServices-LocalSessionManager/Operational'
         $source = 'Microsoft-Windows-TerminalServices-LocalSessionManager'
-        $eventIDs = @(21, 25) # 21=SessionLogon, 25=SessionReconnect
-        # The Principal -UserId should ensure this only runs for the target user when they connect
-        $trigger = New-ScheduledTaskTrigger -AtLogOn # Keep AtLogOn as a fallback?
-        # --- Let's stick to ONE trigger type first. Replacing AtLogOn with Event --- 
-        # $trigger = New-ScheduledTaskTrigger -AtLogOn -User "{username}" 
-        # Add a 15 second delay to allow the session to potentially settle
-        $trigger = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId $eventIDs[0] -Delay 'PT15S' # Primary trigger with delay
-        # Register additional triggers if needed, or handle logic differently.
-        # For simplicity, let's try one event trigger first (ID 21). If reconnect (25) is needed, we can add it.
-        # Consider adding delay: -Delay 'PT15S' # Delay 15 seconds after event?
+        $eventIDs = @(21, 25) 
+        $trigger = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId $eventIDs[0]
+        # Optional Delay: -Delay 'PT15S' 
+        # $trigger.Delay = 'PT15S' # Add delay this way if needed
         
         $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -ExecutionTimeLimit (New-TimeSpan -Days 9999) -RestartCount 3 -RestartInterval (New-TimeSpan -Minutes 1)
-        $description = "Runs OOTB Application (via cmd) for user {username} upon session connect (Event Trigger, 15s Delay)." # Updated description
+        $description = "**TEST TASK** Runs a simple echo command for user {username} upon session connect." # Updated description
 
         # Unregister existing task first (force) - Use the NEW task name
         Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue
@@ -765,7 +759,7 @@ class GuardService(win32serviceutil.ServiceFramework):
         # Append trigger is more complex via PowerShell cmdlets, often easier via XML or COM
 
         """
-        self.log_info(f"Attempting to create/update task '{task_name}' for user '{username}' to run '{action_executable} {action_arguments}' on session connect.")
+        self.log_info(f"Attempting to create/update **TEST TASK** '{task_name}' for user '{username}' to run simple echo command.")
         try:
             # Need to actually run the powershell command here!
             success = self.run_powershell_command(ps_command)

{computer_use_ootb_internal-0.0.134.dist-info → computer_use_ootb_internal-0.0.135.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.134.dist-info → computer_use_ootb_internal-0.0.135.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=ZZW98870QPNK76LN4f4k9RjBELYcF_3hl0w0fvxj3dY,22268
 computer_use_ootb_internal/dependency_check.py,sha256=y8RMEP6RXQzTgU1MS_1piBLtz4J-Hfn9RjUZg59dyvo,1333
-computer_use_ootb_internal/guard_service.py,sha256=FZRTjK5qtm7vHmhIAAsZ_A2vW7FLpwNrjPnQuUimhmA,45917
+computer_use_ootb_internal/guard_service.py,sha256=MWeDCOHrJPDbt4NQJ5JvZZn6EH66Bd191oCY4mTBuaw,45192
 computer_use_ootb_internal/requirements-lite.txt,sha256=5DAHomz4A_P2BmTIXNkNqkHbnIF0AyZ4_1XAlb1LaYs,290
 computer_use_ootb_internal/run_teachmode_ootb_args.py,sha256=HB7L9vuIPUXVqeTicyNJKArzTNAfgdpsyO3JEzmByIo,7315
 computer_use_ootb_internal/service_manager.py,sha256=SD8jzfn0VVXBOr_nP6zmBWSC2TzrU_sp2e5JJkSlQFU,9734
@@ -33,7 +33,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=s1VWszcTnJAKxqCHFlaOEwPkqVSrkiFx_yKpWSnSbHs,2649
-computer_use_ootb_internal-0.0.134.dist-info/METADATA,sha256=NkwvbfbSOP9LVYTyvigE4CmgWpBINIKf2jHXR9ezpOM,1048
-computer_use_ootb_internal-0.0.134.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.134.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.134.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.135.dist-info/METADATA,sha256=CTzW93BTqEm4AlHsJKye7eR6NT62h16TBE-gkcqiWkY,1048
+computer_use_ootb_internal-0.0.135.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.135.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.135.dist-info/RECORD,,