ispyx 1.1.1 → 1.1.3

package/native/win32-unlock/provider/install.ps1

@@ -68,7 +68,8 @@ try {
         # Already loaded by LogonUI from a previous install: keep it if it is byte-identical.
         if (-not (Test-Path $installedDll) -or (Get-FileHash $installedDll).Hash -ne (Get-FileHash $DllPath).Hash) { throw }
     }
-    regsvr32.exe /s $installedDll 2>$null
+    # regsvr32 is a GUI-subsystem exe: a bare call returns before it finishes, so the read-back below raced it.
+    Start-Process -FilePath regsvr32.exe -ArgumentList '/s', "`"$installedDll`"" -Wait -WindowStyle Hidden
     $actual = (Get-ItemProperty -Path 'HKLM:\SOFTWARE\Classes\CLSID\{1aa7e1e6-21de-4ad5-ae6e-454401b4b427}\InprocServer32' -Name '(default)' -ErrorAction SilentlyContinue).'(default)'
     if ($actual -ne $installedDll) {
         throw "Registration did not take effect (registry has '$actual', expected '$installedDll')."

package/native/win32-unlock/provider/uninstall.ps1

@@ -8,7 +8,7 @@ Set-StrictMode -Version 2
 $ErrorActionPreference = 'Continue' # best effort: still clean up what we can if one step fails
 
 $root = 'C:\ProgramData\ispyx'
-regsvr32.exe /u /s (Join-Path $root 'ispyx_unlock.dll') 2>$null
+Start-Process -FilePath regsvr32.exe -ArgumentList '/u', '/s', "`"$(Join-Path $root 'ispyx_unlock.dll')`"" -Wait -WindowStyle Hidden
 Remove-Item -Path (Join-Path $root 'unlock.secret') -Force -ErrorAction SilentlyContinue
 Remove-Item -Path (Join-Path $root 'unlock.signal') -Force -ErrorAction SilentlyContinue
 # May be held open by a running LogonUI until the next lock cycle; harmless once unregistered.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ispyx",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Local desktop-control MCP server: lets an AI use your keyboard, mouse and screen (windows, screenshots, clicks, typing, clipboard). stdio only, Windows and macOS.",
   "type": "module",
   "main": "src/server.js",

package/src/core/launcher.js

@@ -107,13 +107,19 @@ export async function runUpdate() {
     // quietly: the `ispyx mcp` forwarders stay connected and reach the new resident on their next call
     try { await callOwner(pipe, '__restart', {}); } catch { /* gone before answering */ }
     for (let i = 0; i < 40 && await residentRunning(pipe); i++) await sleep(150);
+    // the pipe frees before the process has finished exiting; it still holds koffi.node (EBUSY) until then
+    await sleep(2000);
   }
   step('Installing the latest ispyx (npm install -g ispyx@latest)');
-  const code = await new Promise((resolve) => {
-    const c = spawn('npm', ['install', '-g', 'ispyx@latest'], { stdio: 'inherit', shell: true });
-    c.on('error', () => resolve(1));
-    c.on('exit', (n) => resolve(n ?? 1));
-  });
+  let code = 1;
+  for (let attempt = 0; attempt < 3 && code !== 0; attempt++) {
+    if (attempt) { step('Retrying (a file was still in use)'); await sleep(2500); }
+    code = await new Promise((resolve) => {
+      const c = spawn('npm', ['install', '-g', 'ispyx@latest'], { stdio: 'inherit', shell: true });
+      c.on('error', () => resolve(1));
+      c.on('exit', (n) => resolve(n ?? 1));
+    });
+  }
   if (code !== 0) process.stderr.write('ispyx: the update failed (see the npm output above).\n');
   // Start the new copy: npm replaced the files in place, so a fresh process loads them.
   if (wasRunning) { step('Starting ispyx'); spawnResident(); }

package/src/platform/win32/win32.js

@@ -8,6 +8,9 @@ const advapi32 = koffi.load('advapi32.dll');
 const dwmapi = koffi.load('dwmapi.dll');
 const ole32 = koffi.load('ole32.dll');
 const winmm = koffi.load('winmm.dll');
+const wtsapi32 = koffi.load('wtsapi32.dll');
+const wtsQuery = wtsapi32.func('bool WTSQuerySessionInformationW(intptr_t server, uint32 session, int cls, _Out_ void **buf, _Out_ uint32_t *len)');
+const wtsFree = wtsapi32.func('void WTSFreeMemory(void *p)');
 const timeBeginPeriod = winmm.func('uint32 timeBeginPeriod(uint32 ms)');
 
 export const RECT = koffi.struct('RECT', { left: 'int32', top: 'int32', right: 'int32', bottom: 'int32' });
@@ -236,12 +239,26 @@ export const rootWindowAt = (x, y) => {
 };
 export const foregroundWindow = () => f.GetForegroundWindow();
 
+// WTSINFOEX_LEVEL1 for the current session: int32 at index 4 is SessionFlags (0 = locked, 1 = unlocked).
+function sessionFlagsLocked() {
+  const out = [null];
+  const len = [0];
+  if (!wtsQuery(0, 0xFFFFFFFF, 25, out, len) || !out[0]) return false;
+  try {
+    return koffi.decode(out[0], koffi.array('int32_t', 5))[4] === 0;
+  } finally {
+    wtsFree(out[0]);
+  }
+}
+
 export function isScreenLocked() {
   // The input desktop cannot be opened while the secure (lock / UAC) desktop is active.
   const d = f.OpenInputDesktop(0, false, 0x100);
   if (!d) return true;
   f.CloseDesktop(d);
-  return false;
+  // The lock screen's cover (clock and widgets, before the sign-in tiles) does not switch desktops, so the
+  // check above passes while it is showing; the session's own lock flag does not have that blind spot.
+  return sessionFlagsLocked();
 }
 
 export function windowDpi(hwnd) {