windows-development-sandbox 1.4.0 → 1.4.1

package/sandbox/ptyhost.cs

@@ -18,7 +18,8 @@
 //                  20 STATUS  [viewers:2][remoteViewers:2]  viewers heard from recently (remote = not loopback, i.e. the PC)
 //                  21 CONSOLE utf8 "conpty.dll" or "windows", sent after HELLO. With conpty.dll the output is passed
 //                             through (real scrollback, no repaint on resize): a viewer that joins later is sent the
-//                             output since the last screen clear instead, and must not clear its screen on a resize.
+//                             terminal modes in force (mouse tracking ...) and the output since the last screen clear
+//                             instead, and must not clear its screen on a resize.
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -265,7 +266,12 @@ sealed class ClientHub
             // Taken and queued under the replay lock, so no output falls between the replay and the live stream.
             lock (replayGate)
             {
-                if (Native.ConsoleKind.StartsWith("conpty") && replay.Length > 0) Send(client, Frame.Output, replay.ToArray());
+                if (Native.ConsoleKind.StartsWith("conpty"))
+                {
+                    byte[] prefix = ModePrefix();
+                    if (prefix.Length > 0) Send(client, Frame.Output, prefix);
+                    if (replay.Length > 0) Send(client, Frame.Output, replay.ToArray());
+                }
                 lock (gate) clients.Add(client);
             }
             TakeOwnership(client);
@@ -319,6 +325,7 @@ sealed class ClientHub
     void Record(byte[] output)
     {
         if (!Native.ConsoleKind.StartsWith("conpty")) return;
+        TrackModes(output);
         int clear = LastClear(output);
         if (clear >= 0) { replay.SetLength(0); replay.Write(output, clear, output.Length - clear); }
         else replay.Write(output, 0, output.Length);
@@ -330,6 +337,56 @@ sealed class ClientHub
         if (from + 1 < all.Length) replay.Write(all, from + 1, all.Length - from - 1);
     }
 
+    /**
+     * Terminal modes the program (or conpty.dll) turned on that a late viewer's terminal must have too, or its clicks and
+     * wheel never reach the program: mouse tracking (1000, 1002, 1003, 1005, 1006, 1015), focus events (1004), bracketed
+     * paste (2004), win32 input (9001), application cursor keys (1), cursor visibility (25), the alternate screen (1049).
+     * The replay is cut at the last screen clear, which may come after the program turned them on.
+     */
+    static readonly int[] ReplayedModes = { 1, 25, 1000, 1002, 1003, 1004, 1005, 1006, 1015, 1049, 2004, 9001 };
+    readonly Dictionary<int, bool> modes = new Dictionary<int, bool>();
+    /** DECSET / DECRST parser, kept across chunks: 0 text, 1 after ESC, 2 after ESC[, 3 in ESC[? parameters. */
+    int modeState;
+    readonly StringBuilder modeParams = new StringBuilder();
+
+    void TrackModes(byte[] output)
+    {
+        foreach (byte b in output)
+        {
+            if (b == 0x1b) { modeState = 1; continue; }
+            switch (modeState)
+            {
+                case 1: modeState = b == (byte)'[' ? 2 : 0; break;
+                case 2: modeState = b == (byte)'?' ? 3 : 0; modeParams.Length = 0; break;
+                case 3:
+                    if ((b >= (byte)'0' && b <= (byte)'9') || b == (byte)';') { if (modeParams.Length < 64) modeParams.Append((char)b); }
+                    else
+                    {
+                        if (b == (byte)'h' || b == (byte)'l')
+                            foreach (string p in modeParams.ToString().Split(';'))
+                            {
+                                int mode;
+                                if (int.TryParse(p, out mode) && Array.IndexOf(ReplayedModes, mode) >= 0) modes[mode] = b == (byte)'h';
+                            }
+                        modeState = 0;
+                    }
+                    break;
+            }
+        }
+    }
+
+    /** The modes to set before the replay, e.g. ESC[?1000h ESC[?1006h. */
+    byte[] ModePrefix()
+    {
+        var text = new StringBuilder();
+        foreach (int mode in ReplayedModes)
+        {
+            bool on;
+            if (modes.TryGetValue(mode, out on)) text.Append("\x1b[?" + mode + (on ? "h" : "l"));
+        }
+        return Encoding.ASCII.GetBytes(text.ToString());
+    }
+
     /** Where the last ESC[2J (clear screen) or ESC c (reset) starts in `data`, or -1. */
     static int LastClear(byte[] data)
     {
@@ -364,7 +421,7 @@ sealed class ClientHub
     }
 
     /** A restarted program starts on a clean screen (viewers clear theirs on RESTARTING). */
-    public void ResetReplay() { lock (replayGate) replay.SetLength(0); }
+    public void ResetReplay() { lock (replayGate) { replay.SetLength(0); modes.Clear(); modeState = 0; } }
 
     public void Notify(byte type)
     {

package/schemas/config.schema.json

@@ -99,8 +99,10 @@
             "description": "Folder on this PC (relative paths are relative to the config file)."
           },
           "guest": {
+            "description": "Where it appears inside the sandbox, e.g. C:\\Assets, or on another drive letter (D: to Z:) such as F:\\SteamLibrary\\steamapps\\common\\Game (shown as F: at boot). Leave it out to use the same path as on this PC (a folder inside the project stays where it is in the project). A path the sandbox cannot use (C:\\Windows\\..., C:\\Users\\..., one already in use) goes to C:\\Mapped\\<drive>\\<path> instead, and the launch says so.",
             "type": "string",
-            "description": "Where it appears inside the sandbox, e.g. C:\\Assets, or on another drive letter (D: to Z:) such as F:\\SteamLibrary\\steamapps\\common\\Game: mapped to C:\\Mirror\\F\\... and shown as F: (subst) at boot."
+            "minLength": 1,
+            "maxLength": 1024
           },
           "readOnly": {
             "type": "boolean",
@@ -1449,6 +1451,18 @@
           },
           "description": "Parent folders you said no to (not asked again)."
         },
+        "allowOutsideMappings": {
+          "anyOf": [
+            {
+              "type": "string",
+              "const": "ask"
+            },
+            {
+              "type": "boolean"
+            }
+          ],
+          "description": "A project's .sandbox-config.json may map folders from outside the project (e.g. a game folder on another drive). \"ask\" = an interactive launch asks once per project and set of folders, and remembers your answer; true = always allowed (still listed when you approve the file); false = never (the launch stops and says which folders). Only your own settings decide this, never a project file."
+        },
         "wsbShare": {
           "type": "boolean",
           "description": "On Windows 11 24H2+ with the Windows Sandbox command line (wsb), add other folders to the running sandbox with `wsb share` (untested). Otherwise starting a project outside every root offers a restart."

package/schemas/sandbox-config.schema.json

@@ -61,8 +61,10 @@
             "description": "Folder on this PC (relative paths are relative to the config file)."
           },
           "guest": {
+            "description": "Where it appears inside the sandbox, e.g. C:\\Assets, or on another drive letter (D: to Z:) such as F:\\SteamLibrary\\steamapps\\common\\Game (shown as F: at boot). Leave it out to use the same path as on this PC (a folder inside the project stays where it is in the project). A path the sandbox cannot use (C:\\Windows\\..., C:\\Users\\..., one already in use) goes to C:\\Mapped\\<drive>\\<path> instead, and the launch says so.",
             "type": "string",
-            "description": "Where it appears inside the sandbox, e.g. C:\\Assets, or on another drive letter (D: to Z:) such as F:\\SteamLibrary\\steamapps\\common\\Game: mapped to C:\\Mirror\\F\\... and shown as F: (subst) at boot."
+            "minLength": 1,
+            "maxLength": 1024
           },
           "readOnly": {
             "type": "boolean",
@@ -75,12 +77,11 @@
         },
         "required": [
           "host",
-          "guest",
           "readOnly"
         ],
         "additionalProperties": false
       },
-      "description": "Extra folders inside this project (relative to this file), e.g. a read-only data folder at another place in the sandbox."
+      "description": "Extra folders (relative paths are relative to this file), e.g. a read-only data folder at another place in the sandbox. Folders outside the project are used only as your projects.allowOutsideMappings setting allows (by default you are asked once)."
     },
     "scripts": {
       "type": "array",