windows-development-sandbox 1.13.2 → 1.15.0

package/dist/runtime/db.js

@@ -26621,6 +26621,9 @@ var ProjectsSchema = external_exports.strictObject({
   ),
   wsbShare: external_exports.boolean().describe(
     "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."
+  ),
+  liveFolders: external_exports.enum(["off", "hcs"]).describe(
+    'ALPHA, UNTESTED ON A REAL PC: "hcs" adds a project folder to the running sandbox through the Host Compute Service where `wsb share` is missing (one administrator prompt per add or remove; always read-only in this alpha). If it fails, the sandbox may close: save your work first. Turn it on before the sandbox starts. "off" (default) offers a restart instead. The real-PC tests still to pass are in docs/design/hcs-live-folders.md ("Test plan").'
   )
 });
 
@@ -27211,8 +27214,16 @@ var RunDir = class {
   projectsDir;
   /** audit.processes: programs the sandbox started, in small .jsonl files the host takes in and deletes. */
   auditDir;
+  /**
+   * Each running session's process tree, recorded by its ptyhost (guest only: the daemon ends what a ptyhost that was
+   * itself ended left running).
+   */
+  treesDir;
   /** One-shot secrets the host hands over (see secrets.ts). Next to run, not in it: shared-use users can change run. */
   secretsDir;
+  /** Live folders (live.ts): signed host requests, and the daemon's replies. */
+  liveDir;
+  liveRepliesDir;
   constructor(dataDir2) {
     this.root = path5.join(dataDir2, "run");
     this.sandboxFile = path5.join(this.root, "sandbox.json");
@@ -27224,7 +27235,16 @@ var RunDir = class {
     this.sessionsDir = path5.join(this.root, "sessions");
     this.projectsDir = path5.join(this.root, "projects");
     this.auditDir = path5.join(this.root, "audit");
+    this.treesDir = path5.join(this.root, "trees");
     this.secretsDir = path5.join(dataDir2, "secrets");
+    this.liveDir = path5.join(this.root, "live");
+    this.liveRepliesDir = path5.join(this.root, "live-replies");
+  }
+  liveFile(id) {
+    return path5.join(this.liveDir, safeId(id) + ".json");
+  }
+  liveReplyFile(id) {
+    return path5.join(this.liveRepliesDir, safeId(id) + ".json");
   }
   requestFile(id) {
     return path5.join(this.requestsDir, safeId(id) + ".json");
@@ -27235,6 +27255,9 @@ var RunDir = class {
   sessionFile(id) {
     return path5.join(this.sessionsDir, safeId(id) + ".json");
   }
+  treeFile(id) {
+    return path5.join(this.treesDir, safeId(id) + ".json");
+  }
   projectFile(name) {
     return path5.join(this.projectsDir, safeId(name) + ".json");
   }

package/dist/runtime/main.js

@@ -26750,6 +26750,9 @@ var ProjectsSchema = external_exports.strictObject({
   ),
   wsbShare: external_exports.boolean().describe(
     "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."
+  ),
+  liveFolders: external_exports.enum(["off", "hcs"]).describe(
+    'ALPHA, UNTESTED ON A REAL PC: "hcs" adds a project folder to the running sandbox through the Host Compute Service where `wsb share` is missing (one administrator prompt per add or remove; always read-only in this alpha). If it fails, the sandbox may close: save your work first. Turn it on before the sandbox starts. "off" (default) offers a restart instead. The real-PC tests still to pass are in docs/design/hcs-live-folders.md ("Test plan").'
   )
 });
 
@@ -27322,8 +27325,16 @@ var RunDir = class {
   projectsDir;
   /** audit.processes: programs the sandbox started, in small .jsonl files the host takes in and deletes. */
   auditDir;
+  /**
+   * Each running session's process tree, recorded by its ptyhost (guest only: the daemon ends what a ptyhost that was
+   * itself ended left running).
+   */
+  treesDir;
   /** One-shot secrets the host hands over (see secrets.ts). Next to run, not in it: shared-use users can change run. */
   secretsDir;
+  /** Live folders (live.ts): signed host requests, and the daemon's replies. */
+  liveDir;
+  liveRepliesDir;
   constructor(dataDir2) {
     this.root = path6.join(dataDir2, "run");
     this.sandboxFile = path6.join(this.root, "sandbox.json");
@@ -27335,7 +27346,16 @@ var RunDir = class {
     this.sessionsDir = path6.join(this.root, "sessions");
     this.projectsDir = path6.join(this.root, "projects");
     this.auditDir = path6.join(this.root, "audit");
+    this.treesDir = path6.join(this.root, "trees");
     this.secretsDir = path6.join(dataDir2, "secrets");
+    this.liveDir = path6.join(this.root, "live");
+    this.liveRepliesDir = path6.join(this.root, "live-replies");
+  }
+  liveFile(id) {
+    return path6.join(this.liveDir, safeId(id) + ".json");
+  }
+  liveReplyFile(id) {
+    return path6.join(this.liveRepliesDir, safeId(id) + ".json");
   }
   requestFile(id) {
     return path6.join(this.requestsDir, safeId(id) + ".json");
@@ -27346,6 +27366,9 @@ var RunDir = class {
   sessionFile(id) {
     return path6.join(this.sessionsDir, safeId(id) + ".json");
   }
+  treeFile(id) {
+    return path6.join(this.treesDir, safeId(id) + ".json");
+  }
   projectFile(name) {
     return path6.join(this.projectsDir, safeId(name) + ".json");
   }
@@ -29290,7 +29313,8 @@ var SOURCES = {
   cargoshim: "CargoShim.cs",
   linkgate: "LinkGate.cs",
   pathsync: "PathSync.cs",
-  memgov: "MemGov.cs"
+  memgov: "MemGov.cs",
+  bindmount: "BindMount.cs"
 };
 function sourceOf(name) {
   return path31.join(launchDir, "sandbox", "csharp", SOURCES[name]);
@@ -35339,12 +35363,175 @@ var CtrlCGuard = class {
   }
 };
 
-// src/shared/pty/terminal.ts
-var MOUSE_OFF = "\x1B[?1000l\x1B[?1002l\x1B[?1003l\x1B[?1005l\x1B[?1006l\x1B[?1015l";
+// src/shared/pty/key-gate.ts
 function fixWindowsKeys(chunk) {
   if (!chunk.includes(8) && !chunk.includes(127)) return chunk;
   return Buffer.from(chunk.map((b) => b === 8 ? 127 : b === 127 ? 8 : b));
 }
+var KeyGate = class {
+  pending = [];
+  decided;
+  swap = false;
+  /** windowsConsole: input comes from a Windows console in raw mode (its mode is decided later); else it goes as is. */
+  constructor(windowsConsole) {
+    this.decided = !windowsConsole;
+  }
+  /** The bytes to send now (empty while the mode is not known yet). */
+  push(data) {
+    if (!data.length) return data;
+    if (!this.decided) {
+      this.pending.push(data);
+      return Buffer.alloc(0);
+    }
+    return this.swap ? fixWindowsKeys(data) : data;
+  }
+  /** The console's mode is known: what was held, ready to send. Later calls only change how new input is read. */
+  decide(vtInput) {
+    this.swap = !vtInput;
+    this.decided = true;
+    const held = Buffer.concat(this.pending);
+    this.pending = [];
+    return this.swap ? fixWindowsKeys(held) : held;
+  }
+};
+
+// src/shared/pty/mouse-modes.ts
+var TRACKING = [9, 1e3, 1002, 1003];
+var MAX_PARAMS = 64;
+var MOTION = 32;
+var NO_BUTTON = 3;
+var MouseModes = class {
+  on = /* @__PURE__ */ new Set();
+  /** 0 text, 1 after ESC, 2 after ESC[, 3 in ESC[? parameters, 4 after ESC[! */
+  state = 0;
+  params = "";
+  /** Reads the program's output (after OutputFilter): the mode changes in it. */
+  watch(output3) {
+    for (const b of output3) {
+      if (b === 27) {
+        this.state = 1;
+        continue;
+      }
+      if (this.state === 1) {
+        if (b === 99) this.on.clear();
+        this.state = b === 91 ? 2 : 0;
+      } else if (this.state === 2) {
+        this.state = b === 63 ? 3 : b === 33 ? 4 : 0;
+        this.params = "";
+      } else if (this.state === 4) {
+        if (b === 112) this.on.clear();
+        this.state = 0;
+      } else if (this.state === 3) {
+        if (b >= 48 && b <= 57 || b === 59) {
+          this.params += String.fromCharCode(b);
+          if (this.params.length > MAX_PARAMS) this.state = 0;
+        } else {
+          if (b === 104 || b === 108) this.apply(this.params, b === 104);
+          this.state = 0;
+        }
+      }
+    }
+  }
+  /** The program is gone (exited or restarting): its modes went with it. */
+  reset() {
+    this.on.clear();
+    this.state = 0;
+    this.params = "";
+  }
+  /** True while the program tracks the mouse in any way. */
+  tracking() {
+    return TRACKING.some((m) => this.on.has(m));
+  }
+  /** True while the program has a mode on (2004: bracketed paste). */
+  has(mode) {
+    return this.on.has(mode);
+  }
+  /** The mode numbers on now (for the report and tests). */
+  modes() {
+    return [...this.on].sort((a, b) => a - b);
+  }
+  /** `input` without the mouse reports the program has not asked for. Sequences must be whole (InputJoiner). */
+  filter(input2) {
+    if (!input2.includes(27)) return input2;
+    const parts2 = [];
+    let from = 0;
+    let i = input2.indexOf(27);
+    while (i !== -1) {
+      const report = mouseReport(input2, i, this.on.has(1005), this.on.has(1015));
+      if (report && !this.allows(report.button)) {
+        parts2.push(input2.subarray(from, i));
+        from = i + report.length;
+        i = input2.indexOf(27, from);
+      } else i = input2.indexOf(27, i + 1);
+    }
+    if (from === 0) return input2;
+    parts2.push(input2.subarray(from));
+    return Buffer.concat(parts2);
+  }
+  allows(button) {
+    if (!this.tracking()) return false;
+    if ((button & MOTION) === 0) return true;
+    if (this.on.has(1003)) return true;
+    return this.on.has(1002) && (button & NO_BUTTON) !== NO_BUTTON;
+  }
+  apply(params, set2) {
+    for (const p of params.split(";")) {
+      const mode = Number(p);
+      if (!p || !Number.isSafeInteger(mode)) continue;
+      if (set2) this.on.add(mode);
+      else this.on.delete(mode);
+    }
+  }
+};
+function mouseReport(data, at, utf8, urxvt) {
+  if (data[at + 1] !== 91) return null;
+  const sgr = data[at + 2] === 60;
+  if (sgr || urxvt && data[at + 2] >= 48 && data[at + 2] <= 57) {
+    let i = at + (sgr ? 3 : 2);
+    let digits = "";
+    let fields = 1;
+    for (; i < data.length && i - at < 32; i++) {
+      const b = data[i];
+      if (b >= 48 && b <= 57) {
+        if (fields === 1) digits += String.fromCharCode(b);
+      } else if (b === 59) fields++;
+      else break;
+    }
+    if (i >= data.length || fields !== 3 || !digits) return null;
+    if (sgr ? data[i] !== 77 && data[i] !== 109 : data[i] !== 77) return null;
+    const button = Number(digits) - (sgr ? 0 : 32);
+    return button >= 0 ? { button, length: i - at + 1 } : null;
+  }
+  if (data[at + 2] === 77 && !utf8 && data.length - at >= 6) {
+    const button = data[at + 3] - 32;
+    return button >= 0 ? { button, length: 6 } : null;
+  }
+  return null;
+}
+
+// src/shared/pty/terminal.ts
+var MOUSE_OFF = "\x1B[?1000l\x1B[?1002l\x1B[?1003l\x1B[?1005l\x1B[?1006l\x1B[?1015l";
+var SETTLE_QUIET_MS = 50;
+var SETTLE_MAX_MS = 300;
+function drainInput(stream) {
+  return new Promise((done) => {
+    let quiet;
+    const end = () => {
+      clearTimeout(quiet);
+      clearTimeout(cap);
+      stream.off("data", onData);
+      done();
+    };
+    const onData = () => {
+      clearTimeout(quiet);
+      quiet = setTimeout(end, SETTLE_QUIET_MS);
+    };
+    const cap = setTimeout(end, SETTLE_MAX_MS);
+    stream.on("data", onData);
+    onData();
+  });
+}
+var VT_WAIT_MS = 1e4;
 function runTerminalClient(socket, token, options = {}) {
   const stdin = process.stdin;
   const stdout = process.stdout;
@@ -35352,14 +35539,16 @@ function runTerminalClient(socket, token, options = {}) {
     const [c, r] = stdout.isTTY ? stdout.getWindowSize() : [0, 0];
     return [c || 120, r || 30];
   };
-  let swapKeys = process.platform === "win32" && stdin.isTTY;
+  const keys = new KeyGate(process.platform === "win32" && Boolean(stdin.isTTY));
   return new Promise((resolve2) => {
     let done = false;
     const reader = new FrameReader();
     const filter = new OutputFilter({ clipboardWrites: options.clipboardWrites });
     let sent = size();
     let resizeTimer;
-    let vtInput;
+    let vtInput, vtTimer;
+    const mouse = new MouseModes();
+    let passthrough = false;
     const finish = (result) => {
       if (done) return;
       done = true;
@@ -35370,9 +35559,13 @@ function runTerminalClient(socket, token, options = {}) {
       clearInterval(sizeWatch);
       clearTimeout(joinTimer);
       clearTimeout(hintTimer);
+      clearTimeout(vtTimer);
       socket.destroy();
-      stdout.write("\x1B[0m\x1B[?25h" + MOUSE_OFF + "\r\n");
-      void (vtInput?.stop() ?? Promise.resolve()).then(() => {
+      const tracked = mouse.tracking();
+      const reset = "\x1B[0m\x1B[?25h" + MOUSE_OFF + (mouse.has(2004) ? "\x1B[?2004l" : "") + "\r\n";
+      const flushed = new Promise((written) => stdout.write(reset, () => written()));
+      const settled = tracked ? flushed.then(() => drainInput(stdin)) : Promise.resolve();
+      void Promise.all([settled, vtInput?.stop()]).then(() => {
         if (stdin.isTTY) stdin.setRawMode(false);
         stdin.pause();
         resolve2(result);
@@ -35380,9 +35573,10 @@ function runTerminalClient(socket, token, options = {}) {
     };
     const joiner = new InputJoiner();
     let joinTimer;
-    const sendInput = (data) => {
-      if (data.length && !done) socket.write(encodeFrame(FrameType.Input, swapKeys ? fixWindowsKeys(data) : data));
+    const write = (data) => {
+      if (data.length && !done) socket.write(encodeFrame(FrameType.Input, data));
     };
+    const sendInput = (data) => write(keys.push(passthrough ? mouse.filter(data) : data));
     const guard = options.confirmCtrlC ? new CtrlCGuard() : null;
     let hintTimer;
     const onInput = (chunk) => {
@@ -35404,7 +35598,6 @@ function runTerminalClient(socket, token, options = {}) {
       sendInput(joiner.push(chunk));
       if (joiner.holding()) joinTimer = setTimeout(() => sendInput(joiner.flush()), JOIN_MS);
     };
-    let passthrough = false;
     const sendSize = () => {
       const [c2, r2] = size();
       if (c2 === sent[0] && r2 === sent[1]) return;
@@ -35434,11 +35627,14 @@ function runTerminalClient(socket, token, options = {}) {
       for (const frame of frames) {
         if (frame.type === FrameType.Output) {
           const out = filter.push(frame.payload);
+          mouse.watch(out);
           guard?.watchOutput(out.toString("latin1"));
           stdout.write(out);
         } else if (frame.type === FrameType.Console) passthrough = frame.payload.toString("latin1") === "conpty.dll";
-        else if (frame.type === FrameType.Restarting) stdout.write(MOUSE_OFF + "\x1B[2J\x1B[3J\x1B[H");
-        else if (frame.type === FrameType.Exit)
+        else if (frame.type === FrameType.Restarting) {
+          mouse.reset();
+          stdout.write(MOUSE_OFF + "\x1B[2J\x1B[3J\x1B[H");
+        } else if (frame.type === FrameType.Exit)
           finish({ reason: "exit", exitCode: frame.payload.length >= 4 ? frame.payload.readInt32LE(0) : 1 });
         else if (frame.type === FrameType.Error)
           finish({
@@ -35454,8 +35650,10 @@ function runTerminalClient(socket, token, options = {}) {
     socket.write(helloFrame(token, c, r));
     if (stdin.isTTY) stdin.setRawMode(true);
     vtInput = enableVtInput();
+    vtTimer = setTimeout(() => write(keys.decide(false)), VT_WAIT_MS);
     void vtInput.ready.then((on) => {
-      if (on) swapKeys = false;
+      clearTimeout(vtTimer);
+      write(keys.decide(on));
     });
     stdin.on("data", onInput);
     stdin.resume();
@@ -35565,7 +35763,9 @@ var SecretsFileSchema = external_exports.strictObject({
   /** The checked WireGuard config of vpn.provider wireguard-file (holds the private key). */
   wireguardConfig: external_exports.string().min(1).max(32 * 1024).optional(),
   /** The GitHub token you saved for sandboxes (github.shareToken), only with git access "full". */
-  githubToken: GithubTokenSchema.optional()
+  githubToken: GithubTokenSchema.optional(),
+  /** projects.liveFolders "hcs": this launch's key for signed live-folder requests (live.ts). */
+  liveFoldersKey: external_exports.string().regex(/^[0-9a-f]{64}$/).optional()
 });
 
 // src/guest/runtime/secrets.ts
@@ -35626,7 +35826,13 @@ function startDaemon(env, secrets) {
       ...env,
       AGENT_LOG_PREFIX: "daemon",
       // The agent's environment (it may hold API keys): the daemon moves it into memory and removes this at once.
-      ...secrets.harnessEnvironment ? { [BOOT_SECRETS_VARIABLE]: JSON.stringify({ harnessEnvironment: secrets.harnessEnvironment }) } : {}
+      // The live-folder key (projects.liveFolders "hcs") goes the same way into the daemon's own state.
+      ...secrets.harnessEnvironment || secrets.liveFoldersKey ? {
+        [BOOT_SECRETS_VARIABLE]: JSON.stringify({
+          ...secrets.harnessEnvironment ? { harnessEnvironment: secrets.harnessEnvironment } : {},
+          ...secrets.liveFoldersKey ? { liveFoldersKey: secrets.liveFoldersKey } : {}
+        })
+      } : {}
     }
   }).unref();
 }

package/dist/runtime/netproxy.js

@@ -26674,6 +26674,9 @@ var ProjectsSchema = external_exports.strictObject({
   ),
   wsbShare: external_exports.boolean().describe(
     "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."
+  ),
+  liveFolders: external_exports.enum(["off", "hcs"]).describe(
+    'ALPHA, UNTESTED ON A REAL PC: "hcs" adds a project folder to the running sandbox through the Host Compute Service where `wsb share` is missing (one administrator prompt per add or remove; always read-only in this alpha). If it fails, the sandbox may close: save your work first. Turn it on before the sandbox starts. "off" (default) offers a restart instead. The real-PC tests still to pass are in docs/design/hcs-live-folders.md ("Test plan").'
   )
 });
 
@@ -27202,8 +27205,16 @@ var RunDir = class {
   projectsDir;
   /** audit.processes: programs the sandbox started, in small .jsonl files the host takes in and deletes. */
   auditDir;
+  /**
+   * Each running session's process tree, recorded by its ptyhost (guest only: the daemon ends what a ptyhost that was
+   * itself ended left running).
+   */
+  treesDir;
   /** One-shot secrets the host hands over (see secrets.ts). Next to run, not in it: shared-use users can change run. */
   secretsDir;
+  /** Live folders (live.ts): signed host requests, and the daemon's replies. */
+  liveDir;
+  liveRepliesDir;
   constructor(dataDir2) {
     this.root = path3.join(dataDir2, "run");
     this.sandboxFile = path3.join(this.root, "sandbox.json");
@@ -27215,7 +27226,16 @@ var RunDir = class {
     this.sessionsDir = path3.join(this.root, "sessions");
     this.projectsDir = path3.join(this.root, "projects");
     this.auditDir = path3.join(this.root, "audit");
+    this.treesDir = path3.join(this.root, "trees");
     this.secretsDir = path3.join(dataDir2, "secrets");
+    this.liveDir = path3.join(this.root, "live");
+    this.liveRepliesDir = path3.join(this.root, "live-replies");
+  }
+  liveFile(id) {
+    return path3.join(this.liveDir, safeId(id) + ".json");
+  }
+  liveReplyFile(id) {
+    return path3.join(this.liveRepliesDir, safeId(id) + ".json");
   }
   requestFile(id) {
     return path3.join(this.requestsDir, safeId(id) + ".json");
@@ -27226,6 +27246,9 @@ var RunDir = class {
   sessionFile(id) {
     return path3.join(this.sessionsDir, safeId(id) + ".json");
   }
+  treeFile(id) {
+    return path3.join(this.treesDir, safeId(id) + ".json");
+  }
   projectFile(name) {
     return path3.join(this.projectsDir, safeId(name) + ".json");
   }