windows-development-sandbox 1.11.6 → 1.12.0

package/native/csharp/HcsHost/AssemblyInfo.cs

@@ -8,7 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("windows-development-sandbox (open source)")]
 [assembly: AssemblyProduct("Windows Development Sandbox")]
 [assembly: AssemblyCopyright("MIT License, windows-development-sandbox contributors")]
-[assembly: AssemblyVersion("1.11.6.0")]
-[assembly: AssemblyFileVersion("1.11.6.0")]
-[assembly: AssemblyInformationalVersion("1.11.6")]
+[assembly: AssemblyVersion("1.12.0.0")]
+[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyInformationalVersion("1.12.0")]
 [assembly: ComVisible(false)]
+// computecore.dll and computestorage.dll are not KnownDLLs: load them from System32 only, never from the exe's folder.
+[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.System32)]

package/native/csharp/HcsHost/Hcs.cs

@@ -100,6 +100,9 @@ namespace AgentSandbox.HcsHost
             [DllImport("computecore.dll", ExactSpelling = true, CharSet = CharSet.Unicode)]
             public static extern int HcsGetComputeSystemProperties(IntPtr computeSystem, IntPtr operation, string propertyQuery);
 
+            [DllImport("computecore.dll", ExactSpelling = true, CharSet = CharSet.Unicode)]
+            public static extern int HcsModifyComputeSystem(IntPtr computeSystem, IntPtr operation, string configuration, IntPtr identity);
+
             [DllImport("computecore.dll", ExactSpelling = true)]
             public static extern void HcsCloseComputeSystem(IntPtr computeSystem);
 
@@ -245,6 +248,12 @@ namespace AgentSandbox.HcsHost
             return WithSystem(id, QueryMs, delegate(IntPtr system, IntPtr op) { return NativeMethods.HcsGetComputeSystemProperties(system, op, queryJson); });
         }
 
+        /// <summary>Applies one ModifySettingRequest to a running system (HcsModifyComputeSystem, no identity token).</summary>
+        public static HcsReply Modify(string id, string modifySettingRequest)
+        {
+            return WithSystem(id, ChangeMs, delegate(IntPtr system, IntPtr op) { return NativeMethods.HcsModifyComputeSystem(system, op, modifySettingRequest, IntPtr.Zero); });
+        }
+
         /// <summary>Lets the virtual machine `vmId` open the file (its disk). The file must exist.</summary>
         public static HcsReply GrantVmAccess(string vmId, string filePath)
         {

package/native/csharp/HcsHost/Program.cs

@@ -1,6 +1,6 @@
 // HcsHost.exe <verb> [arguments] --out <response.json>
 // Verbs: check, enumerate, properties <id>, create <request.json>, start <id>, terminate <id>,
-//        grant-vm-access <vmId> <file>, create-vhdx <path> <maxGb>.
+//        grant-vm-access <vmId> <file>, create-vhdx <path> <maxGb>, share <request.json> (prototype).
 // The answer is one JSON file (see Json.Response); exit code 0 = ok, 1 = failed, 2 = wrong use. A create request is
 // {"id": "...", "document": "<the HCS document as a JSON string>"}. Never attaches a disk to this PC.
 using System;
@@ -109,6 +109,10 @@ namespace AgentSandbox.HcsHost
                 }
                 return FromReply(verb == "start" ? Hcs.Start(args[1]) : Hcs.Terminate(args[1]), null, out response);
             }
+            if (verb == "share" && args.Count == 2)
+            {
+                return Share(args[1], out response);
+            }
             if (verb == "grant-vm-access" && args.Count == 3)
             {
                 if (Refused(Guard.IdProblem(args[1]), out response) || Refused(Guard.DiskProblem(args[2]), out response))
@@ -170,6 +174,27 @@ namespace AgentSandbox.HcsHost
             return FromReply(Hcs.Create((string)id, (string)document), null, out response);
         }
 
+        /// <summary>
+        /// PROTOTYPE (docs/design/hcs-live-folders.md): adds or removes a vSMB share on a running system of OURS (id
+        /// prefix and Owner, as for start/terminate). Windows Sandbox's own system is refused like any other.
+        /// </summary>
+        private static int Share(string requestFile, out string response)
+        {
+            string problem;
+            ShareRequest request = ShareRequest.Read(requestFile, out problem);
+            if (Refused(problem, out response))
+            {
+                return ExitUsage;
+            }
+            if (Refused(Guard.IdProblem(request.Id), out response) || Refused(Guard.OwnerProblem(request.Id), out response))
+            {
+                return ExitUsage;
+            }
+            Dictionary<string, string> values = new Dictionary<string, string>();
+            values["request"] = request.ToModifySettingRequest();
+            return FromReply(Hcs.Modify(request.Id, values["request"]), values, out response);
+        }
+
         /// <summary>True (with the refusal as the response) when `problem` says why the request is not allowed.</summary>
         private static bool Refused(string problem, out string response)
         {

package/native/csharp/HcsHost/Share.cs

@@ -0,0 +1,173 @@
+// Live folders (PROTOTYPE, not wired into the CLI; docs/design/hcs-live-folders.md): a vSMB share added to or removed
+// from a RUNNING compute system with HcsModifyComputeSystem. The request is built here from checked fields, never
+// passed through: only ResourcePath "VirtualMachine/Devices/VirtualSmb/Shares", only Add or Remove, a share name with
+// this tool's prefix, and fixed options (NoDirectmap always; read-only unless asked; never TakeBackupPrivilege,
+// UseShareRootIdentity, AllowedFiles or any other option that changes whose rights the guest uses).
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Web.Script.Serialization;
+
+namespace AgentSandbox.HcsHost
+{
+    /// <summary>One checked share request: {"id", "action": "add"|"remove", "name", "path", "readOnly"}.</summary>
+    public sealed class ShareRequest
+    {
+        public const string ResourcePath = "VirtualMachine/Devices/VirtualSmb/Shares";
+        /// <summary>Our share names: never the 64-hex names Windows Sandbox gives its own shares.</summary>
+        private static readonly Regex SafeName = new Regex("^agentsbx-[0-9a-f]{8,32}$");
+        private const long MaxRequestBytes = 64 * 1024;
+
+        public string Id;
+        public bool Add;
+        public string Name;
+        public string Path;
+        public bool ReadOnly = true;
+
+        /// <summary>Reads and checks a request file. Null with `problem` set when it is not allowed.</summary>
+        public static ShareRequest Read(string file, out string problem)
+        {
+            FileInfo info = new FileInfo(file);
+            if (!info.Exists || info.Length > MaxRequestBytes)
+            {
+                problem = "the request must be a file of at most 64 KB";
+                return null;
+            }
+            Dictionary<string, object> raw;
+            try
+            {
+                raw = new JavaScriptSerializer().Deserialize<Dictionary<string, object>>(File.ReadAllText(file, Encoding.UTF8));
+            }
+            catch (ArgumentException)
+            {
+                problem = "the request is not JSON";
+                return null;
+            }
+            catch (InvalidOperationException)
+            {
+                problem = "the request is not JSON";
+                return null;
+            }
+            ShareRequest r = new ShareRequest();
+            r.Id = Text(raw, "id");
+            string action = Text(raw, "action");
+            r.Name = Text(raw, "name");
+            r.Path = Text(raw, "path");
+            object ro;
+            if (raw != null && raw.TryGetValue("readOnly", out ro))
+            {
+                if (!(ro is bool))
+                {
+                    problem = "readOnly must be true or false";
+                    return null;
+                }
+                r.ReadOnly = (bool)ro;
+            }
+            if (action != "add" && action != "remove")
+            {
+                problem = "action must be add or remove";
+                return null;
+            }
+            r.Add = action == "add";
+            if (r.Name == null || !SafeName.IsMatch(r.Name))
+            {
+                problem = "the share name must look like agentsbx-<8 to 32 hex digits>";
+                return null;
+            }
+            problem = r.Add ? FolderProblem(r.Path) : null;
+            return problem == null ? r : null;
+        }
+
+        private static string Text(Dictionary<string, object> raw, string key)
+        {
+            object value;
+            if (raw == null || !raw.TryGetValue(key, out value))
+            {
+                return null;
+            }
+            return value as string;
+        }
+
+        /// <summary>
+        /// Null when `path` is a full local path to an existing folder (not a drive root, no link anywhere on the way);
+        /// otherwise why not. The host's TypeScript checks the same and more (which folders may be shared at all).
+        /// </summary>
+        public static string FolderProblem(string path)
+        {
+            // No '/', no ':' after the drive (streams), no wildcards or control characters.
+            if (string.IsNullOrEmpty(path) || path.Length > 240 || !Regex.IsMatch(path, "^[A-Za-z]:\\\\[^<>\"|?*:/\\x00-\\x1f]+$"))
+            {
+                return "only a full local path to a folder can be shared (C:\\...)";
+            }
+            string trimmed = path.TrimEnd('\\');
+            foreach (string part in trimmed.Substring(3).Split('\\'))
+            {
+                if (part.Length == 0 || part == "." || part == ".." || part.EndsWith(".") || part.EndsWith(" ") || part.Contains("~"))
+                {
+                    return "the path must be in its plain long form (no . or .. parts, trailing dots or spaces, or short names)";
+                }
+            }
+            string full;
+            try
+            {
+                full = System.IO.Path.GetFullPath(trimmed);
+            }
+            catch (Exception)
+            {
+                return "the path cannot be read";
+            }
+            if (!string.Equals(full, trimmed, StringComparison.Ordinal))
+            {
+                return "the path must already be in its full form";
+            }
+            DriveInfo drive = new DriveInfo(trimmed.Substring(0, 1));
+            if (drive.DriveType != DriveType.Fixed)
+            {
+                // A subst drive still reports Fixed: the wsb-share verb adds a QueryDosDevice check (design note).
+                return "only folders on a fixed local drive can be shared (not network or removable drives)";
+            }
+            DirectoryInfo dir = new DirectoryInfo(trimmed);
+            if (!dir.Exists)
+            {
+                return "the folder does not exist";
+            }
+            if (dir.Parent == null)
+            {
+                return "a whole drive cannot be shared";
+            }
+            for (DirectoryInfo d = dir; d != null && d.Parent != null; d = d.Parent)
+            {
+                if ((d.Attributes & FileAttributes.ReparsePoint) != 0)
+                {
+                    return "the folder or one above it is a link: " + d.FullName;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>The ModifySettingRequest (HCS schema; learn.microsoft.com .../hcsmodifycomputesystem).</summary>
+        public string ToModifySettingRequest()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("{\"ResourcePath\":").Append(Json.Quote(ResourcePath));
+            sb.Append(",\"RequestType\":").Append(Json.Quote(Add ? "Add" : "Remove"));
+            sb.Append(",\"Settings\":{\"Name\":").Append(Json.Quote(Name));
+            if (Add)
+            {
+                sb.Append(",\"Path\":").Append(Json.Quote(System.IO.Path.GetFullPath(Path.TrimEnd('\\'))));
+                // hcsshim's read-only defaults (internal/uvm/vsmb.go DefaultVSMBOptions) plus NoDirectmap: a share that
+                // was never direct-mapped can be removed again while the system runs.
+                sb.Append(",\"Options\":{\"NoDirectmap\":true");
+                if (ReadOnly)
+                {
+                    sb.Append(",\"ReadOnly\":true,\"ShareRead\":true,\"CacheIo\":true,\"PseudoOplocks\":true");
+                }
+                sb.Append("}");
+            }
+            sb.Append("}}");
+            return sb.ToString();
+        }
+    }
+}

package/native/csharp/HostTools/AssemblyInfo.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("windows-development-sandbox (open source)")]
 [assembly: AssemblyProduct("Windows Development Sandbox")]
 [assembly: AssemblyCopyright("MIT License, windows-development-sandbox contributors")]
-[assembly: AssemblyVersion("1.11.6.0")]
-[assembly: AssemblyFileVersion("1.11.6.0")]
-[assembly: AssemblyInformationalVersion("1.11.6")]
+[assembly: AssemblyVersion("1.12.0.0")]
+[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyInformationalVersion("1.12.0")]
 [assembly: ComVisible(false)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windows-development-sandbox",
-  "version": "1.11.6",
+  "version": "1.12.0",
   "description": "A disposable Windows Sandbox for development, with or without an AI agent (Claude Code, Codex, Gemini, opencode, ...): the folder you run it from is the workspace, toolchains and databases for your project install themselves, and nothing else on your PC is reachable.",
   "type": "module",
   "license": "MIT",

package/sandbox/addons/ccusage/package-lock.json

@@ -0,0 +1,111 @@
+{
+  "name": "sandbox-addon-ccusage",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "sandbox-addon-ccusage",
+      "dependencies": {
+        "ccusage": "20.0.36"
+      }
+    },
+    "node_modules/@ccusage/ccusage-darwin-arm64": {
+      "version": "20.0.36",
+      "resolved": "https://registry.npmjs.org/@ccusage/ccusage-darwin-arm64/-/ccusage-darwin-arm64-20.0.36.tgz",
+      "integrity": "sha512-vG0jeRvKee/WJLwISk6j3OH1uzDHjgwTLD4ozZIP17ccMwmNj9+XFiCLulfqPAUw5DXAM7sfdCoZ/6VSev/FOw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@ccusage/ccusage-darwin-x64": {
+      "version": "20.0.36",
+      "resolved": "https://registry.npmjs.org/@ccusage/ccusage-darwin-x64/-/ccusage-darwin-x64-20.0.36.tgz",
+      "integrity": "sha512-0leQpdmb0YQyHclvJIX7yp/BR/tqyyDgGZz9pUhMKOu+Mj/NQT6mrgetcYPkV1L0PxqDJCW9uLe1ORDAgwE3rA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@ccusage/ccusage-linux-arm64": {
+      "version": "20.0.36",
+      "resolved": "https://registry.npmjs.org/@ccusage/ccusage-linux-arm64/-/ccusage-linux-arm64-20.0.36.tgz",
+      "integrity": "sha512-4Z8x2E3QRq7Dioj6EbWwKIjE8D54QjN6uzDMo21nCr4igyQFi3f3vPGisWhaq7oLHS7dS4ICPPI0QmLf8BXV+g==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@ccusage/ccusage-linux-x64": {
+      "version": "20.0.36",
+      "resolved": "https://registry.npmjs.org/@ccusage/ccusage-linux-x64/-/ccusage-linux-x64-20.0.36.tgz",
+      "integrity": "sha512-j64jRL4cwqMUC7KLNggHvQr+DDv/Uh5MFRFgUNhk0+Z9WdcQFXSwMZqWWZ7nzTasEJFA1SuuJNEZ5r5WcDA5Vw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@ccusage/ccusage-win32-arm64": {
+      "version": "20.0.36",
+      "resolved": "https://registry.npmjs.org/@ccusage/ccusage-win32-arm64/-/ccusage-win32-arm64-20.0.36.tgz",
+      "integrity": "sha512-stKmGB8Y2TQTYDxm2WgDqe1G1/FcVxn3uT+b1r/WAGkhx1H/kaf6mLYHOVnTOL99y1faLCLQ+7OeoOUPiSWJOw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@ccusage/ccusage-win32-x64": {
+      "version": "20.0.36",
+      "resolved": "https://registry.npmjs.org/@ccusage/ccusage-win32-x64/-/ccusage-win32-x64-20.0.36.tgz",
+      "integrity": "sha512-Z3S+5BsEDy4ztkZpsjjFHZ1COf8NVts7f2lQqSuFluh75G/0kC5dxHkCGOdJFsiWQjUDwfb7x00hDsgc33z1Vg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/ccusage": {
+      "version": "20.0.36",
+      "resolved": "https://registry.npmjs.org/ccusage/-/ccusage-20.0.36.tgz",
+      "integrity": "sha512-V2XNlZCv5k/Tal91CoaglDq5m9YBt+MRNpgfrhAAUqkk84AMj3lS9WgKOWBJf+3ygUYm7GXOJ2XqF4Lxe1D7xQ==",
+      "license": "MIT",
+      "bin": {
+        "ccusage": "src/cli.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ryoppippi"
+      },
+      "optionalDependencies": {
+        "@ccusage/ccusage-darwin-arm64": "20.0.36",
+        "@ccusage/ccusage-darwin-x64": "20.0.36",
+        "@ccusage/ccusage-linux-arm64": "20.0.36",
+        "@ccusage/ccusage-linux-x64": "20.0.36",
+        "@ccusage/ccusage-win32-arm64": "20.0.36",
+        "@ccusage/ccusage-win32-x64": "20.0.36"
+      }
+    }
+  }
+}

package/sandbox/addons/ccusage/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "sandbox-addon-ccusage",
+  "private": true,
+  "dependencies": {
+    "ccusage": "20.0.36"
+  }
+}