fix: re-arm VIDEOCONLOCK at OnLock to prevent early screen-off

Agent-Logs-Url: https://github.com/michaliskon/Turn-off-screen-on-lock/sessions/b4924dc0-60c2-4691-8608-300fcd209e65

Co-authored-by: michaliskon <49875310+michaliskon@users.noreply.github.com>

Author: Copilot

README.md

@@ -84,14 +84,14 @@ Can be adjusted by editing the config file:
 
 ```json
 {
-  "baselineTimeoutSeconds": 5,
+  "baselineTimeoutSeconds": 1,
   "wakeTimeoutSeconds": 300
 }
 ```
 
 | Setting | Default | Description |
 |---|---|---|
-| `baselineTimeoutSeconds` | 5 | Seconds before the screen turns off after locking |
+| `baselineTimeoutSeconds` | 1 | Seconds before the screen turns off after locking |
 | `wakeTimeoutSeconds` | 300 | Seconds the screen stays on when waking to unlock |
 
 Both values must be integers between 1 and 86400 (24 hours).

spec.md

@@ -15,7 +15,7 @@ In practice, it gives you both of these behaviors at the same time:
 The solution uses `VIDEOCONLOCK`, a controller, three runtime files, and three Scheduled Tasks.
 
 Runtime logic:
-- unlocked: `VIDEOCONLOCK` = baseline timeout (default 5 seconds, configurable)
+- unlocked: `VIDEOCONLOCK` = baseline timeout (default 1 second, configurable)
 - locked + system enters Modern Standby: On Wake task asks the controller to promote `VIDEOCONLOCK` to wake timeout (default 300 seconds, configurable)
 - unlocked again: controller resets `VIDEOCONLOCK` to baseline timeout
 
@@ -30,7 +30,7 @@ Roles:
 
 ## Intended behavior
 
-- Unlocked: `VIDEOCONLOCK` = baseline timeout (default 5 seconds, configurable via `config.json`)
+- Unlocked: `VIDEOCONLOCK` = baseline timeout (default 1 second, configurable via `config.json`)
 - Locked + exiting Modern Standby: `VIDEOCONLOCK` promoted to wake timeout (default 300 seconds, configurable via `config.json`)
 - Unlocked again: `VIDEOCONLOCK` reset to baseline for the next cycle
 
@@ -92,7 +92,7 @@ uninstaller.ps1
 
 | Action | Reads | Writes | Changes VIDEOCONLOCK |
 |---|---|---|---|
-| `OnLock` | -- | `state.json` | no |
+| `OnLock` | `config.json` | `state.json` | yes, baseline |
 | `OnUnlock` | `config.json` | `state.json` | yes, baseline |
 | `PromoteOnWake` | `state.json`, `config.json` | -- | yes, wake (if locked) |
 
@@ -101,7 +101,7 @@ Write directions for the three JSON files:
 | File | Written by | Read by |
 |---|---|---|
 | `state.json` | `OnLock`, `OnUnlock`, installer | `PromoteOnWake` |
-| `config.json` | installer (defaults only) | `OnUnlock`, `PromoteOnWake`, installer |
+| `config.json` | installer (defaults only) | `OnLock`, `OnUnlock`, `PromoteOnWake`, installer |
 | `baseline.json` | installer (once, on first install) | uninstaller |
 
 ---
@@ -138,7 +138,7 @@ Full runtime design, one complete lock/unlock cycle.
 
 ### 1. PC is unlocked
 
-- `VIDEOCONLOCK` AC and DC: baseline timeout (default `5`)
+- `VIDEOCONLOCK` AC and DC: baseline timeout (default `1`)
 - `state.json`: `status = "unlocked"`, `generation = <latest>`, `lastActionUtc = <timestamp>`
 
 The baseline is armed for the next lock event.
@@ -157,11 +157,14 @@ wscript.exe "<install-folder>\RunHidden.vbs" OnLock
 
 1. Generates a new GUID for this lock cycle.
 2. Writes `state.json`: `status = "locked"`, `generation = <new GUID>`, `lastActionUtc = <now>`.
-3. Leaves `VIDEOCONLOCK` unchanged.
+3. Reads `config.json` for the baseline timeout.
+4. Sets `VIDEOCONLOCK` AC and DC to the baseline timeout. Reapplies the active power scheme.
+
+Setting `VIDEOCONLOCK` at lock time forces Windows to re-arm its internal display-off countdown from the moment of lock, preventing stale idle time accumulated before the lock event from causing the screen to turn off earlier than configured.
 
 ### 4. Display turns off
 
-`VIDEOCONLOCK` is still at the baseline (default 5 seconds), so Windows turns the display off shortly after lock.
+Windows turns the display off after the baseline timeout (default 1 second) has elapsed since the lock event.
 
 ### 5. System enters Modern Standby
 
@@ -257,7 +260,7 @@ All three share the same principal and settings listed here. Per-task sections b
 
 #### Purpose
 
-Marks the start of a new lock cycle. Updates `state.json` with a fresh generation ID and `locked` status. Leaves `VIDEOCONLOCK` untouched.
+Marks the start of a new lock cycle. Updates `state.json` with a fresh generation ID and `locked` status. Re-applies `VIDEOCONLOCK` to the baseline timeout to re-arm Windows's display-off countdown from the moment of lock.
 
 #### Trigger
 
@@ -400,7 +403,7 @@ It bridges the gap between the GitHub Release and `installer.ps1`.
    Parse the hex values after "Current AC Power Setting Index" and "Current DC Power Setting Index", convert to decimal, and write `baseline.json`. If a valid `baseline.json` already exists, preserve it so the true originals are never lost on re-install.
 
 7. **Create or preserve `config.json`**  
-   If missing or malformed, create with defaults (`baselineTimeoutSeconds = 5`, `wakeTimeoutSeconds = 300`). If valid, preserve it. Read the effective baseline timeout for the next step.
+   If missing or malformed, create with defaults (`baselineTimeoutSeconds = 1`, `wakeTimeoutSeconds = 300`). If valid, preserve it. Read the effective baseline timeout for the next step.
 
 8. **Apply the baseline `VIDEOCONLOCK` setting**  
    Log the applied value. If the value came from an existing `config.json`, indicate that in the message.
@@ -577,14 +580,14 @@ The controller reads `%LOCALAPPDATA%\Turn-off-screen-on-lock\config.json` on eac
 
 ```json
 {
-  "baselineTimeoutSeconds": 5,
+  "baselineTimeoutSeconds": 1,
   "wakeTimeoutSeconds": 300
 }
 ```
 
 | Field | Type | Range | Default | Description |
 |---|---|---|---|---|
-| `baselineTimeoutSeconds` | integer | 1–86400 | 5 | Seconds before the screen turns off after locking. Also the value restored on unlock. |
+| `baselineTimeoutSeconds` | integer | 1–86400 | 1 | Seconds before the screen turns off after locking. Also the value restored on unlock. |
 | `wakeTimeoutSeconds` | integer | 1–86400 | 300 | Seconds the screen stays on when waking from Modern Standby to unlock. |
 
 Loading rules:
@@ -605,7 +608,7 @@ Loading rules:
 powercfg /q SCHEME_CURRENT SUB_VIDEO VIDEOCONLOCK | findstr /i "Current AC Current DC"
 ```
 
-- Unlocked: baseline (default `0x00000005` = 5 seconds).
+- Unlocked: baseline (default `0x00000001` = 1 second).
 - After promotion during a locked cycle: wake timeout (default `0x0000012c` = 300 seconds).
 
 ### Check the tasks

src/LockTimeoutController.ps1

@@ -37,7 +37,7 @@ function Get-State {
 }
 
 function Get-Config {
-    $DefaultBaseline = 5
+    $DefaultBaseline = 1
     $DefaultWake     = 300
     $ConfigPath      = Join-Path $DataDir 'config.json'
 
@@ -123,6 +123,8 @@ try {
         'OnLock' {
             $newGeneration = [guid]::NewGuid().Guid
             Save-State -State (New-State -Status 'locked' -GenerationValue $newGeneration)
+            $config = Get-Config
+            Set-VideoConLock -Seconds $config.baselineTimeoutSeconds
         }
 
         'OnUnlock' {

src/installer.ps1

@@ -298,7 +298,7 @@ try {
         $baseline | ConvertTo-Json -Depth 5 | Set-Content -LiteralPath $BaselinePath -Encoding UTF8
     }
 
-    $DefaultBaseline = 5
+    $DefaultBaseline = 1
     $DefaultWake     = 300
 
     $ConfigPath = Join-Path $DataDir 'config.json'