computer-use-ootb-internal 0.0.133__tar.gz → 0.0.135__tar.gz

{computer_use_ootb_internal-0.0.133 → computer_use_ootb_internal-0.0.135}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: computer-use-ootb-internal
-Version: 0.0.133
+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.133 → computer_use_ootb_internal-0.0.135}/pyproject.toml

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

{computer_use_ootb_internal-0.0.133 → computer_use_ootb_internal-0.0.135}/src/computer_use_ootb_internal/guard_service.py

@@ -614,8 +614,7 @@ class GuardService(win32serviceutil.ServiceFramework):
                         try:
                             session_id = active_sessions[user]
                             token = win32ts.WTSQueryUserToken(session_id)
-                            # env = win32profile.CreateEnvironmentBlock(token, False) # <-- Temporarily disable creating env block
-                            env = None # Use default environment provided by CreateProcessAsUser
+                            env = win32profile.CreateEnvironmentBlock(token, False) # <-- Restore creating env block
                             startup = win32process.STARTUPINFO()
                             creation_flags = 0x00000010 # CREATE_NEW_CONSOLE
 
@@ -625,13 +624,13 @@ class GuardService(win32serviceutil.ServiceFramework):
                             cwd = os.path.dirname(self.target_executable_path.strip('"')) if os.path.dirname(self.target_executable_path.strip('"')) != '' else None
                             # --- End Launch via cmd /K ---
 
-                            self.log_info(f"Calling CreateProcessAsUser to launch via cmd /K (Default Environment Test):") # Added note to log
+                            self.log_info(f"Calling CreateProcessAsUser to launch via cmd /K (Restored Environment Block):") # Updated log note
                             self.log_info(f"  lpApplicationName: {lpApplicationName}")
                             self.log_info(f"  lpCommandLine: {lpCommandLine}")
                             self.log_info(f"  lpCurrentDirectory: {cwd if cwd else 'Default'}")
                             self.log_info(f"  dwCreationFlags: {creation_flags} (CREATE_NEW_CONSOLE)")
 
-                            # CreateProcessAsUser call with env = None
+                            # CreateProcessAsUser call with restored env 
                             hProcess, hThread, dwPid, dwTid = win32process.CreateProcessAsUser(
                                 token,              # User token
                                 lpApplicationName,  # Application name (None)
@@ -640,7 +639,7 @@ class GuardService(win32serviceutil.ServiceFramework):
                                 None,               # Thread attributes
                                 False,              # Inherit handles
                                 creation_flags,     # Creation flags (CREATE_NEW_CONSOLE)
-                                env,                # Environment block (Now None)
+                                env,                # Environment block (Restored)
                                 cwd,                # Current directory for cmd.exe
                                 startup             # Startup info
                             )
@@ -710,47 +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}" 
-        $trigger = New-ScheduledTaskTrigger -Event -LogName $logName -Source $source -EventId $eventIDs[0] # Primary trigger
-        # 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)." # 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)