deepseek-computer-use 0.1.0 → 0.1.2

package/native/Driver.cs

@@ -19,6 +19,8 @@ public interface IPlatformDriver : IDisposable
     string PlatformName { get; }
     Dictionary<string, object> Ping(Dictionary<string, object> p);
     Dictionary<string, object> Hello(Dictionary<string, object> p);
+    Dictionary<string, object> RestoreCursor(Dictionary<string, object> p);
+    void Maintenance();
     Dictionary<string, object> Close(Dictionary<string, object> p);
     Dictionary<string, object> ListWindows(Dictionary<string, object> p);
     Dictionary<string, object> ListApps(Dictionary<string, object> p);
@@ -38,6 +40,7 @@ public interface IPlatformDriver : IDisposable
     Dictionary<string, object> Configure(Dictionary<string, object> p);
     Dictionary<string, object> ApproveApp(Dictionary<string, object> p);
     Dictionary<string, object> EndTurn(Dictionary<string, object> p);
+    Dictionary<string, object> InvalidateState(Dictionary<string, object> p);
     Dictionary<string, object> StartAudioRecording(Dictionary<string, object> p);
     Dictionary<string, object> StopAudioRecording(Dictionary<string, object> p);
 }
@@ -48,10 +51,24 @@ public interface IPlatformDriver : IDisposable
 public static class Budget
 {
     static long _deadlineTicks;
+    static string _cancelFile;
 
-    public static void Begin(long ms)
+    public static void Begin(long ms, string cancelFile)
     {
         _deadlineTicks = ms > 0 ? DateTime.UtcNow.Ticks + ms * TimeSpan.TicksPerMillisecond : 0;
+        _cancelFile = cancelFile;
+    }
+
+    public static void Check()
+    {
+        if (_cancelFile != null && File.Exists(_cancelFile))
+        {
+            string reason = "cancelled";
+            try { reason = File.ReadAllText(_cancelFile).Trim(); } catch { }
+            if (reason != "turn_ended" && reason != "timeout") reason = "cancelled";
+            throw new ToolError(reason, "the native request was stopped; take a fresh observation before continuing");
+        }
+        if (Expired()) throw new ToolError("timeout", "the native request exceeded its time budget");
     }
 
     public static long RemainingMs()
@@ -182,14 +199,12 @@ public class WindowsDriver : IPlatformDriver
     // border and a virtual cursor; this is the DSH equivalent, and Esc is the kill
     // switch: the overlay drops a cancel file that every input path checks first.
     Process _overlay;
+    System.Threading.Timer _cursorWatchdog;
     DateTime _overlayUntil = DateTime.MinValue;
     string _overlayCancelFile;
-    string _overlayImage = "";
-    string _overlayCrop = "";
     string _overlayText = "DSH 正在使用您的电脑";
     string _overlayHint = "Esc 取消";
     string _overlayAccent = "#3f7fd8";
-    string _overlayCorner = "br";
     string _cursorFile;      // the overlay polls this to draw the virtual cursor
     /// Turn token that the user interrupted with Esc. Codex persists the same
     /// fact as a marker file per conversation+turn; here the token travels with
@@ -206,6 +221,7 @@ public class WindowsDriver : IPlatformDriver
     readonly Dictionary<string, ShotRegion> _shots = new Dictionary<string, ShotRegion>();
     int _shotTtlMs = 120000;
     int _shotSeq = 0;
+    readonly string _shotGeneration = Guid.NewGuid().ToString("N");
 
     const uint GW_OWNER = 4;
     const int GWL_STYLE = -16;
@@ -213,11 +229,16 @@ public class WindowsDriver : IPlatformDriver
 
     public WindowsDriver()
     {
+        Maintenance(); // startup repair: a previous session may have died with cursors hidden
         try { SetThreadDpiAwarenessContext(new IntPtr(-4)); } catch { }
         try { SetProcessDPIAware(); } catch { }
     }
 
-    public void Dispose() { }
+    public void Dispose()
+    {
+        if (_cursorWatchdog != null) { _cursorWatchdog.Dispose(); _cursorWatchdog = null; }
+        StopOverlay();
+    }
 
     // ---- approval plumbing ----
     public Dictionary<string, object> Configure(Dictionary<string, object> p)
@@ -254,6 +275,13 @@ public class WindowsDriver : IPlatformDriver
         return r;
     }
 
+    public Dictionary<string, object> InvalidateState(Dictionary<string, object> p)
+    {
+        lock (_sync) { _snapshots.Clear(); _shots.Clear(); }
+        StopOverlay();
+        return new Dictionary<string, object> { { "invalidated", true } };
+    }
+
     void AssertAppApproved(IntPtr h)
     {
         if (!_requireAppApproval) return;
@@ -340,18 +368,12 @@ public class WindowsDriver : IPlatformDriver
 
     public Dictionary<string, object> OverlayShow(Dictionary<string, object> p)
     {
-        string image = Json.GetString(p, "image");
-        if (!string.IsNullOrEmpty(image)) _overlayImage = image;
-        string crop = Json.GetString(p, "crop");
-        if (!string.IsNullOrEmpty(crop)) _overlayCrop = crop;
         string text = Json.GetString(p, "text");
         if (!string.IsNullOrEmpty(text)) _overlayText = text;
         string hint = Json.GetString(p, "hint");
         if (!string.IsNullOrEmpty(hint)) _overlayHint = hint;
         string accent = Json.GetString(p, "accent");
         if (!string.IsNullOrEmpty(accent)) _overlayAccent = accent;
-        string corner = Json.GetString(p, "corner");
-        if (!string.IsNullOrEmpty(corner)) _overlayCorner = corner;
         EnsureOverlay(Json.GetLong(p, "ttlMs", 20000));
         Dictionary<string, object> r = new Dictionary<string, object>();
         r["visible"] = true;
@@ -390,16 +412,24 @@ public class WindowsDriver : IPlatformDriver
         args.Append(" --cancel-file \"").Append(_overlayCancelFile).Append('"');
         args.Append(" --text \"").Append(_overlayText).Append('"');
         args.Append(" --hint \"").Append(_overlayHint).Append('"');
+        args.Append(" --owner-pid ").Append(Process.GetCurrentProcess().Id);
         args.Append(" --accent \"").Append(_overlayAccent).Append('"');
-        args.Append(" --corner ").Append(_overlayCorner);
         if (_cursorFile != null) args.Append(" --cursor-file \"").Append(_cursorFile).Append('"');
-        if (Environment.GetEnvironmentVariable("DSH_CU_SUPPRESS_CURSOR") == "1") args.Append(" --suppress-cursor");
+        // Suppression is the default (the virtual cursor stands in for the real one);
+        // DSH_CU_KEEP_CURSOR=1 keeps the real pointer visible instead.
+        if (Environment.GetEnvironmentVariable("DSH_CU_KEEP_CURSOR") == "1") args.Append(" --no-suppress-cursor");
         try
         {
             ProcessStartInfo psi = new ProcessStartInfo(exe, args.ToString());
             psi.UseShellExecute = false;
             _overlay = Process.Start(psi);
             _overlayUntil = DateTime.UtcNow.AddMilliseconds(ttlMs);
+            // Codex runs a dedicated system-cursor-manager process that restores the
+            // pointer the moment its parent dies. This timer gives the same guarantee
+            // without a second exe: if the overlay vanishes with cursors hidden, the
+            // pointer comes back within half a second, with no request needed.
+            if (_cursorWatchdog == null)
+                _cursorWatchdog = new System.Threading.Timer(delegate { try { Maintenance(); } catch { } }, null, 500, 500);
         }
         catch { _overlay = null; }
     }
@@ -410,7 +440,8 @@ public class WindowsDriver : IPlatformDriver
         // Kill() skips the overlay's exit handlers, which is where it would restore the
         // system cursors. Restore them from here so a terminated overlay can never leave
         // the user without a pointer.
-        try { SystemParametersInfo(0x0057, 0, IntPtr.Zero, 0); } catch { }
+        RestoreCursors();
+        try { File.Delete(OverlayCursorFlagPath()); } catch { }
         try { if (_overlayCancelFile != null && File.Exists(_overlayCancelFile)) File.Delete(_overlayCancelFile); } catch { }
         _overlay = null;
         _overlayUntil = DateTime.MinValue;
@@ -421,6 +452,7 @@ public class WindowsDriver : IPlatformDriver
 
     void CheckCancel(Dictionary<string, object> p)
     {
+        Budget.Check();
         string token = p == null ? null : Json.GetString(p, "turnToken");
         if (token != null && (token == _interruptedTurn || InterruptMarkerExists(token)))
             throw new ToolError("turn_stopped", EscMessage);
@@ -435,7 +467,7 @@ public class WindowsDriver : IPlatformDriver
         throw new ToolError("cancelled_by_user", EscMessage);
     }
 
-    const int ProtocolVersion = 1;
+    const int ProtocolVersion = 2;
 
     static string InterruptMarkerPath(string token)
     {
@@ -604,11 +636,50 @@ public class WindowsDriver : IPlatformDriver
     {
         Dictionary<string, object> d = new Dictionary<string, object>();
         d["platform"] = PlatformName;
+        d["pid"] = (long)Process.GetCurrentProcess().Id;
+        d["overlayPid"] = _overlay != null && !_overlay.HasExited ? (object)(long)_overlay.Id : null;
         d["ok"] = true;
         d["uia"] = true;
         return d;
     }
 
+    /// Run cheaply before every request: if a previous overlay died while it was hiding
+    /// the system cursors, put them back. A blank desktop cursor is worse than a stray
+    /// visible one, so this never assumes the overlay cleaned up after itself.
+    public void Maintenance()
+    {
+        try
+        {
+            string flag = OverlayCursorFlagPath();
+            if (!File.Exists(flag)) return;
+            int pid;
+            if (!int.TryParse(File.ReadAllText(flag).Trim(), out pid)) { RestoreCursors(); return; }
+            bool alive;
+            try { Process.GetProcessById(pid); alive = true; } catch { alive = false; }
+            if (!alive) { RestoreCursors(); try { File.Delete(flag); } catch { } }
+        }
+        catch { }
+    }
+
+    static string OverlayCursorFlagPath()
+    {
+        return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "dsh-computer-use", "cursor-hidden.flag");
+    }
+
+    static void RestoreCursors()
+    {
+        try { SystemParametersInfo(0x0057, 0, IntPtr.Zero, 0); } catch { }
+    }
+
+    public Dictionary<string, object> RestoreCursor(Dictionary<string, object> p)
+    {
+        RestoreCursors();
+        try { File.Delete(OverlayCursorFlagPath()); } catch { }
+        Dictionary<string, object> r = new Dictionary<string, object>();
+        r["restored"] = true;
+        return r;
+    }
+
     public Dictionary<string, object> Hello(Dictionary<string, object> p)
     {
         Dictionary<string, object> d = new Dictionary<string, object>();
@@ -811,8 +882,13 @@ public class WindowsDriver : IPlatformDriver
             for (int i = 0; i < args.Count; i++)
             {
                 if (i > 0) argLine.Append(' ');
-                string a = Convert.ToString(args[i], System.Globalization.CultureInfo.InvariantCulture);
-                if (a.IndexOf(' ') >= 0) argLine.Append('"').Append(a).Append('"');
+                string a = Convert.ToString(args[i], System.Globalization.CultureInfo.InvariantCulture) ?? "";
+                // A quote or newline would let a caller smuggle extra arguments past the
+                // single quoting rule below, so refuse instead of guessing.
+                if (a.IndexOf('"') >= 0 || a.IndexOf('\n') >= 0 || a.IndexOf('\r') >= 0)
+                    throw new ToolError("bad_request", "launch_app argument " + i + " contains a quote or newline; pass a single plain argument");
+                if (a.Length == 0 || a.IndexOf(' ') >= 0 || a.IndexOf('\t') >= 0)
+                    argLine.Append('"').Append(a).Append('"');
                 else argLine.Append(a);
             }
             psi.Arguments = argLine.ToString();
@@ -1096,7 +1172,7 @@ public class WindowsDriver : IPlatformDriver
             if (zIndex < 0) zIndex = total - 1;
             Dictionary<string, object> shot = CaptureWindow(w);
             shot["zIndex"] = (long)(total - zIndex); // larger = visually above
-            string id = "shot-" + (++_shotSeq).ToString() + "-" + w.ToInt64().ToString();
+            string id = "shot-" + _shotGeneration + "-" + (++_shotSeq).ToString() + "-" + w.ToInt64().ToString();
             shot["id"] = id;
             RECT r = BoundsOf(w);
             lock (_sync)
@@ -1405,19 +1481,20 @@ public class WindowsDriver : IPlatformDriver
         SendInput(1, arr, Marshal.SizeOf(typeof(INPUT)));
     }
 
-    void ClickAt(int screenX, int screenY, int count, string button)
+    void ClickAt(int screenX, int screenY, int count, string button, Dictionary<string, object> p)
     {
         SetCursorPos(screenX, screenY);
         System.Threading.Thread.Sleep(35);
         for (int i = 0; i < Math.Max(1, count); i++)
         {
+            CheckCancel(p);
             if (i > 0) System.Threading.Thread.Sleep(60);
             uint down = MOUSEEVENTF_LEFTDOWN, up = MOUSEEVENTF_LEFTUP;
             if (button == "r") { down = MOUSEEVENTF_RIGHTDOWN; up = MOUSEEVENTF_RIGHTUP; }
             else if (button == "m") { down = MOUSEEVENTF_MIDDLEDOWN; up = MOUSEEVENTF_MIDDLEUP; }
             SendMouse(down);
-            System.Threading.Thread.Sleep(22);
-            SendMouse(up);
+            try { System.Threading.Thread.Sleep(22); }
+            finally { SendMouse(up); }
         }
     }
 
@@ -1483,7 +1560,8 @@ public class WindowsDriver : IPlatformDriver
 
         Activate(h); // pointer clicks need a real foreground window
         MarkCursor(sx, sy);
-        ClickAt(sx, sy, count, button);
+        CheckCancel(p);
+        ClickAt(sx, sy, count, button, p);
         Dictionary<string, object> r = new Dictionary<string, object>();
         r["clicked"] = "pointer";
         r["screenX"] = (long)sx;
@@ -1511,7 +1589,7 @@ public class WindowsDriver : IPlatformDriver
         string key = Json.GetString(p, "key");
         if (string.IsNullOrEmpty(key)) throw new ToolError("bad_request", "press_key requires 'key'");
         Activate(h);
-        Chord(key);
+        Chord(key, p);
         Dictionary<string, object> r = new Dictionary<string, object>();
         r["pressed"] = key;
         return r;
@@ -1569,7 +1647,7 @@ public class WindowsDriver : IPlatformDriver
         SendKey(vk, 0, flags);
     }
 
-    static void Chord(string chord)
+    void Chord(string chord, Dictionary<string, object> p)
     {
         string[] parts = chord.Split('+');
         List<ushort> keys = new List<ushort>();
@@ -1580,8 +1658,17 @@ public class WindowsDriver : IPlatformDriver
             keys.Add(ResolveKey(token));
         }
         if (keys.Count == 0) throw new ToolError("bad_request", "empty key chord");
-        for (int i = 0; i < keys.Count; i++) { SendVk(keys[i], false); System.Threading.Thread.Sleep(12); }
-        for (int i = keys.Count - 1; i >= 0; i--) { SendVk(keys[i], true); System.Threading.Thread.Sleep(12); }
+        int pressed = 0;
+        try
+        {
+            for (int i = 0; i < keys.Count; i++)
+            {
+                CheckCancel(p);
+                SendVk(keys[i], false); pressed++;
+                System.Threading.Thread.Sleep(12);
+            }
+        }
+        finally { for (int i = pressed - 1; i >= 0; i--) SendVk(keys[i], true); }
     }
 
     /// The Windows/Meta key family is hard-denied: it opens Run, Settings and
@@ -1622,6 +1709,7 @@ public class WindowsDriver : IPlatformDriver
         Activate(h);
         for (int i = 0; i < text.Length; i++)
         {
+            CheckCancel(p);
             char c = text[i];
             if (c == '\n') { SendVk(0x0D, false); SendVk(0x0D, true); continue; }
             if (c == '\t') { SendVk(0x09, false); SendVk(0x09, true); continue; }
@@ -1642,13 +1730,16 @@ public class WindowsDriver : IPlatformDriver
         EnsureOverlay(8000);
         IntPtr h = ResolveWindow(p);
         AssertAppApproved(h);
-        Activate(h);
+        // Validation first: an invalid call must not activate a window or move the pointer.
         double scrollY = Json.GetDouble(p, "scrollY", 0);
         double scrollX = Json.GetDouble(p, "scrollX", 0);
         double x = Json.GetDouble(p, "x", double.NaN);
         double y = Json.GetDouble(p, "y", double.NaN);
         if (double.IsNaN(x) || double.IsNaN(y))
             throw new ToolError("bad_request", "scroll requires finite 'x' and 'y' (the point to scroll from, in window/screenshot coordinates); click a pane first if it needs focus");
+        if (Math.Abs(scrollX) < 0.0001 && Math.Abs(scrollY) < 0.0001)
+            throw new ToolError("bad_request", "scroll requires a non-zero scrollX or scrollY");
+        Activate(h);
         int sx, sy;
         string scrollShot = Json.GetString(p, "screenshotId");
         int originLeft, originTop;
@@ -1685,6 +1776,12 @@ public class WindowsDriver : IPlatformDriver
         EnsureOverlay(8000);
         IntPtr h = ResolveWindow(p);
         AssertAppApproved(h);
+        double fromX = Json.GetDouble(p, "from_x", double.NaN);
+        double fromY = Json.GetDouble(p, "from_y", double.NaN);
+        double toX = Json.GetDouble(p, "to_x", double.NaN);
+        double toY = Json.GetDouble(p, "to_y", double.NaN);
+        if (double.IsNaN(fromX) || double.IsNaN(fromY) || double.IsNaN(toX) || double.IsNaN(toY))
+            throw new ToolError("bad_request", "drag requires finite from_x/from_y/to_x/to_y (window-relative pixels)");
         Activate(h);
         int originX, originY;
         double dragScaleX = 1.0, dragScaleY = 1.0;
@@ -1692,8 +1789,8 @@ public class WindowsDriver : IPlatformDriver
         if (!string.IsNullOrEmpty(dragShot))
         {
             ShotRegion region = ResolveShot(h, dragShot);
-            AssertPointInsideShot(Json.GetDouble(p, "from_x", double.NaN), Json.GetDouble(p, "from_y", double.NaN), region, dragShot, "drag start");
-            AssertPointInsideShot(Json.GetDouble(p, "to_x", double.NaN), Json.GetDouble(p, "to_y", double.NaN), region, dragShot, "drag end");
+            AssertPointInsideShot(fromX, fromY, region, dragShot, "drag start");
+            AssertPointInsideShot(toX, toY, region, dragShot, "drag end");
             originX = region.OriginX; originY = region.OriginY;
             dragScaleX = region.ScaleX; dragScaleY = region.ScaleY;
         }
@@ -1702,26 +1799,32 @@ public class WindowsDriver : IPlatformDriver
             RECT b = BoundsOf(h);
             originX = b.Left; originY = b.Top;
         }
-        int fx = originX + (int)Math.Round(Json.GetDouble(p, "from_x", 0) * dragScaleX);
-        int fy = originY + (int)Math.Round(Json.GetDouble(p, "from_y", 0) * dragScaleY);
-        int tx = originX + (int)Math.Round(Json.GetDouble(p, "to_x", 0) * dragScaleX);
-        int ty = originY + (int)Math.Round(Json.GetDouble(p, "to_y", 0) * dragScaleY);
+        int fx = originX + (int)Math.Round(fromX * dragScaleX);
+        int fy = originY + (int)Math.Round(fromY * dragScaleY);
+        int tx = originX + (int)Math.Round(toX * dragScaleX);
+        int ty = originY + (int)Math.Round(toY * dragScaleY);
 
         MarkCursor(fx, fy);
         SetCursorPos(fx, fy);
         System.Threading.Thread.Sleep(60);
+        CheckCancel(p);
         SendMouse(MOUSEEVENTF_LEFTDOWN);
-        System.Threading.Thread.Sleep(80);
-        const int steps = 14;
-        for (int i = 1; i <= steps; i++)
+        try
         {
-            int x = fx + (tx - fx) * i / steps;
-            int y = fy + (ty - fy) * i / steps;
-            SetCursorPos(x, y);
-            System.Threading.Thread.Sleep(18);
+            System.Threading.Thread.Sleep(80);
+            const int steps = 14;
+            for (int i = 1; i <= steps; i++)
+            {
+                CheckCancel(p);
+                int x = fx + (tx - fx) * i / steps;
+                int y = fy + (ty - fy) * i / steps;
+                SetCursorPos(x, y);
+                System.Threading.Thread.Sleep(18);
+            }
+            System.Threading.Thread.Sleep(90);
+            CheckCancel(p);
         }
-        System.Threading.Thread.Sleep(90);
-        SendMouse(MOUSEEVENTF_LEFTUP);
+        finally { SendMouse(MOUSEEVENTF_LEFTUP); }
 
         Dictionary<string, object> r = new Dictionary<string, object>();
         r["dragged"] = true;

package/native/Overlay.cs

@@ -22,6 +22,7 @@ public sealed class Config
     public static string Title = "DSH 正在使用您的电脑";
     public static string Hint = "Esc 取消";
     public static bool SuppressCursor = false;
+    public static int OwnerPid = 0;
     public static int Corner1 = 0; // unused placeholder kept for arg compatibility
     public static Color Accent = Color.FromArgb(63, 127, 216);
 }
@@ -52,9 +53,6 @@ public static class Native
     public const int ULW_ALPHA = 2;
     public const uint SPI_SETCURSORS = 0x0057;
 
-    public static bool LastLayerOk = true;
-    public static int LastLayerError = 0;
-
     public static void ApplyLayered(Form form, Bitmap surface)
     {
         IntPtr screenDc = GetDC(IntPtr.Zero);
@@ -67,8 +65,7 @@ public static class Native
             POINT src = new POINT { X = 0, Y = 0 };
             SIZE size = new SIZE { CX = surface.Width, CY = surface.Height };
             BLENDFUNCTION blend = new BLENDFUNCTION { BlendOp = 0, BlendFlags = 0, SourceConstantAlpha = 255, AlphaFormat = 1 };
-            LastLayerOk = UpdateLayeredWindow(form.Handle, screenDc, ref dst, ref size, memDc, ref src, 0, ref blend, ULW_ALPHA);
-            LastLayerError = LastLayerOk ? 0 : Marshal.GetLastWin32Error();
+            UpdateLayeredWindow(form.Handle, screenDc, ref dst, ref size, memDc, ref src, 0, ref blend, ULW_ALPHA);
         }
         finally
         {
@@ -84,19 +81,48 @@ public static class Native
         try { SetWindowPos(form.Handle, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_SHOWWINDOW); } catch { }
     }
 
+    /// Path of the "cursors are hidden" flag. It carries our PID so a long-lived
+    /// supervisor can tell "the overlay is still hiding them" from "the overlay died
+    /// and left the desktop without a pointer".
+    public static string CursorFlagPath()
+    {
+        string dir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "dsh-computer-use");
+        return Path.Combine(dir, "cursor-hidden.flag");
+    }
+
+    static IntPtr _blankCursor;
+
     public static void SuppressSystemCursors(bool suppress)
     {
         try
         {
-            if (!suppress) { SystemParametersInfo(SPI_SETCURSORS, 0, IntPtr.Zero, 0); return; }
-            byte[] andMask = new byte[128];
-            byte[] xorMask = new byte[128];
-            for (int i = 0; i < andMask.Length; i++) andMask[i] = 0xFF;
-            IntPtr blank = CreateCursor(IntPtr.Zero, 0, 0, 32, 32, andMask, xorMask);
+            if (!suppress)
+            {
+                SystemParametersInfo(SPI_SETCURSORS, 0, IntPtr.Zero, 0);
+                try { File.Delete(CursorFlagPath()); } catch { }
+                if (_blankCursor != IntPtr.Zero) { try { DestroyCursor(_blankCursor); } catch { } _blankCursor = IntPtr.Zero; }
+                return;
+            }
+            // Cache the blank cursor: Windows resets the cursors on resume, display
+            // change and some logins, so the controller calls this again periodically
+            // (Codex calls the same "system cursor re-suppression").
+            if (_blankCursor == IntPtr.Zero)
+            {
+                byte[] andMask = new byte[128];
+                byte[] xorMask = new byte[128];
+                for (int i = 0; i < andMask.Length; i++) andMask[i] = 0xFF;
+                _blankCursor = CreateCursor(IntPtr.Zero, 0, 0, 32, 32, andMask, xorMask);
+            }
+            IntPtr blank = _blankCursor;
             if (blank == IntPtr.Zero) return;
             uint[] ids = new uint[] { 32512, 32513, 32514, 32515, 32516, 32631, 32640, 32641, 32642, 32643, 32644, 32645, 32646, 32648, 32649, 32650, 32651, 32671 };
             foreach (uint id in ids) SetSystemCursor(CopyIcon(blank), id);
-            DestroyCursor(blank);
+            try
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(CursorFlagPath()));
+                File.WriteAllText(CursorFlagPath(), System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+            }
+            catch { }
         }
         catch { }
     }
@@ -204,19 +230,6 @@ public sealed class CursorForm : Form
                     g.DrawPolygon(outline, arrow);
                 }
             }
-            string dump = Environment.GetEnvironmentVariable("DSH_CU_DUMP");
-            if (!string.IsNullOrEmpty(dump))
-            {
-                try
-                {
-                    surface.Save(dump, ImageFormat.Png);
-                    System.IO.File.AppendAllText(dump + ".log",
-                        DateTime.Now.ToString("HH:mm:ss.fff") + " visible=" + Visible + " handle=" + Handle.ToInt64() +
-                        " bounds=" + Left + "," + Top + " " + Width + "x" + Height +
-                        " layerOk=" + Native.LastLayerOk + " err=" + Native.LastLayerError + "\n");
-                }
-                catch { }
-            }
             if (!Visible) Show();
             Native.ApplyLayered(this, surface);
         }
@@ -391,7 +404,7 @@ public sealed class StripForm : Form
                 // halo: widest + faintest first, then tighten
                 for (int i = 3; i >= 1; i--)
                 {
-                    float width = i * 2.6f;
+                    float width = i * 3.2f;
                     int alpha = Math.Max(6, glowAlpha / (i + 1));
                     using (Pen halo = new Pen(Color.FromArgb(alpha, accent), width))
                     {
@@ -410,7 +423,7 @@ public sealed class StripForm : Form
                 }
 
                 // core hairline
-                using (Pen core = new Pen(Color.FromArgb(coreAlpha, accent), 1.4f))
+                using (Pen core = new Pen(Color.FromArgb(coreAlpha, accent), 2f))
                 {
                     core.Alignment = PenAlignment.Center;
                     if (vertical)
@@ -514,7 +527,7 @@ internal sealed class Controller : ApplicationContext
     delegate IntPtr LowLevelKeyboardProc(int nCode, IntPtr wParam, IntPtr lParam);
 
     const int Radius = 18;   // corner radius
-    const int Glow = 12;     // band the halo fades inside
+    const int Glow = 16;     // band the halo fades inside
 
     public Controller(int ttlMs)
     {
@@ -545,13 +558,18 @@ internal sealed class Controller : ApplicationContext
     void Tick()
     {
         _tick++;
+        if (Config.OwnerPid > 0)
+        {
+            try { if (System.Diagnostics.Process.GetProcessById(Config.OwnerPid).HasExited) { ExitThreadCore(); return; } }
+            catch { ExitThreadCore(); return; }
+        }
         if (DateTime.UtcNow > _deadline) { ExitThreadCore(); return; }
 
         Rectangle screen = SystemInformation.VirtualScreen;
         // slow 3.2s breath: the frame gets a little brighter and a touch wider
         double phase = (Math.Sin(_tick / 26.0 - 1.57) + 1.0) / 2.0;
-        int coreAlpha = 170 + (int)Math.Round(70 * phase);
-        int glowAlpha = 26 + (int)Math.Round(20 * phase);
+        int coreAlpha = 200 + (int)Math.Round(55 * phase);   // clearly visible, still a hairline
+        int glowAlpha = 42 + (int)Math.Round(26 * phase);
         int thickness = Glow;
 
         int x0 = screen.Left, y0 = screen.Top, w = screen.Width, h = screen.Height;
@@ -602,6 +620,10 @@ internal sealed class Controller : ApplicationContext
         }
         catch { }
 
+        // Windows restores the real cursors on resume / display change; put the blank
+        // ones back while the indicator is up (Codex: "schedule system cursor re-suppression").
+        if (Config.SuppressCursor && _tick % 40 == 0) Native.SuppressSystemCursors(true);
+
         if (!_cursor.Live)
         {
             PointNative p;
@@ -641,6 +663,36 @@ internal static class Program
         try { SetProcessDpiAwarenessContext(new IntPtr(-4)); } catch { }
         try { SetProcessDPIAware(); } catch { }
 
+        // Guard mode: wait for the owner, then restore the cursors. This must run before
+        // anything else - a guard that reached the suppression block would hide the
+        // cursors again and spawn another guard, and the chain would never stop.
+        int guardIndex = Array.IndexOf(args, "--cursor-guard");
+        if (guardIndex >= 0 && args.Length > guardIndex + 1)
+        {
+            int ownerPid;
+            if (int.TryParse(args[guardIndex + 1], out ownerPid) && ownerPid != System.Diagnostics.Process.GetCurrentProcess().Id)
+            {
+                try
+                {
+                    System.Diagnostics.Process owner = System.Diagnostics.Process.GetProcessById(ownerPid);
+                    owner.WaitForExit(600000); // hard cap: a guard never lives forever
+                }
+                catch { /* owner already gone */ }
+                // Only clean up our own owner's suppression: a newer overlay may have
+                // taken over the cursors in the meantime, and restoring them here would
+                // make the real pointer reappear under a live indicator.
+                bool ours = false;
+                try
+                {
+                    string flagPath = Native.CursorFlagPath();
+                    ours = File.Exists(flagPath) && File.ReadAllText(flagPath).Trim() == ownerPid.ToString();
+                }
+                catch { }
+                if (ours) Native.SuppressSystemCursors(false);
+            }
+            return;
+        }
+
         int ttlMs = 20000;
         for (int i = 0; i < args.Length - 1; i++)
         {
@@ -651,6 +703,7 @@ internal static class Program
             else if (a == "--text") Config.Title = args[i + 1];
             else if (a == "--hint") Config.Hint = args[i + 1];
             else if (a == "--ttl-ms") int.TryParse(args[i + 1], out ttlMs);
+            else if (a == "--owner-pid") int.TryParse(args[i + 1], out Config.OwnerPid);
         }
         Config.SuppressCursor = true;                                   // Codex default
         for (int i = 0; i < args.Length; i++) if (args[i] == "--no-suppress-cursor") Config.SuppressCursor = false;
@@ -660,6 +713,16 @@ internal static class Program
         {
             Native.SuppressSystemCursors(true);
             AppDomain.CurrentDomain.ProcessExit += (s, e) => Native.SuppressSystemCursors(false);
+            try
+            {
+                System.Diagnostics.ProcessStartInfo guard = new System.Diagnostics.ProcessStartInfo(
+                    System.Reflection.Assembly.GetExecutingAssembly().Location,
+                    "--cursor-guard " + System.Diagnostics.Process.GetCurrentProcess().Id);
+                guard.UseShellExecute = false;
+                guard.CreateNoWindow = true;
+                System.Diagnostics.Process.Start(guard);
+            }
+            catch { /* the helper watchdog still covers us */ }
         }
 
         Application.EnableVisualStyles();

package/native/Program.cs

@@ -88,16 +88,19 @@ public static class Program
             if (p == null) p = new Dictionary<string, object>();
             // Codex ships the budget with every call (x-oai-cua-request-budget-ms) and the
             // helper honours it; here it bounds capture waits and marks overruns.
-            Budget.Begin(Json.GetLong(p, "__budgetMs", 0));
+            Budget.Begin(Json.GetLong(p, "__budgetMs", 0), Json.GetString(p, "__cancelFile"));
+            try { if (_driver != null) _driver.Maintenance(); } catch { }
             object result = Dispatch(method, p);
             return Ok(id, result);
         }
         catch (ToolError te)
         {
+            try { _driver.InvalidateState(new Dictionary<string, object>()); } catch { }
             return Fail(id, te.Code, te.Message);
         }
         catch (Exception ex)
         {
+            try { _driver.InvalidateState(new Dictionary<string, object>()); } catch { }
             return Fail(id, "internal_error", ex.GetType().Name + ": " + ex.Message);
         }
     }
@@ -109,6 +112,7 @@ public static class Program
         {
             case "ping": return _driver.Ping(p);
             case "hello": return _driver.Hello(p);
+            case "restore_cursor": return _driver.RestoreCursor(p);
             case "close": return _driver.Close(p);
             case "list_windows": return _driver.ListWindows(p);
             case "list_apps": return _driver.ListApps(p);
@@ -128,6 +132,7 @@ public static class Program
             case "configure": return _driver.Configure(p);
             case "approve_app": return _driver.ApproveApp(p);
             case "end_turn": return _driver.EndTurn(p);
+            case "invalidate_state": return _driver.InvalidateState(p);
             case "start_audio_recording": return _driver.StartAudioRecording(p);
             case "stop_audio_recording": return _driver.StopAudioRecording(p);
             case "shutdown": return new Dictionary<string, object> { { "bye", true } };