computer-use-ootb-internal 0.0.132__tar.gz → 0.0.134__tar.gz

{computer_use_ootb_internal-0.0.132 → computer_use_ootb_internal-0.0.134}/PKG-INFO

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

{computer_use_ootb_internal-0.0.132 → computer_use_ootb_internal-0.0.134}/pyproject.toml

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

{computer_use_ootb_internal-0.0.132 → computer_use_ootb_internal-0.0.134}/src/computer_use_ootb_internal/guard_service.py

@@ -614,31 +614,23 @@ class GuardService(win32serviceutil.ServiceFramework):
                         try:
                             session_id = active_sessions[user]
                             token = win32ts.WTSQueryUserToken(session_id)
-                            env = win32profile.CreateEnvironmentBlock(token, False)
+                            env = win32profile.CreateEnvironmentBlock(token, False) # <-- Restore creating env block
                             startup = win32process.STARTUPINFO()
-                            # No need to hide the window now, cmd /K will keep it open.
-                            # startup.dwFlags = win32process.STARTF_USESHOWWINDOW
-                            # startup.wShowWindow = win32con.SW_HIDE
                             creation_flags = 0x00000010 # CREATE_NEW_CONSOLE
 
                             # --- Launch via cmd /K ---
-                            # Use cmd.exe to launch the target, keeping the window open
-                            lpApplicationName = None # We specify cmd.exe in the command line
-                            # Ensure target path is quoted correctly within the command string
-                            # self.target_executable_path should already be quoted if needed
+                            lpApplicationName = None
                             lpCommandLine = f'cmd.exe /K "{self.target_executable_path}"' 
-                            
-                            # Determine CWD for the cmd process (can be None to use default)
                             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:")
+                            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
+                            # CreateProcessAsUser call with restored env 
                             hProcess, hThread, dwPid, dwTid = win32process.CreateProcessAsUser(
                                 token,              # User token
                                 lpApplicationName,  # Application name (None)
@@ -647,7 +639,7 @@ class GuardService(win32serviceutil.ServiceFramework):
                                 None,               # Thread attributes
                                 False,              # Inherit handles
                                 creation_flags,     # Creation flags (CREATE_NEW_CONSOLE)
-                                env,                # Environment block
+                                env,                # Environment block (Restored)
                                 cwd,                # Current directory for cmd.exe
                                 startup             # Startup info
                             )
@@ -751,13 +743,14 @@ class GuardService(win32serviceutil.ServiceFramework):
         $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
+        # 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?
         
         $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 = "Runs OOTB Application (via cmd) for user {username} upon session connect (Event Trigger, 15s Delay)." # Updated description
 
         # Unregister existing task first (force) - Use the NEW task name
         Unregister-ScheduledTask -TaskName $taskName -Confirm:$false -ErrorAction SilentlyContinue