diff --git a/MODULE.bazel b/MODULE.bazel index e7eb55b07b..b8c0d101bb 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -518,10 +518,6 @@ crate.annotation( # MXC's resource compiler lookup needs an explicit path for Windows GNU targets. crate.annotation( - build_script_deps = [ - "@crates//cc-1.2.55", - "@crates//winresource-0.1.34", - ], build_script_env = { "RC_PATH": "$(execpath @llvm//tools:llvm-rc)", }, diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 396ed97390..ed89062c4d 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1234,6 +1234,7 @@ "der-parser_10.0.0": "{\"dependencies\":[{\"name\":\"asn1-rs\",\"req\":\"^0.7\"},{\"name\":\"bitvec\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"cookie-factory\",\"optional\":true,\"req\":\"^0.3.0\"},{\"default_features\":false,\"name\":\"displaydoc\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4\"},{\"name\":\"nom\",\"req\":\"^7.0\"},{\"name\":\"num-bigint\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"num-traits\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0\"},{\"name\":\"rusticata-macros\",\"req\":\"^4.0\"},{\"kind\":\"dev\",\"name\":\"test-case\",\"req\":\"^3.0\"}],\"features\":{\"as_bitvec\":[\"bitvec\"],\"bigint\":[\"num-bigint\"],\"default\":[\"std\"],\"serialize\":[\"std\",\"cookie-factory\"],\"std\":[],\"unstable\":[]}}", "der-parser_9.0.0": "{\"dependencies\":[{\"name\":\"asn1-rs\",\"req\":\"^0.6\"},{\"name\":\"cookie-factory\",\"optional\":true,\"req\":\"^0.3.0\"},{\"default_features\":false,\"name\":\"displaydoc\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4\"},{\"name\":\"nom\",\"req\":\"^7.0\"},{\"name\":\"num-bigint\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"num-traits\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0\"},{\"name\":\"rusticata-macros\",\"req\":\"^4.0\"},{\"kind\":\"dev\",\"name\":\"test-case\",\"req\":\"^3.0\"}],\"features\":{\"bigint\":[\"num-bigint\"],\"default\":[\"std\"],\"serialize\":[\"std\",\"cookie-factory\"],\"std\":[],\"unstable\":[]}}", "der_0.7.10": "{\"dependencies\":[{\"features\":[\"derive\"],\"name\":\"arbitrary\",\"optional\":true,\"req\":\"^1.3\"},{\"default_features\":false,\"name\":\"bytes\",\"optional\":true,\"req\":\"^1\"},{\"name\":\"const-oid\",\"optional\":true,\"req\":\"^0.9.2\"},{\"name\":\"der_derive\",\"optional\":true,\"req\":\"^0.7.2\"},{\"name\":\"flagset\",\"optional\":true,\"req\":\"^0.4.3\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4.1\"},{\"features\":[\"alloc\"],\"name\":\"pem-rfc7468\",\"optional\":true,\"req\":\"^0.7\"},{\"kind\":\"dev\",\"name\":\"proptest\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"time\",\"optional\":true,\"req\":\"^0.3.4\"},{\"default_features\":false,\"name\":\"zeroize\",\"optional\":true,\"req\":\"^1.5\"}],\"features\":{\"alloc\":[\"zeroize?/alloc\"],\"arbitrary\":[\"dep:arbitrary\",\"const-oid?/arbitrary\",\"std\"],\"bytes\":[\"dep:bytes\",\"alloc\"],\"derive\":[\"dep:der_derive\"],\"oid\":[\"dep:const-oid\"],\"pem\":[\"dep:pem-rfc7468\",\"alloc\",\"zeroize\"],\"real\":[],\"std\":[\"alloc\"]}}", + "der_0.8.3": "{\"dependencies\":[{\"features\":[\"derive\"],\"name\":\"arbitrary\",\"optional\":true,\"req\":\"^1.4.2\"},{\"default_features\":false,\"name\":\"bytes\",\"optional\":true,\"req\":\"^1\"},{\"name\":\"const-oid\",\"optional\":true,\"req\":\"^0.10\"},{\"name\":\"der_derive\",\"optional\":true,\"req\":\"^0.8\"},{\"name\":\"derive_arbitrary\",\"optional\":true,\"req\":\"^1.4.2\"},{\"name\":\"flagset\",\"optional\":true,\"req\":\"^0.4.7\"},{\"default_features\":false,\"name\":\"heapless\",\"optional\":true,\"req\":\"^0.9\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^1\"},{\"features\":[\"alloc\"],\"name\":\"pem-rfc7468\",\"optional\":true,\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"proptest\",\"req\":\"^1.10\",\"target\":\"cfg(any(unix, windows))\"},{\"default_features\":false,\"name\":\"time\",\"optional\":true,\"req\":\"^0.3.4\"},{\"default_features\":false,\"name\":\"zeroize\",\"optional\":true,\"req\":\"^1.8\"}],\"features\":{\"alloc\":[\"zeroize?/alloc\"],\"arbitrary\":[\"dep:arbitrary\",\"dep:derive_arbitrary\",\"const-oid?/arbitrary\",\"std\"],\"ber\":[],\"bytes\":[\"dep:bytes\",\"alloc\"],\"derive\":[\"dep:der_derive\"],\"oid\":[\"dep:const-oid\"],\"pem\":[\"dep:pem-rfc7468\",\"alloc\",\"zeroize\"],\"real\":[],\"std\":[\"alloc\"]}}", "deranged_0.5.8": "{\"dependencies\":[{\"name\":\"deranged-macros\",\"optional\":true,\"req\":\"=0.3.0\"},{\"default_features\":false,\"name\":\"num-traits\",\"optional\":true,\"req\":\"^0.2.15\"},{\"default_features\":false,\"name\":\"powerfmt\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"name\":\"quickcheck\",\"optional\":true,\"req\":\"^1.0.3\"},{\"default_features\":false,\"name\":\"rand010\",\"optional\":true,\"package\":\"rand\",\"req\":\"^0.10.0\"},{\"kind\":\"dev\",\"name\":\"rand010\",\"package\":\"rand\",\"req\":\"^0.10.0\"},{\"default_features\":false,\"name\":\"rand08\",\"optional\":true,\"package\":\"rand\",\"req\":\"^0.8.4\"},{\"kind\":\"dev\",\"name\":\"rand08\",\"package\":\"rand\",\"req\":\"^0.8.4\"},{\"default_features\":false,\"name\":\"rand09\",\"optional\":true,\"package\":\"rand\",\"req\":\"^0.9.0\"},{\"kind\":\"dev\",\"name\":\"rand09\",\"package\":\"rand\",\"req\":\"^0.9.0\"},{\"default_features\":false,\"name\":\"serde_core\",\"optional\":true,\"req\":\"^1.0.220\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0.86\"}],\"features\":{\"alloc\":[],\"default\":[],\"macros\":[\"dep:deranged-macros\"],\"num\":[\"dep:num-traits\"],\"powerfmt\":[\"dep:powerfmt\"],\"quickcheck\":[\"dep:quickcheck\",\"alloc\"],\"rand\":[\"rand08\",\"rand09\",\"rand010\"],\"rand010\":[\"dep:rand010\"],\"rand08\":[\"dep:rand08\"],\"rand09\":[\"dep:rand09\"],\"serde\":[\"dep:serde_core\"]}}", "deranged_0.5.9": "{\"dependencies\":[{\"name\":\"deranged-macros\",\"optional\":true,\"req\":\"=0.3.1\"},{\"default_features\":false,\"name\":\"num-traits\",\"optional\":true,\"req\":\"^0.2.15\"},{\"default_features\":false,\"name\":\"powerfmt\",\"optional\":true,\"req\":\"^0.2.0\"},{\"default_features\":false,\"name\":\"quickcheck\",\"optional\":true,\"req\":\"^1.0.3\"},{\"default_features\":false,\"name\":\"rand010\",\"optional\":true,\"package\":\"rand\",\"req\":\"^0.10.0\"},{\"kind\":\"dev\",\"name\":\"rand010\",\"package\":\"rand\",\"req\":\"^0.10.0\"},{\"default_features\":false,\"name\":\"rand08\",\"optional\":true,\"package\":\"rand\",\"req\":\"^0.8.4\"},{\"kind\":\"dev\",\"name\":\"rand08\",\"package\":\"rand\",\"req\":\"^0.8.4\"},{\"default_features\":false,\"name\":\"rand09\",\"optional\":true,\"package\":\"rand\",\"req\":\"^0.9.0\"},{\"kind\":\"dev\",\"name\":\"rand09\",\"package\":\"rand\",\"req\":\"^0.9.0\"},{\"default_features\":false,\"name\":\"serde_core\",\"optional\":true,\"req\":\"^1.0.220\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0.86\"},{\"kind\":\"dev\",\"name\":\"serde_test2\",\"req\":\"^2.0.0\"}],\"features\":{\"alloc\":[],\"default\":[],\"macros\":[\"dep:deranged-macros\"],\"num\":[\"dep:num-traits\"],\"powerfmt\":[\"dep:powerfmt\"],\"quickcheck\":[\"dep:quickcheck\",\"alloc\"],\"rand\":[\"rand08\",\"rand09\",\"rand010\"],\"rand010\":[\"dep:rand010\"],\"rand08\":[\"dep:rand08\"],\"rand09\":[\"dep:rand09\"],\"serde\":[\"dep:serde_core\"]}}", "derivative_2.2.0": "{\"dependencies\":[{\"name\":\"proc-macro2\",\"req\":\"^1.0\"},{\"name\":\"quote\",\"req\":\"^1.0\"},{\"features\":[\"visit\",\"extra-traits\"],\"name\":\"syn\",\"req\":\"^1.0.3\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.18, < 1.0.23\"}],\"features\":{\"use_core\":[]}}", @@ -1383,7 +1384,7 @@ "git+https://github.com/helix-editor/nucleo.git?rev=4253de9faabb4e5c6d81d946a5e35a90f87347ee#4253de9faabb4e5c6d81d946a5e35a90f87347ee_nucleo-matcher": "{\"dependencies\":[{\"name\":\"memchr\",\"req\":\"2.5.0\"},{\"default_features\":true,\"features\":[],\"name\":\"unicode-segmentation\",\"optional\":true,\"req\":\"1.10\"}],\"features\":{\"default\":[\"unicode-normalization\",\"unicode-casefold\",\"unicode-segmentation\"],\"unicode-casefold\":[],\"unicode-normalization\":[],\"unicode-segmentation\":[\"dep:unicode-segmentation\"]},\"strip_prefix\":\"matcher\"}", "git+https://github.com/hyperium/h3?rev=e07e69412876f7e26f026bd75a48b2704d8c8283#e07e69412876f7e26f026bd75a48b2704d8c8283_h3": "{\"dependencies\":[{\"name\":\"bytes\",\"req\":\"1\"},{\"name\":\"fastrand\",\"req\":\"2.0.1\"},{\"default_features\":false,\"features\":[\"io\"],\"name\":\"futures-util\",\"optional\":false,\"req\":\"0.3\"},{\"name\":\"http\",\"req\":\"1\"},{\"default_features\":false,\"features\":[],\"name\":\"pin-project-lite\",\"optional\":false,\"req\":\"0.2\"},{\"default_features\":true,\"features\":[\"sync\"],\"name\":\"tokio\",\"optional\":false,\"req\":\"1\"},{\"default_features\":true,\"features\":[],\"name\":\"tracing\",\"optional\":true,\"req\":\"0.1.40\"}],\"features\":{\"i-implement-a-third-party-backend-and-opt-into-breaking-changes\":[],\"tracing\":[\"dep:tracing\"]},\"strip_prefix\":\"h3\"}", "git+https://github.com/hyperium/h3?rev=e07e69412876f7e26f026bd75a48b2704d8c8283#e07e69412876f7e26f026bd75a48b2704d8c8283_h3-quinn": "{\"dependencies\":[{\"name\":\"bytes\",\"req\":\"1\"},{\"default_features\":true,\"features\":[],\"name\":\"futures\",\"optional\":false,\"req\":\"0.3.28\"},{\"default_features\":true,\"features\":[],\"name\":\"h3\",\"optional\":false,\"req\":\"0.0.8\"},{\"default_features\":true,\"features\":[],\"name\":\"h3-datagram\",\"optional\":true,\"req\":\"0.0.2\"},{\"default_features\":false,\"features\":[\"futures-io\"],\"name\":\"quinn\",\"optional\":false,\"req\":\"0.11.7\"},{\"default_features\":false,\"features\":[\"io-util\"],\"name\":\"tokio\",\"optional\":false,\"req\":\"1\"},{\"default_features\":true,\"features\":[],\"name\":\"tokio-util\",\"optional\":false,\"req\":\"0.7.9\"},{\"default_features\":true,\"features\":[],\"name\":\"tracing\",\"optional\":true,\"req\":\"0.1.40\"}],\"features\":{\"datagram\":[\"dep:h3-datagram\"],\"tracing\":[\"dep:tracing\"]},\"strip_prefix\":\"h3-quinn\"}", - "git+https://github.com/microsoft/mxc?rev=b21120168d70befe12356411423266bfef168446#b21120168d70befe12356411423266bfef168446_mxc-sdk": "{\"dependencies\":[{\"name\":\"anyhow\",\"req\":\"1\"},{\"name\":\"base64\",\"req\":\"0.22\"},{\"default_features\":false,\"features\":[\"std\",\"clock\"],\"name\":\"chrono\",\"optional\":false,\"req\":\"0.4\"},{\"name\":\"cidr\",\"req\":\"0.3.2\"},{\"name\":\"flatbuffers\",\"req\":\"25\"},{\"name\":\"getrandom\",\"req\":\"0.2\"},{\"name\":\"libc\",\"req\":\"0.2\"},{\"default_features\":true,\"features\":[],\"name\":\"libloading\",\"optional\":true,\"req\":\"0.8\"},{\"default_features\":true,\"features\":[\"fs\",\"mount\",\"sched\",\"signal\",\"net\",\"process\",\"user\",\"term\"],\"name\":\"nix\",\"optional\":false,\"req\":\"0.29\"},{\"name\":\"same-file\",\"req\":\"1\"},{\"name\":\"schemars\",\"optional\":true,\"req\":\"0.8\"},{\"default_features\":true,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":false,\"req\":\"1\"},{\"default_features\":true,\"features\":[\"raw_value\"],\"name\":\"serde_json\",\"optional\":false,\"req\":\"1\"},{\"name\":\"serde_path_to_error\",\"req\":\"0.1\"},{\"name\":\"sha2\",\"req\":\"0.11\"},{\"default_features\":true,\"features\":[],\"name\":\"tar\",\"optional\":true,\"req\":\"0.4\"},{\"name\":\"tempfile\",\"req\":\"3\"},{\"name\":\"thiserror\",\"req\":\"2\"},{\"default_features\":true,\"features\":[\"full\"],\"name\":\"tokio\",\"optional\":false,\"req\":\"1\"},{\"name\":\"unicode-general-category\",\"req\":\"1\"},{\"name\":\"url\",\"req\":\"2\"},{\"default_features\":true,\"features\":[\"v4\"],\"name\":\"uuid\",\"optional\":false,\"req\":\"1\"},{\"name\":\"widestring\",\"req\":\"1\"},{\"kind\":\"build\",\"name\":\"semver\",\"req\":\"1\"},{\"default_features\":true,\"features\":[\"derive\"],\"kind\":\"build\",\"name\":\"serde\",\"optional\":false,\"req\":\"1\"},{\"default_features\":true,\"features\":[\"raw_value\"],\"kind\":\"build\",\"name\":\"serde_json\",\"optional\":false,\"req\":\"1\"},{\"kind\":\"build\",\"name\":\"sha2\",\"req\":\"0.11\"},{\"default_features\":true,\"features\":[\"v4\"],\"kind\":\"build\",\"name\":\"uuid\",\"optional\":false,\"req\":\"1\"},{\"default_features\":false,\"features\":[\"deflate\"],\"kind\":\"build\",\"name\":\"zip\",\"optional\":true,\"req\":\"2\"},{\"default_features\":true,\"features\":[],\"name\":\"flate2\",\"optional\":true,\"req\":\"1\",\"target\":\"cfg(target_arch = \\\"x86_64\\\")\"},{\"default_features\":false,\"features\":[],\"name\":\"hyperlight-unikraft\",\"optional\":true,\"req\":\"=0.17.0\",\"target\":\"cfg(target_arch = \\\"x86_64\\\")\"},{\"default_features\":true,\"features\":[],\"name\":\"ureq\",\"optional\":true,\"req\":\"3\",\"target\":\"cfg(target_arch = \\\"x86_64\\\")\"},{\"name\":\"tracelogging\",\"req\":\"1.2\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"default_features\":true,\"features\":[\"Foundation\",\"UI\",\"Win32_Foundation\",\"Win32_Globalization\",\"Win32_NetworkManagement_WindowsFirewall\",\"Win32_Networking_WinSock\",\"Win32_Security\",\"Win32_Security_Authorization\",\"Win32_Security_Credentials\",\"Win32_Security_Cryptography\",\"Win32_Security_Isolation\",\"Win32_Security_WinTrust\",\"Win32_Storage_FileSystem\",\"Win32_System_Com\",\"Win32_System_Console\",\"Win32_System_Diagnostics_Debug\",\"Win32_System_Diagnostics_Etw\",\"Win32_System_Diagnostics_ToolHelp\",\"Win32_System_Environment\",\"Win32_System_EventLog\",\"Win32_System_IO\",\"Win32_System_JobObjects\",\"Win32_System_LibraryLoader\",\"Win32_System_Memory\",\"Win32_System_Ole\",\"Win32_System_Pipes\",\"Win32_System_ProcessStatus\",\"Win32_System_Registry\",\"Win32_System_SystemInformation\",\"Win32_System_SystemServices\",\"Win32_System_Threading\",\"Win32_System_Time\",\"Win32_System_Variant\",\"Win32_System_WindowsProgramming\",\"Win32_UI_Shell\"],\"name\":\"windows\",\"optional\":false,\"req\":\"0.62\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"default_features\":true,\"features\":[],\"name\":\"windows-collections\",\"optional\":true,\"req\":\"0.3\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"name\":\"windows-core\",\"req\":\"0.62\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"default_features\":true,\"features\":[],\"name\":\"windows-future\",\"optional\":true,\"req\":\"0.3\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"name\":\"winreg\",\"req\":\"0.55\",\"target\":\"cfg(target_os = \\\"windows\\\")\"}],\"features\":{\"default\":[],\"force-tier-testing\":[],\"hyperlight\":[\"dep:hyperlight-unikraft\",\"dep:ureq\",\"dep:flate2\",\"dep:tar\"],\"isolation_session\":[\"dep:windows-collections\",\"dep:windows-future\"],\"link-wslcsdk\":[\"dep:zip\"],\"microvm\":[],\"schema-gen\":[\"dep:schemars\"],\"test-support\":[],\"tier2_bfs\":[],\"wslc\":[\"link-wslcsdk\",\"dep:libloading\",\"dep:tar\"]},\"strip_prefix\":\"mxc-sdk\"}", + "git+https://github.com/microsoft/mxc?rev=c66201839d63cae2239db5e92f1f1d6076cf5181#c66201839d63cae2239db5e92f1f1d6076cf5181_mxc-sdk": "{\"dependencies\":[{\"name\":\"anyhow\",\"req\":\"1\"},{\"name\":\"base64\",\"req\":\"0.22\"},{\"default_features\":false,\"features\":[\"std\",\"clock\"],\"name\":\"chrono\",\"optional\":false,\"req\":\"0.4\"},{\"name\":\"cidr\",\"req\":\"0.3.2\"},{\"name\":\"flatbuffers\",\"req\":\"25\"},{\"name\":\"getrandom\",\"req\":\"0.2\"},{\"name\":\"libc\",\"req\":\"0.2\"},{\"default_features\":true,\"features\":[],\"name\":\"libloading\",\"optional\":true,\"req\":\"0.8\"},{\"name\":\"native-tls\",\"req\":\"0.2\"},{\"default_features\":true,\"features\":[\"fs\",\"mount\",\"sched\",\"signal\",\"net\",\"process\",\"user\",\"term\"],\"name\":\"nix\",\"optional\":false,\"req\":\"0.29\"},{\"name\":\"same-file\",\"req\":\"1\"},{\"name\":\"schemars\",\"optional\":true,\"req\":\"0.8\"},{\"default_features\":true,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":false,\"req\":\"1\"},{\"default_features\":true,\"features\":[\"raw_value\"],\"name\":\"serde_json\",\"optional\":false,\"req\":\"1\"},{\"name\":\"serde_path_to_error\",\"req\":\"0.1\"},{\"name\":\"sha2\",\"req\":\"0.11\"},{\"default_features\":true,\"features\":[],\"name\":\"tar\",\"optional\":true,\"req\":\"0.4\"},{\"name\":\"tempfile\",\"req\":\"3\"},{\"name\":\"thiserror\",\"req\":\"2\"},{\"default_features\":true,\"features\":[\"full\"],\"name\":\"tokio\",\"optional\":false,\"req\":\"1\"},{\"name\":\"unicode-general-category\",\"req\":\"1\"},{\"default_features\":false,\"features\":[\"native-tls\"],\"name\":\"ureq\",\"optional\":false,\"req\":\"3\"},{\"name\":\"url\",\"req\":\"2\"},{\"default_features\":true,\"features\":[\"v4\"],\"name\":\"uuid\",\"optional\":false,\"req\":\"1\"},{\"name\":\"widestring\",\"req\":\"1\"},{\"kind\":\"build\",\"name\":\"semver\",\"req\":\"1\"},{\"default_features\":true,\"features\":[\"derive\"],\"kind\":\"build\",\"name\":\"serde\",\"optional\":false,\"req\":\"1\"},{\"default_features\":true,\"features\":[\"raw_value\"],\"kind\":\"build\",\"name\":\"serde_json\",\"optional\":false,\"req\":\"1\"},{\"kind\":\"build\",\"name\":\"sha2\",\"req\":\"0.11\"},{\"default_features\":true,\"features\":[\"v4\"],\"kind\":\"build\",\"name\":\"uuid\",\"optional\":false,\"req\":\"1\"},{\"default_features\":false,\"features\":[\"deflate\"],\"kind\":\"build\",\"name\":\"zip\",\"optional\":true,\"req\":\"9\"},{\"default_features\":false,\"features\":[\"agent-bundled\"],\"name\":\"aci_edge_sandboxes\",\"optional\":true,\"req\":\"=0.1.2\",\"target\":\"cfg(all(target_os = \\\"windows\\\", target_arch = \\\"x86_64\\\"))\"},{\"default_features\":true,\"features\":[],\"name\":\"flate2\",\"optional\":true,\"req\":\"1\",\"target\":\"cfg(target_arch = \\\"x86_64\\\")\"},{\"default_features\":false,\"features\":[],\"name\":\"hyperlight-unikraft\",\"optional\":true,\"req\":\"=0.21.0\",\"target\":\"cfg(target_arch = \\\"x86_64\\\")\"},{\"default_features\":false,\"features\":[\"native-tls\",\"gzip\"],\"name\":\"ureq\",\"optional\":true,\"req\":\"3\",\"target\":\"cfg(target_arch = \\\"x86_64\\\")\"},{\"name\":\"tracelogging\",\"req\":\"1.2\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"default_features\":true,\"features\":[\"Foundation\",\"UI\",\"Win32_Foundation\",\"Win32_Globalization\",\"Win32_NetworkManagement_WindowsFirewall\",\"Win32_Networking_WinSock\",\"Win32_Security\",\"Win32_Security_Authorization\",\"Win32_Security_Credentials\",\"Win32_Security_Cryptography\",\"Win32_Security_Cryptography_Catalog\",\"Win32_Security_Cryptography_Sip\",\"Win32_Security_Isolation\",\"Win32_Security_WinTrust\",\"Win32_Storage_FileSystem\",\"Win32_System_Com\",\"Win32_System_Console\",\"Win32_System_Diagnostics_Debug\",\"Win32_System_Diagnostics_Etw\",\"Win32_System_Diagnostics_ToolHelp\",\"Win32_System_Environment\",\"Win32_System_EventLog\",\"Win32_System_IO\",\"Win32_System_JobObjects\",\"Win32_System_LibraryLoader\",\"Win32_System_Memory\",\"Win32_System_Ole\",\"Win32_System_Pipes\",\"Win32_System_ProcessStatus\",\"Win32_System_Registry\",\"Win32_System_SystemInformation\",\"Win32_System_SystemServices\",\"Win32_System_Threading\",\"Win32_System_Time\",\"Win32_System_Variant\",\"Win32_System_WindowsProgramming\",\"Win32_UI_Shell\"],\"name\":\"windows\",\"optional\":false,\"req\":\"0.62\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"default_features\":true,\"features\":[],\"name\":\"windows-collections\",\"optional\":true,\"req\":\"0.3\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"name\":\"windows-core\",\"req\":\"0.62\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"default_features\":true,\"features\":[],\"name\":\"windows-future\",\"optional\":true,\"req\":\"0.3\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"name\":\"winreg\",\"req\":\"0.55\",\"target\":\"cfg(target_os = \\\"windows\\\")\"},{\"kind\":\"build\",\"name\":\"cc\",\"req\":\"1\",\"target\":\"cfg(windows)\"},{\"default_features\":true,\"features\":[\"Win32_Foundation\",\"Win32_NetworkManagement_WindowsFirewall\",\"Win32_Networking_WinSock\",\"Win32_Security\",\"Win32_Security_Authorization\",\"Win32_Security_Credentials\",\"Win32_Security_Cryptography\",\"Win32_Security_Cryptography_Catalog\",\"Win32_Security_Cryptography_Sip\",\"Win32_Security_Isolation\",\"Win32_Security_WinTrust\",\"Win32_Storage_FileSystem\",\"Win32_System_Com\",\"Win32_System_Console\",\"Win32_System_Diagnostics_Debug\",\"Win32_System_Diagnostics_Etw\",\"Win32_System_Diagnostics_ToolHelp\",\"Win32_System_Environment\",\"Win32_System_IO\",\"Win32_System_JobObjects\",\"Win32_System_LibraryLoader\",\"Win32_System_Memory\",\"Win32_System_Ole\",\"Win32_System_Pipes\",\"Win32_System_ProcessStatus\",\"Win32_System_Registry\",\"Win32_System_SystemInformation\",\"Win32_System_SystemServices\",\"Win32_System_Threading\",\"Win32_System_Time\",\"Win32_System_Variant\",\"Win32_System_WindowsProgramming\",\"Win32_UI_Shell\"],\"kind\":\"build\",\"name\":\"windows\",\"optional\":false,\"req\":\"0.62\",\"target\":\"cfg(windows)\"},{\"default_features\":false,\"features\":[],\"kind\":\"build\",\"name\":\"winresource\",\"optional\":false,\"req\":\"0.1.31\",\"target\":\"cfg(windows)\"}],\"features\":{\"default\":[],\"hyperlight\":[\"dep:hyperlight-unikraft\",\"dep:ureq\",\"dep:flate2\",\"dep:tar\"],\"isolation_session\":[\"dep:windows-collections\",\"dep:windows-future\"],\"link-wslcsdk\":[\"dep:zip\"],\"microvm\":[\"dep:aci_edge_sandboxes\",\"dep:libloading\"],\"schema-gen\":[\"dep:schemars\"],\"test-support\":[],\"wslc\":[\"link-wslcsdk\",\"dep:libloading\",\"dep:tar\"]},\"strip_prefix\":\"mxc-sdk\"}", "git+https://github.com/modelcontextprotocol/rust-sdk?rev=b11a40d889e022087d7f2b8cd23aa28e19ceaf5b#b11a40d889e022087d7f2b8cd23aa28e19ceaf5b_rmcp": "{\"dependencies\":[{\"default_features\":true,\"features\":[],\"name\":\"async-trait\",\"optional\":true,\"req\":\"0.1.89\"},{\"default_features\":true,\"features\":[],\"name\":\"base64\",\"optional\":true,\"req\":\"0.23\"},{\"default_features\":true,\"features\":[],\"name\":\"bytes\",\"optional\":true,\"req\":\"1\"},{\"name\":\"futures\",\"req\":\"0.3\"},{\"default_features\":true,\"features\":[],\"name\":\"hmac\",\"optional\":true,\"req\":\"0.13\"},{\"default_features\":true,\"features\":[],\"name\":\"http\",\"optional\":true,\"req\":\"1\"},{\"default_features\":true,\"features\":[],\"name\":\"http-body\",\"optional\":true,\"req\":\"1\"},{\"default_features\":true,\"features\":[],\"name\":\"http-body-util\",\"optional\":true,\"req\":\"0.1\"},{\"default_features\":true,\"features\":[\"client\",\"http1\"],\"name\":\"hyper\",\"optional\":true,\"req\":\"1\"},{\"default_features\":true,\"features\":[\"tokio\"],\"name\":\"hyper-util\",\"optional\":true,\"req\":\"0.1\"},{\"default_features\":true,\"features\":[\"serde\"],\"name\":\"indexmap\",\"optional\":false,\"req\":\"2\"},{\"default_features\":true,\"features\":[\"aws_lc_rs\"],\"name\":\"jsonwebtoken\",\"optional\":true,\"req\":\"11\"},{\"default_features\":false,\"features\":[],\"name\":\"oauth2\",\"optional\":true,\"req\":\"5.0\"},{\"default_features\":true,\"features\":[],\"name\":\"pastey\",\"optional\":true,\"req\":\"0.2.0\"},{\"name\":\"pin-project-lite\",\"req\":\"0.2\"},{\"default_features\":true,\"features\":[\"tokio1\"],\"name\":\"process-wrap\",\"optional\":true,\"req\":\"10.0\"},{\"default_features\":true,\"features\":[],\"name\":\"rand\",\"optional\":true,\"req\":\"0.10\"},{\"default_features\":false,\"features\":[\"json\",\"stream\"],\"name\":\"reqwest\",\"optional\":true,\"req\":\"0.13.2\"},{\"default_features\":true,\"features\":[],\"name\":\"rmcp-macros\",\"optional\":true,\"req\":\"3.6.0\"},{\"default_features\":true,\"features\":[\"chrono04\"],\"name\":\"schemars\",\"optional\":true,\"req\":\"1.0\"},{\"default_features\":true,\"features\":[\"derive\",\"rc\"],\"name\":\"serde\",\"optional\":false,\"req\":\"1.0\"},{\"name\":\"serde_json\",\"req\":\"1.0\"},{\"default_features\":true,\"features\":[],\"name\":\"sha2\",\"optional\":true,\"req\":\"0.11\"},{\"default_features\":true,\"features\":[],\"name\":\"sse-stream\",\"optional\":true,\"req\":\"0.2.4\"},{\"name\":\"thiserror\",\"req\":\"2\"},{\"default_features\":true,\"features\":[\"sync\",\"macros\",\"rt\",\"time\"],\"name\":\"tokio\",\"optional\":false,\"req\":\"1\"},{\"default_features\":true,\"features\":[],\"name\":\"tokio-stream\",\"optional\":true,\"req\":\"0.1\"},{\"default_features\":true,\"features\":[],\"name\":\"tokio-util\",\"optional\":false,\"req\":\"0.7\"},{\"default_features\":true,\"features\":[],\"name\":\"tower-service\",\"optional\":true,\"req\":\"0.3\"},{\"default_features\":true,\"features\":[],\"name\":\"tracing\",\"optional\":false,\"req\":\"0.1\"},{\"default_features\":true,\"features\":[],\"name\":\"url\",\"optional\":true,\"req\":\"2.4\"},{\"default_features\":true,\"features\":[\"v4\"],\"name\":\"uuid\",\"optional\":true,\"req\":\"1\"},{\"default_features\":true,\"features\":[],\"name\":\"which\",\"optional\":true,\"req\":\"8\"},{\"default_features\":true,\"features\":[],\"name\":\"zeroize\",\"optional\":true,\"req\":\"1\"},{\"default_features\":false,\"features\":[\"serde\",\"clock\",\"std\",\"oldtime\"],\"name\":\"chrono\",\"optional\":false,\"req\":\"0.4.38\",\"target\":\"cfg(all(target_family = \\\"wasm\\\", target_os = \\\"unknown\\\"))\"},{\"default_features\":false,\"features\":[\"serde\",\"now\"],\"name\":\"chrono\",\"optional\":false,\"req\":\"0.4.38\",\"target\":\"cfg(not(all(target_family = \\\"wasm\\\", target_os = \\\"unknown\\\")))\"},{\"name\":\"libc\",\"req\":\"0.2\",\"target\":\"cfg(target_os = \\\"linux\\\")\"}],\"features\":{\"__reqwest\":[\"dep:reqwest\"],\"auth\":[\"dep:async-trait\",\"dep:oauth2\",\"__reqwest\",\"dep:url\"],\"auth-client-credentials-jwt\":[\"auth\",\"dep:jsonwebtoken\",\"uuid\"],\"auth-enterprise-managed\":[\"auth\",\"base64\"],\"client\":[\"dep:tokio-stream\"],\"client-side-sse\":[\"dep:sse-stream\",\"dep:http\",\"dep:bytes\",\"base64\"],\"default\":[\"base64\",\"macros\",\"server\"],\"elicitation\":[\"dep:url\"],\"local\":[\"rmcp-macros?/local\"],\"macros\":[\"dep:rmcp-macros\",\"dep:pastey\"],\"request-state\":[\"dep:hmac\",\"dep:sha2\",\"dep:zeroize\",\"base64\"],\"reqwest\":[\"__reqwest\",\"reqwest?/rustls\"],\"reqwest-native-tls\":[\"__reqwest\",\"reqwest?/native-tls\"],\"reqwest-tls-no-provider\":[\"__reqwest\",\"reqwest?/rustls-no-provider\"],\"schemars\":[\"dep:schemars\"],\"server\":[\"transport-async-rw\",\"schemars\",\"dep:pastey\",\"uuid\"],\"server-side-http\":[\"uuid\",\"dep:rand\",\"dep:tokio-stream\",\"dep:http\",\"dep:http-body\",\"dep:http-body-util\",\"dep:bytes\",\"dep:sse-stream\",\"tower\",\"base64\"],\"tower\":[\"dep:tower-service\"],\"transport-async-rw\":[\"tokio/io-util\",\"tokio-util/codec\"],\"transport-child-process\":[\"transport-async-rw\",\"tokio/process\",\"dep:process-wrap\"],\"transport-io\":[\"transport-async-rw\",\"tokio/io-std\",\"tokio/net\"],\"transport-streamable-http-client\":[\"client-side-sse\",\"transport-worker\"],\"transport-streamable-http-client-reqwest\":[\"transport-streamable-http-client\",\"__reqwest\"],\"transport-streamable-http-client-unix-socket\":[\"transport-streamable-http-client\",\"dep:hyper\",\"dep:hyper-util\",\"dep:http-body-util\",\"dep:http\",\"dep:bytes\",\"tokio/net\"],\"transport-streamable-http-server\":[\"transport-streamable-http-server-session\",\"server-side-http\",\"transport-worker\"],\"transport-streamable-http-server-session\":[\"transport-async-rw\",\"dep:async-trait\",\"dep:tokio-stream\"],\"transport-worker\":[\"dep:tokio-stream\"],\"which-command\":[\"transport-child-process\",\"dep:which\"]},\"strip_prefix\":\"./crates/rmcp\"}", "git+https://github.com/modelcontextprotocol/rust-sdk?rev=b11a40d889e022087d7f2b8cd23aa28e19ceaf5b#b11a40d889e022087d7f2b8cd23aa28e19ceaf5b_rmcp-macros": "{\"dependencies\":[{\"default_features\":true,\"features\":[],\"name\":\"darling\",\"optional\":false,\"req\":\"0.24\"},{\"name\":\"proc-macro2\",\"req\":\"1\"},{\"name\":\"quote\",\"req\":\"1\"},{\"name\":\"serde_json\",\"req\":\"1.0\"},{\"default_features\":true,\"features\":[\"full\"],\"name\":\"syn\",\"optional\":false,\"req\":\"3\"}],\"features\":{\"local\":[]},\"strip_prefix\":\"./crates/rmcp-macros\"}", "git+https://github.com/openai-oss-forks/crossterm?rev=37ca4a27a9424ec5dbe6451f48c339d7b45f8d63#37ca4a27a9424ec5dbe6451f48c339d7b45f8d63_crossterm": "{\"dependencies\":[{\"default_features\":true,\"features\":[],\"name\":\"base64\",\"optional\":true,\"req\":\"0.23\"},{\"default_features\":true,\"features\":[],\"name\":\"bitflags\",\"optional\":false,\"req\":\"2.9\"},{\"default_features\":true,\"features\":[\"is_variant\"],\"name\":\"derive_more\",\"optional\":true,\"req\":\"2.0.0\"},{\"default_features\":true,\"features\":[],\"name\":\"document-features\",\"optional\":true,\"req\":\"0.2.11\"},{\"default_features\":false,\"features\":[],\"name\":\"futures-core\",\"optional\":true,\"req\":\"0.3.31\"},{\"name\":\"parking_lot\",\"req\":\"0.12.1\"},{\"default_features\":true,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"1.0.103\"},{\"default_features\":true,\"features\":[],\"name\":\"filedescriptor\",\"optional\":true,\"req\":\"0.8\",\"target\":\"cfg(unix)\"},{\"default_features\":false,\"features\":[],\"name\":\"libc\",\"optional\":true,\"req\":\"0.2.168\",\"target\":\"cfg(unix)\"},{\"default_features\":true,\"features\":[\"os-poll\"],\"name\":\"mio\",\"optional\":true,\"req\":\"1.0.1\",\"target\":\"cfg(unix)\"},{\"default_features\":false,\"features\":[\"std\",\"stdio\",\"termios\"],\"name\":\"rustix\",\"optional\":false,\"req\":\"1\",\"target\":\"cfg(unix)\"},{\"default_features\":true,\"features\":[],\"name\":\"signal-hook\",\"optional\":true,\"req\":\"0.3.17\",\"target\":\"cfg(unix)\"},{\"default_features\":true,\"features\":[\"support-v1_0\"],\"name\":\"signal-hook-mio\",\"optional\":true,\"req\":\"0.2.4\",\"target\":\"cfg(unix)\"},{\"default_features\":true,\"features\":[],\"name\":\"crossterm_winapi\",\"optional\":true,\"req\":\"0.9.1\",\"target\":\"cfg(windows)\"},{\"default_features\":true,\"features\":[\"winuser\",\"winerror\"],\"name\":\"winapi\",\"optional\":true,\"req\":\"0.3.9\",\"target\":\"cfg(windows)\"}],\"features\":{\"bracketed-paste\":[],\"default\":[\"bracketed-paste\",\"derive-more\",\"events\",\"windows\"],\"derive-more\":[\"dep:derive_more\"],\"document-features\":[\"dep:document-features\"],\"event-stream\":[\"dep:futures-core\",\"events\"],\"events\":[\"dep:mio\",\"dep:signal-hook\",\"dep:signal-hook-mio\"],\"osc52\":[\"dep:base64\"],\"serde\":[\"dep:serde\",\"bitflags/serde\"],\"use-dev-tty\":[\"filedescriptor\",\"rustix/process\"],\"windows\":[\"dep:winapi\",\"dep:crossterm_winapi\"]},\"strip_prefix\":\"\"}", @@ -1397,7 +1398,7 @@ "git_archive_integrity:https://codeload.github.com/dzbarsky/rules_rust/tar.gz/b56cbaa8465e74127f1ea216f813cd377295ad81": "sha256-3b30DbjfaF32fDJg3+Wc9/+ksZOpMk4Qs1m76JgdueA=", "git_archive_integrity:https://codeload.github.com/helix-editor/nucleo/tar.gz/4253de9faabb4e5c6d81d946a5e35a90f87347ee": "sha256-0WdqwzqCxZA//t5oznPJ2SRmaqihArtkmo+5JqemHOE=", "git_archive_integrity:https://codeload.github.com/hyperium/h3/tar.gz/e07e69412876f7e26f026bd75a48b2704d8c8283": "sha256-O52KnRCEH+J/uGyXoGvs4UEfywrPrcDKhXtjZdTl0po=", - "git_archive_integrity:https://codeload.github.com/microsoft/mxc/tar.gz/b21120168d70befe12356411423266bfef168446": "sha256-y1jhNgvGsVfkERZ48U4StdlXS9UIoCzKUUphwvu6+m8=", + "git_archive_integrity:https://codeload.github.com/microsoft/mxc/tar.gz/c66201839d63cae2239db5e92f1f1d6076cf5181": "sha256-taFV23FXiHd6EX5s1mPhp8HY27URXkimunytKYqaiqs=", "git_archive_integrity:https://codeload.github.com/modelcontextprotocol/rust-sdk/tar.gz/b11a40d889e022087d7f2b8cd23aa28e19ceaf5b": "sha256-XnxwrRom1XXDnqU9ncs0vl6FAGjugZOqqNTMcjIhjF4=", "git_archive_integrity:https://codeload.github.com/openai-oss-forks/crossterm/tar.gz/37ca4a27a9424ec5dbe6451f48c339d7b45f8d63": "sha256-fV3gck+w2FAgr+WN25mjmjYXiz4FYdMifrFXIDHc1dw=", "git_archive_integrity:https://codeload.github.com/openai-oss-forks/rusty_v8/tar.gz/90a65f887a0c0f048f3784afbcb320b373c8a2e0": "sha256-sLGI0fHYUavXgzeBiiihXoTxQ7CCzpZpdukgZhdoQ3M=", @@ -1765,6 +1766,7 @@ "pbkdf2_0.12.2": "{\"dependencies\":[{\"features\":[\"mac\"],\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4.0\"},{\"default_features\":false,\"name\":\"hmac\",\"optional\":true,\"req\":\"^0.12\"},{\"kind\":\"dev\",\"name\":\"hmac\",\"req\":\"^0.12\"},{\"default_features\":false,\"features\":[\"rand_core\"],\"name\":\"password-hash\",\"optional\":true,\"req\":\"^0.5\"},{\"name\":\"rayon\",\"optional\":true,\"req\":\"^1.7\"},{\"default_features\":false,\"name\":\"sha1\",\"optional\":true,\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"sha1\",\"req\":\"^0.10\"},{\"default_features\":false,\"name\":\"sha2\",\"optional\":true,\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"sha2\",\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"streebog\",\"req\":\"^0.10\"}],\"features\":{\"default\":[\"hmac\"],\"parallel\":[\"rayon\",\"std\"],\"simple\":[\"hmac\",\"password-hash\",\"sha2\"],\"std\":[\"password-hash/std\"]}}", "pbkdf2_0.13.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"belt-hash\",\"req\":\"^0.2\"},{\"features\":[\"mac\"],\"name\":\"digest\",\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"hmac\",\"optional\":true,\"req\":\"^0.13\"},{\"kind\":\"dev\",\"name\":\"hmac\",\"req\":\"^0.13\"},{\"name\":\"kdf\",\"optional\":true,\"req\":\"^0.1\"},{\"default_features\":false,\"features\":[\"base64\"],\"name\":\"mcf\",\"optional\":true,\"req\":\"^0.6\"},{\"default_features\":false,\"name\":\"password-hash\",\"optional\":true,\"req\":\"^0.6\"},{\"kind\":\"dev\",\"name\":\"sha1\",\"req\":\"^0.11\"},{\"default_features\":false,\"name\":\"sha2\",\"optional\":true,\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"sha2\",\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"streebog\",\"req\":\"^0.11\"}],\"features\":{\"alloc\":[\"mcf?/alloc\",\"password-hash?/alloc\"],\"default\":[\"hmac\"],\"getrandom\":[\"password-hash/getrandom\"],\"kdf\":[\"sha2\",\"dep:kdf\"],\"mcf\":[\"sha2\",\"password-hash\",\"dep:mcf\"],\"phc\":[\"password-hash/phc\",\"sha2\"],\"rand_core\":[\"password-hash/rand_core\"],\"sha2\":[\"hmac\",\"dep:sha2\"]}}", "pem-rfc7468_0.7.0": "{\"dependencies\":[{\"name\":\"base64ct\",\"req\":\"^1.4\"}],\"features\":{\"alloc\":[\"base64ct/alloc\"],\"std\":[\"alloc\",\"base64ct/std\"]}}", + "pem-rfc7468_1.0.0": "{\"dependencies\":[{\"name\":\"base64ct\",\"req\":\"^1.4\"}],\"features\":{\"alloc\":[\"base64ct/alloc\"],\"std\":[\"alloc\",\"base64ct/std\"]}}", "pem_3.0.6": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"base64\",\"req\":\"^0.22.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.3.0\"},{\"default_features\":false,\"features\":[\"std\"],\"kind\":\"dev\",\"name\":\"proptest\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"serde_core\",\"optional\":true,\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1\"}],\"features\":{\"default\":[\"std\"],\"serde\":[\"dep:serde_core\"],\"std\":[\"base64/std\",\"serde_core?/std\"]}}", "percent-encoding_2.3.2": "{\"dependencies\":[],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"std\":[\"alloc\"]}}", "pest_2.8.7": "{\"dependencies\":[{\"features\":[\"html_reports\"],\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.5.1\"},{\"name\":\"memchr\",\"optional\":true,\"req\":\"^2.4.0\"},{\"features\":[\"fancy\"],\"name\":\"miette\",\"optional\":true,\"req\":\"^7.2.0\"},{\"features\":[\"fancy\"],\"kind\":\"dev\",\"name\":\"miette\",\"req\":\"^7.2.0\"},{\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.145\"},{\"name\":\"serde_json\",\"optional\":true,\"req\":\"^1.0.85\"},{\"default_features\":false,\"name\":\"ucd-trie\",\"req\":\"^0.1.5\"}],\"features\":{\"const_prec_climber\":[],\"default\":[\"std\",\"memchr\"],\"miette-error\":[\"std\",\"pretty-print\",\"dep:miette\"],\"pretty-print\":[\"dep:serde\",\"dep:serde_json\"],\"std\":[\"ucd-trie/std\"]}}", @@ -2240,10 +2242,13 @@ "unsafe-libyaml_0.2.11": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0\"}],\"features\":{}}", "untrusted_0.7.1": "{\"dependencies\":[],\"features\":{}}", "untrusted_0.9.0": "{\"dependencies\":[],\"features\":{}}", + "ureq-proto_0.6.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\"],\"name\":\"base64\",\"req\":\"^0.22.1\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"http\",\"req\":\"^1.1.0\"},{\"default_features\":false,\"name\":\"httparse\",\"req\":\"^1.8.0\"},{\"name\":\"log\",\"req\":\"^0.4.22\"}],\"features\":{\"client\":[],\"default\":[\"client\",\"server\"],\"server\":[]}}", "ureq_2.12.1": "{\"dependencies\":[{\"name\":\"base64\",\"req\":\"^0.22\"},{\"name\":\"brotli-decompressor\",\"optional\":true,\"req\":\"^4.0.0\"},{\"default_features\":false,\"name\":\"cookie\",\"optional\":true,\"req\":\"^0.18\"},{\"default_features\":false,\"features\":[\"preserve_order\",\"serde_json\"],\"name\":\"cookie_store\",\"optional\":true,\"req\":\"^0.21.1\"},{\"name\":\"encoding_rs\",\"optional\":true,\"req\":\"^0.8\"},{\"default_features\":false,\"features\":[\"humantime\"],\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"<=0.9\"},{\"name\":\"flate2\",\"optional\":true,\"req\":\"^1.0.22\"},{\"name\":\"hootbin\",\"optional\":true,\"req\":\"^0.1.5\"},{\"name\":\"http\",\"optional\":true,\"req\":\"^1.1\"},{\"name\":\"http-02\",\"optional\":true,\"package\":\"http\",\"req\":\"^0.2\"},{\"name\":\"log\",\"req\":\"^0.4\"},{\"name\":\"native-tls\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"once_cell\",\"req\":\"^1\"},{\"default_features\":false,\"features\":[\"ring\",\"logging\",\"std\",\"tls12\"],\"name\":\"rustls\",\"optional\":true,\"req\":\"^0.23.19\"},{\"default_features\":false,\"features\":[\"std\",\"ring\"],\"kind\":\"dev\",\"name\":\"rustls\",\"req\":\"^0.23.5\"},{\"name\":\"rustls-native-certs\",\"optional\":true,\"req\":\"^0.7\"},{\"kind\":\"dev\",\"name\":\"rustls-pemfile\",\"req\":\"^2.0\"},{\"name\":\"rustls-pki-types\",\"optional\":true,\"req\":\"^1\"},{\"name\":\"serde\",\"optional\":true,\"req\":\"^1\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1\"},{\"name\":\"serde_json\",\"optional\":true,\"req\":\"^1.0.97\"},{\"name\":\"socks\",\"optional\":true,\"req\":\"^0.3\"},{\"name\":\"url\",\"req\":\"^2.5.0\"},{\"name\":\"webpki-roots\",\"optional\":true,\"req\":\"^0.26\"}],\"features\":{\"brotli\":[\"dep:brotli-decompressor\"],\"charset\":[\"dep:encoding_rs\"],\"cookies\":[\"dep:cookie\",\"dep:cookie_store\"],\"default\":[\"tls\",\"gzip\"],\"gzip\":[\"dep:flate2\"],\"http-crate\":[\"dep:http\"],\"http-interop\":[\"dep:http-02\"],\"json\":[\"dep:serde\",\"dep:serde_json\"],\"native-certs\":[\"dep:rustls-native-certs\"],\"native-tls\":[\"dep:native-tls\"],\"proxy-from-env\":[],\"socks-proxy\":[\"dep:socks\"],\"testdeps\":[\"dep:hootbin\"],\"tls\":[\"dep:webpki-roots\",\"dep:rustls\",\"dep:rustls-pki-types\"]}}", + "ureq_3.3.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"assert_no_alloc\",\"req\":\"^1.1.2\"},{\"kind\":\"dev\",\"name\":\"auto-args\",\"req\":\"^0.3.0\"},{\"name\":\"base64\",\"req\":\"^0.22.1\"},{\"name\":\"brotli-decompressor\",\"optional\":true,\"req\":\"^5.0.0\"},{\"default_features\":false,\"features\":[\"preserve_order\"],\"name\":\"cookie_store\",\"optional\":true,\"req\":\"^0.22\"},{\"default_features\":false,\"features\":[\"pem\",\"std\"],\"name\":\"der\",\"optional\":true,\"req\":\"^0.8.0\"},{\"name\":\"encoding_rs\",\"optional\":true,\"req\":\"^0.8.34\"},{\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11.7\"},{\"name\":\"flate2\",\"optional\":true,\"req\":\"^1.0.30\"},{\"name\":\"getrandom\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"log\",\"req\":\"^0.4.25\"},{\"name\":\"mime_guess\",\"optional\":true,\"req\":\"^2.0.5\"},{\"default_features\":false,\"name\":\"native-tls\",\"optional\":true,\"req\":\"^0.2.14\"},{\"name\":\"percent-encoding\",\"req\":\"^2.3.1\"},{\"default_features\":false,\"features\":[\"logging\",\"std\",\"tls12\"],\"name\":\"rustls\",\"optional\":true,\"req\":\"^0.23.22\"},{\"features\":[\"aws-lc-rs\"],\"kind\":\"dev\",\"name\":\"rustls\",\"req\":\"^0.23\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"rustls-pki-types\",\"optional\":true,\"req\":\"^1.11.0\"},{\"default_features\":false,\"name\":\"rustls-platform-verifier\",\"optional\":true,\"req\":\"^0.6.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.138\"},{\"features\":[\"std\",\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0.204\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"serde_json\",\"optional\":true,\"req\":\"^1.0.120\"},{\"name\":\"socks\",\"optional\":true,\"req\":\"^0.3.4\"},{\"default_features\":false,\"features\":[\"client\"],\"name\":\"ureq-proto\",\"req\":\"^0.6.0\"},{\"default_features\":false,\"name\":\"url\",\"optional\":true,\"req\":\"^2.3.1\"},{\"name\":\"utf8-zero\",\"req\":\"^0.8.1\"},{\"default_features\":false,\"name\":\"webpki-root-certs\",\"optional\":true,\"req\":\"^1.0.0\"},{\"default_features\":false,\"name\":\"webpki-roots\",\"optional\":true,\"req\":\"^1.0.0\"},{\"name\":\"winreg\",\"optional\":true,\"req\":\"^0.56\",\"target\":\"cfg(windows)\"}],\"features\":{\"_doc\":[\"rustls?/aws-lc-rs\"],\"_ring\":[\"rustls?/ring\"],\"_rustls\":[],\"_test\":[],\"_tls\":[\"dep:rustls-pki-types\"],\"_url\":[\"dep:url\"],\"brotli\":[\"dep:brotli-decompressor\"],\"charset\":[\"dep:encoding_rs\"],\"cookies\":[\"dep:cookie_store\",\"_url\"],\"default\":[\"rustls\",\"gzip\"],\"gzip\":[\"dep:flate2\"],\"json\":[\"dep:serde\",\"dep:serde_json\",\"cookie_store?/serde_json\"],\"multipart\":[\"dep:mime_guess\",\"dep:getrandom\"],\"native-tls\":[\"native-tls-no-default\",\"dep:der\",\"_tls\",\"native-tls-webpki-roots\"],\"native-tls-no-default\":[\"dep:native-tls\",\"dep:der\",\"_tls\"],\"native-tls-webpki-roots\":[\"dep:webpki-root-certs\"],\"platform-verifier\":[\"dep:rustls-platform-verifier\"],\"rustls\":[\"rustls-no-provider\",\"_ring\",\"rustls-webpki-roots\"],\"rustls-no-provider\":[\"dep:rustls\",\"_tls\",\"_rustls\"],\"rustls-webpki-roots\":[\"dep:webpki-roots\"],\"socks-proxy\":[\"dep:socks\"],\"vendored\":[\"native-tls?/vendored\"],\"win-system-proxy\":[\"dep:winreg\"]}}", "url_2.5.8": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"bencher\",\"req\":\"^0.1\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"form_urlencoded\",\"req\":\"^1.2.2\"},{\"default_features\":false,\"features\":[\"alloc\",\"compiled_data\"],\"name\":\"idna\",\"req\":\"^1.1.0\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"percent-encoding\",\"req\":\"^2.3.2\"},{\"default_features\":false,\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0\"},{\"default_features\":false,\"name\":\"serde_derive\",\"optional\":true,\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_derive\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"wasm-bindgen-test\",\"req\":\"^0.3\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", target_os = \\\"unknown\\\"))\"}],\"features\":{\"debugger_visualizer\":[],\"default\":[\"std\"],\"expose_internals\":[],\"serde\":[\"dep:serde\",\"dep:serde_derive\"],\"std\":[\"idna/std\",\"percent-encoding/std\",\"form_urlencoded/std\",\"serde?/std\"]}}", "urlencoding_2.1.3": "{\"dependencies\":[],\"features\":{}}", "utf-8_0.7.6": "{\"dependencies\":[],\"features\":{}}", + "utf8-zero_0.8.1": "{\"dependencies\":[],\"features\":{\"default\":[\"std\"],\"std\":[]}}", "utf8_iter_1.0.4": "{\"dependencies\":[],\"features\":{}}", "utf8parse_0.2.2": "{\"dependencies\":[],\"features\":{\"default\":[],\"nightly\":[]}}", "uuid_1.20.0": "{\"dependencies\":[{\"name\":\"arbitrary\",\"optional\":true,\"req\":\"^1.1.3\"},{\"default_features\":false,\"name\":\"atomic\",\"optional\":true,\"req\":\"^0.6\"},{\"default_features\":false,\"name\":\"borsh\",\"optional\":true,\"req\":\"^1\"},{\"default_features\":false,\"name\":\"borsh-derive\",\"optional\":true,\"req\":\"^1\"},{\"features\":[\"derive\"],\"name\":\"bytemuck\",\"optional\":true,\"req\":\"^1.20.0\"},{\"name\":\"getrandom\",\"optional\":true,\"req\":\"^0.3\",\"target\":\"cfg(not(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\"))))\"},{\"default_features\":false,\"name\":\"js-sys\",\"optional\":true,\"req\":\"^0.3\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\"), target_feature = \\\"atomics\\\"))\"},{\"default_features\":false,\"name\":\"md-5\",\"optional\":true,\"req\":\"^0.10\"},{\"name\":\"rand\",\"optional\":true,\"req\":\"^0.9\",\"target\":\"cfg(not(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\"))))\"},{\"kind\":\"dev\",\"name\":\"rustversion\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0.221\"},{\"default_features\":false,\"name\":\"serde_core\",\"optional\":true,\"req\":\"^1.0.221\"},{\"kind\":\"dev\",\"name\":\"serde_derive\",\"req\":\"^1.0.221\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_test\",\"req\":\"^1.0.56\"},{\"default_features\":false,\"name\":\"sha1_smol\",\"optional\":true,\"req\":\"^1\"},{\"name\":\"slog\",\"optional\":true,\"req\":\"^2\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.52\"},{\"name\":\"uuid-rng-internal-lib\",\"optional\":true,\"package\":\"uuid-rng-internal\",\"req\":\"^1.20.0\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\")))\"},{\"default_features\":false,\"features\":[\"msrv\"],\"name\":\"wasm-bindgen\",\"optional\":true,\"req\":\"^0.2\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\")))\"},{\"kind\":\"dev\",\"name\":\"wasm-bindgen\",\"req\":\"^0.2\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\")))\"},{\"kind\":\"dev\",\"name\":\"wasm-bindgen-test\",\"req\":\"^0.3\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\")))\"},{\"features\":[\"derive\"],\"name\":\"zerocopy\",\"optional\":true,\"req\":\"^0.8\"}],\"features\":{\"atomic\":[\"dep:atomic\"],\"borsh\":[\"dep:borsh\",\"dep:borsh-derive\"],\"default\":[\"std\"],\"fast-rng\":[\"rng\",\"dep:rand\"],\"js\":[\"dep:wasm-bindgen\",\"dep:js-sys\"],\"macro-diagnostics\":[],\"md5\":[\"dep:md-5\"],\"rng\":[\"dep:getrandom\"],\"rng-getrandom\":[\"rng\",\"dep:getrandom\",\"uuid-rng-internal-lib\",\"uuid-rng-internal-lib/getrandom\"],\"rng-rand\":[\"rng\",\"dep:rand\",\"uuid-rng-internal-lib\",\"uuid-rng-internal-lib/rand\"],\"serde\":[\"dep:serde_core\"],\"sha1\":[\"dep:sha1_smol\"],\"std\":[\"wasm-bindgen?/std\",\"js-sys?/std\"],\"v1\":[\"atomic\"],\"v3\":[\"md5\"],\"v4\":[\"rng\"],\"v5\":[\"sha1\"],\"v6\":[\"atomic\"],\"v7\":[\"rng\"],\"v8\":[]}}", diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 8b8bad583a..5b459c91e9 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -4508,7 +4508,6 @@ dependencies = [ "codex-utils-absolute-path", "codex-utils-path-uri", "codex-windows-sandbox", - "flatbuffers", "mxc-sdk", "pretty_assertions", "serde", @@ -6902,7 +6901,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid 0.9.6", - "pem-rfc7468", + "pem-rfc7468 0.7.0", + "zeroize", +] + +[[package]] +name = "der" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a996a108feb8b427a6e12fcf6af4aa83409b79d72c15337d7741368131ee004" +dependencies = [ + "pem-rfc7468 1.0.0", "zeroize", ] @@ -7267,7 +7276,7 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der", + "der 0.7.10", "digest 0.10.7", "elliptic-curve", "rfc6979", @@ -7321,7 +7330,7 @@ dependencies = [ "generic-array", "group", "hkdf 0.12.4", - "pem-rfc7468", + "pem-rfc7468 0.7.0", "pkcs8", "rand_core 0.6.4", "sec1", @@ -10821,8 +10830,8 @@ dependencies = [ [[package]] name = "mxc-sdk" -version = "1.0.0" -source = "git+https://github.com/microsoft/mxc?rev=b21120168d70befe12356411423266bfef168446#b21120168d70befe12356411423266bfef168446" +version = "1.1.0" +source = "git+https://github.com/microsoft/mxc?rev=c66201839d63cae2239db5e92f1f1d6076cf5181#c66201839d63cae2239db5e92f1f1d6076cf5181" dependencies = [ "anyhow", "base64 0.22.1", @@ -10832,6 +10841,7 @@ dependencies = [ "flatbuffers", "getrandom 0.2.17", "libc", + "native-tls", "nix 0.29.0", "same-file", "semver", @@ -10844,6 +10854,7 @@ dependencies = [ "tokio", "tracelogging", "unicode-general-category", + "ureq", "url", "uuid", "widestring", @@ -11952,6 +11963,15 @@ dependencies = [ "base64ct", ] +[[package]] +name = "pem-rfc7468" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6305423e0e7738146434843d1694d621cce767262b2a86910beab705e4493d9" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -12112,7 +12132,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der", + "der 0.7.10", "spki", ] @@ -14288,7 +14308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", - "der", + "der 0.7.10", "generic-array", "pkcs8", "subtle", @@ -15004,7 +15024,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der", + "der 0.7.10", ] [[package]] @@ -16930,6 +16950,35 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "ureq" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0" +dependencies = [ + "base64 0.22.1", + "der 0.8.3", + "log", + "native-tls", + "percent-encoding", + "rustls-pki-types", + "ureq-proto", + "utf8-zero", + "webpki-root-certs", +] + +[[package]] +name = "ureq-proto" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c" +dependencies = [ + "base64 0.22.1", + "http 1.4.0", + "httparse", + "log", +] + [[package]] name = "url" version = "2.5.8" @@ -16955,6 +17004,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8-zero" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e" + [[package]] name = "utf8_iter" version = "1.0.4" diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index ded68ec87f..b7dc8f3003 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -399,7 +399,6 @@ ed25519-dalek = { version = "2.2.0", features = ["pkcs8"] } encoding_rs = "0.8.35" eventsource-stream = "0.2.3" file-id = "0.2.3" -flatbuffers = "25" flate2 = "1.1.8" futures = { version = "0.3", default-features = false } gethostname = "1.1.0" @@ -440,7 +439,7 @@ maplit = "1.0.2" memchr = "2.7.6" mime_guess = "2.0.5" multimap = "0.10.0" -mxc-sdk = { git = "https://github.com/microsoft/mxc", rev = "b21120168d70befe12356411423266bfef168446" } +mxc-sdk = { git = "https://github.com/microsoft/mxc", rev = "c66201839d63cae2239db5e92f1f1d6076cf5181" } notify = "8.2.0" nucleo = { git = "https://github.com/helix-editor/nucleo.git", rev = "4253de9faabb4e5c6d81d946a5e35a90f87347ee" } once_cell = "1.20.2" diff --git a/codex-rs/mxc-sandbox/Cargo.toml b/codex-rs/mxc-sandbox/Cargo.toml index 2cd39d5d2e..27f3096a2b 100644 --- a/codex-rs/mxc-sandbox/Cargo.toml +++ b/codex-rs/mxc-sandbox/Cargo.toml @@ -27,7 +27,6 @@ serde_json = { workspace = true } thiserror = { workspace = true } [target.'cfg(windows)'.dependencies] -flatbuffers = { workspace = true } # 1.2.4 imports OneCore_apiset, which the GNU Windows toolchain does not ship. tracelogging = "=1.2.3" windows-sys = { workspace = true, features = [ diff --git a/codex-rs/mxc-sandbox/README.md b/codex-rs/mxc-sandbox/README.md index bf4cd0fd0d..a7bd29b82c 100644 --- a/codex-rs/mxc-sandbox/README.md +++ b/codex-rs/mxc-sandbox/README.md @@ -1,8 +1,8 @@ # Native Windows MXC sandbox This crate routes a command through the current Codex executable and directly -into Microsoft's MXC `BaseContainerRunner`. It requires a working Windows -process security environment (PSEC). It never invokes MXC's AppContainer +into Microsoft's public MXC V1 SDK with inherited stdio. It requires a working +Windows process security environment (PSEC). It never invokes MXC's AppContainer dispatcher, edits host ACLs, creates sandbox users, runs setup, or requests elevation. The existing Codex Windows sandboxes remain separate backends. @@ -10,11 +10,10 @@ Windows executors record `codex.windows_mxc.available` once per process with an `available=true|false` tag. This measures runtime availability independently of selection. Unsupported Windows executors reject MXC requests before execution. -`is_available()` uses MXC's cached create/close probe, rather than an OS build -number or the SDK's broad `platform_support()` result. The latter also reports -older AppContainer backends as supported. A requested deny path additionally -requires the native `PSE_SUPPORT_FS_DENY` capability; otherwise the command -fails before launch. +`is_available()` caches the public SDK's ProcessContainer probe. This checks +API presence and capabilities without creating a security environment; creation +and request-specific failures remain launch errors. The SDK rejects requested +deny paths when the host cannot enforce them. The wrapper inherits the command's pipes or ConPTY console. MXC creates its child suspended, assigns a kill-on-close job before resuming it, and retains @@ -35,8 +34,10 @@ Do not call MXC's shared `normalize_object_conflicts` before or after volume expansion. Its identity preflight is used by mount-based backends and can reject an otherwise usable Windows policy when a network share does not support `FileIdInfo`, or a protected deny path cannot be opened for metadata. Codex sends -explicit path grants to BaseContainer without requiring that additional lookup. -We intentionally accept two limitations: +explicit path grants without that object-identity lookup. The public SDK does +perform metadata checks for missing paths: immediate failures produce warnings, +while a check that exceeds five seconds rejects startup, including on a slow or +unreachable network share. We intentionally accept two alias limitations: - Hard-link names retain independent path permissions. An allowed name can read or modify the same file as a denied or read-only name; we do not tighten all diff --git a/codex-rs/mxc-sandbox/src/availability.rs b/codex-rs/mxc-sandbox/src/availability.rs index 5e32aea948..dc8cba61cf 100644 --- a/codex-rs/mxc-sandbox/src/availability.rs +++ b/codex-rs/mxc-sandbox/src/availability.rs @@ -1,55 +1,11 @@ -//! Probe PSEC creation and startup attributes without launching a process. -//! Cache the result so automatic MXC selection requires a usable native API. +//! Cache the public SDK's ProcessContainer availability probe. use std::sync::OnceLock; -use flatbuffers::FlatBufferBuilder; -use mxc_sdk::mxc_common::models::ContainerPolicy; -use mxc_sdk::mxc_common::ui_policy::resolve_ui_restrictions; -use mxc_sdk::process_container_common::PROCESS_SECURITY_ENVIRONMENT_FLAG_NONE; -use mxc_sdk::process_container_common::ProcessSecurityEnvironmentApi; -use mxc_sdk::process_container_common::SecurityEnvironmentStartupInfo; -use mxc_sdk::process_container_common::job_object::to_job_object_uilimit_mask; -use mxc_sdk::process_security_environment_spec::process_security_environment_layout::EndpointPolicyT; -use mxc_sdk::process_security_environment_spec::process_security_environment_layout::FilterAction; -use mxc_sdk::process_security_environment_spec::process_security_environment_layout::NetworkPolicyT; -use mxc_sdk::process_security_environment_spec::process_security_environment_layout::ProcessSecurityEnvironmentT; -use mxc_sdk::process_security_environment_spec::process_security_environment_layout::SchemaVersionT; -use mxc_sdk::process_security_environment_spec::process_security_environment_layout::finish_process_security_environment_buffer; - pub(super) fn is_available() -> bool { static USABLE: OnceLock = OnceLock::new(); *USABLE.get_or_init(|| { - // Preserve the previous SDK's probe: no filesystem, network, or UI - // grants, and no process launch. API-set presence alone is insufficient. - let policy = ContainerPolicy::default(); - let mut egress = EndpointPolicyT::default(); - egress.default_action = FilterAction::deny; - let mut network = NetworkPolicyT::default(); - network.egress = Some(Box::new(egress)); - let mut specification = ProcessSecurityEnvironmentT::default(); - specification.version = SchemaVersionT { major: 1, minor: 0 }; - specification.disallow_win32k_system_calls = policy.ui.disable; - specification.ui_restrictions = u64::from(to_job_object_uilimit_mask( - &resolve_ui_restrictions(&policy.ui, &policy.base_process_ui), - )); - specification.network_policy = Some(Box::new(network)); - let mut builder = FlatBufferBuilder::with_capacity(/* capacity */ 1024); - let specification = specification.pack(&mut builder); - finish_process_security_environment_buffer(&mut builder, specification); - ProcessSecurityEnvironmentApi::load() - .and_then(|api| { - api.create( - builder.finished_data(), - PROCESS_SECURITY_ENVIRONMENT_FLAG_NONE, - ) - }) - .and_then(|environment| { - let startup_info = - SecurityEnvironmentStartupInfo::new(Default::default(), environment.raw(), &[]); - environment.close(); - startup_info.map(drop) - }) - .is_ok() + mxc_sdk::v1::probe(/* request */ None) + .is_ok_and(|probe| probe.error.is_none() && probe.probes.base_container_api_present) }) } diff --git a/codex-rs/mxc-sandbox/src/native.rs b/codex-rs/mxc-sandbox/src/native.rs index b0657fd3c1..fb51ff2c60 100644 --- a/codex-rs/mxc-sandbox/src/native.rs +++ b/codex-rs/mxc-sandbox/src/native.rs @@ -2,61 +2,19 @@ use anyhow::Context; use anyhow::Result; -use anyhow::ensure; -use mxc_sdk::mxc_common::logger::Logger; -use mxc_sdk::mxc_common::logger::Mode; -use mxc_sdk::mxc_common::models::ExecutionRequest; -use mxc_sdk::mxc_common::sandbox_process::SandboxBackend; -use mxc_sdk::mxc_common::sandbox_process::StdioMode; -use mxc_sdk::process_container_common::base_container_runner::BaseContainerRunner; +use mxc_sdk::v1; // The ETW functions used by tracelogging are documented Advapi32 exports on // both Windows toolchains; 1.2.3 leaves their import library to the application. #[link(name = "advapi32")] unsafe extern "system" {} -pub(super) fn launch(request: &ExecutionRequest) -> Result { - ensure!( - !request - .policy - .capabilities - .iter() - .any(|capability| capability.eq_ignore_ascii_case("permissiveLearningMode")), - "MXC native launch does not support permissiveLearningMode" - ); - if !request.policy.denied_paths.is_empty() { - ensure!( - BaseContainerRunner::supports_native_denied_paths(), - "this Windows build cannot enforce native MXC deny paths" - ); +pub(super) fn launch(request: v1::ContainerRequest) -> Result { + let mut options = v1::SpawnExtendedOptions::default(); + options.stdio = v1::SpawnStdio::Inherit; + let mut child = v1::spawn_with_extended_options(request, options)?; + match child.wait().context("waiting for the MXC command")? { + v1::WaitResult::Exited(code) => Ok(code), + v1::WaitResult::TimedOut => anyhow::bail!("MXC command timed out"), } - let mut logger = Logger::new(Mode::Buffer); - let mut child = BaseContainerRunner::new() - .spawn(request, &mut logger, StdioMode::Inherit) - .map_err(|error| match create_process_error(&error.extended_error) { - Some(code) => anyhow::anyhow!( - "{} (CreateProcessW, Win32 error {code})", - error.error_message - ), - None => anyhow::anyhow!("{}", error.error_message), - })?; - // Do not publish the SDK diagnostic buffer: it may contain command or - // environment data. This wrapper emits only the resulting launch error. - child.wait().context("waiting for the MXC command") } - -// The SDK appends the working directory and other diagnostics to this field. -// Only the Windows error number is safe to copy into the command result. -fn create_process_error(detail: &str) -> Option { - let number = detail - .strip_prefix( - "CreateProcessW(PROC_THREAD_ATTRIBUTE_SECURITY_ENVIRONMENT) failed: WIN32_ERROR(", - )? - .split_once(')')? - .0; - number.parse().ok() -} - -#[cfg(test)] -#[path = "native_tests.rs"] -mod tests; diff --git a/codex-rs/mxc-sandbox/src/native_tests.rs b/codex-rs/mxc-sandbox/src/native_tests.rs deleted file mode 100644 index 0cf300b948..0000000000 --- a/codex-rs/mxc-sandbox/src/native_tests.rs +++ /dev/null @@ -1,20 +0,0 @@ -#![cfg(test)] - -use super::create_process_error; - -#[test] -fn returns_only_the_native_create_process_error() { - let api = "CreateProcessW(PROC_THREAD_ATTRIBUTE_SECURITY_ENVIRONMENT) failed: "; - assert_eq!( - create_process_error(&format!("{api}WIN32_ERROR(5) (working directory: private)")), - Some(5) - ); - assert_eq!( - create_process_error(&format!("{api}WIN32_ERROR(private)")), - None - ); - assert_eq!( - create_process_error("another API failed: WIN32_ERROR(5)"), - None - ); -} diff --git a/codex-rs/mxc-sandbox/src/policy.rs b/codex-rs/mxc-sandbox/src/policy.rs index be227e1ced..0a102b5335 100644 --- a/codex-rs/mxc-sandbox/src/policy.rs +++ b/codex-rs/mxc-sandbox/src/policy.rs @@ -21,17 +21,19 @@ use codex_windows_sandbox::resolve_windows_deny_read_paths; use mxc_sdk::mxc_common::cmdline::CommandLineContext; use mxc_sdk::mxc_common::cmdline::CommandLineError; use mxc_sdk::mxc_common::cmdline::cmdline_from_argv_for_context; -use mxc_sdk::mxc_common::models::BaseProcessUiConfig; -use mxc_sdk::mxc_common::models::ContainerPolicy; -use mxc_sdk::mxc_common::models::ExecutionRequest; -use mxc_sdk::mxc_common::models::FallbackPolicy; -use mxc_sdk::mxc_common::models::NetworkAction; -use mxc_sdk::mxc_common::models::NetworkCidr; -use mxc_sdk::mxc_common::models::NetworkEgressPolicy; -use mxc_sdk::mxc_common::models::NetworkIngressPolicy; -use mxc_sdk::mxc_common::models::NetworkPeer; -use mxc_sdk::mxc_common::models::NetworkRule; -use mxc_sdk::mxc_common::models::UiPolicy; +use mxc_sdk::v1::ContainerRequest; +use mxc_sdk::v1::Containment; +use mxc_sdk::v1::FilesystemPolicy; +use mxc_sdk::v1::NetworkAction; +use mxc_sdk::v1::NetworkEgressPolicy; +use mxc_sdk::v1::NetworkIngressPolicy; +use mxc_sdk::v1::NetworkPeerPolicy; +use mxc_sdk::v1::NetworkPolicy; +use mxc_sdk::v1::NetworkRulePolicy; +use mxc_sdk::v1::UiPolicy; +use mxc_sdk::v1::configs::ProcessContainerConfig; +use mxc_sdk::v1::configs::ProcessContainerUi; +use mxc_sdk::v1::configs::ProcessContainerUiIsolation; use thiserror::Error; use crate::MxcCommand; @@ -120,7 +122,7 @@ pub(super) fn build_request( env: Vec, volume_roots: &[PathBuf], platform_read_roots: &[PathBuf], -) -> Result { +) -> Result { if command.command.is_empty() { return Err(PolicyError::EmptyCommand); } @@ -293,78 +295,77 @@ pub(super) fn build_request( NetworkAction::Deny }; let mut egress = NetworkEgressPolicy { - default: egress_default, + default: Some(egress_default), ..Default::default() }; if proxied { // PSEC host loopback can be bidirectional. This shape is supported only // when the caller already allows local clients and servers. Keep // private-network ingress denied and allow no direct DNS bypass. - egress.allow.push(NetworkRule { - to: vec![ - NetworkPeer { - cidr: NetworkCidr { - address: std::net::Ipv4Addr::new(127, 0, 0, 0).into(), - prefix_length: 8, - }, - except: Vec::new(), - }, - NetworkPeer { - cidr: NetworkCidr { - address: std::net::Ipv6Addr::LOCALHOST.into(), - prefix_length: 128, - }, - except: Vec::new(), - }, - ], - ports: Vec::new(), - }); + egress.allow = Some(vec![NetworkRulePolicy { + to: Some(vec![ + NetworkPeerPolicy::new("127.0.0.0/8"), + NetworkPeerPolicy::new("::1/128"), + ]), + ..Default::default() + }]); } - Ok(ExecutionRequest { - script_code: match cmd_script_command_line(&command.command) { + let mut process_container = ProcessContainerConfig::default(); + process_container.capabilities = vec!["registryRead".to_owned()]; + let mut ui = ProcessContainerUi::default(); + ui.isolation = ProcessContainerUiIsolation::Desktop; + process_container.ui = Some(ui); + let environment = env + .iter() + .map(|entry| { + let (key, value) = entry.split_once('=').ok_or_else(|| { + PolicyError::PolicyResolution( + "MXC environment entries must be KEY=VALUE".to_owned(), + ) + })?; + Ok((key.to_owned(), value.to_owned())) + }) + .collect::, PolicyError>>()?; + Ok(ContainerRequest { + working_directory: Some( + command_cwd + .to_str() + .ok_or(PolicyError::NonUnicodeCommandCwd)? + .to_owned(), + ), + environment: (!environment.is_empty()).then_some(environment), + filesystem: Some(FilesystemPolicy { + readwrite_paths: unicode_paths(write)?, + readonly_paths: unicode_paths(read)?, + denied_paths: unicode_paths(deny)?, + ..Default::default() + }), + network: Some(NetworkPolicy { + egress: Some(egress), + ingress: Some(NetworkIngressPolicy { + default: Some(ingress_default), + host_loopback: Some(if network_enabled || proxied { + NetworkAction::Allow + } else { + NetworkAction::Deny + }), + }), + ..Default::default() + }), + // PowerShell needs Win32k and desktop handles during DLL startup. + // Keep clipboard, input injection, and system-control restrictions. + ui: Some(UiPolicy { + disable: false, + ..Default::default() + }), + containment: Containment::ProcessContainer(process_container), + ..ContainerRequest::new(match cmd_script_command_line(&command.command) { Some(script) => script, None => cmdline_from_argv_for_context( &command.command, CommandLineContext::WindowsCreateProcess, )?, - }, - working_directory: command_cwd - .to_str() - .ok_or(PolicyError::NonUnicodeCommandCwd)? - .to_owned(), - env: (!env.is_empty()).then_some(env), - policy: ContainerPolicy { - capabilities: vec!["registryRead".to_owned()], - readwrite_paths: unicode_paths(write)?, - readonly_paths: unicode_paths(read)?, - denied_paths: unicode_paths(deny)?, - fallback: FallbackPolicy { - allow_dacl_mutation: false, - }, - network_egress: Some(egress), - network_ingress: Some(NetworkIngressPolicy { - default: ingress_default, - host_loopback: if network_enabled || proxied { - NetworkAction::Allow - } else { - NetworkAction::Deny - }, - }), - network_specified: true, - network_mode_specified: true, - // PowerShell needs Win32k and desktop handles during DLL startup. - // Keep clipboard, input injection, and system-control restrictions. - ui: UiPolicy { - disable: false, - ..Default::default() - }, - base_process_ui: BaseProcessUiConfig { - isolation: "desktop".to_owned(), - ..Default::default() - }, - ..Default::default() - }, - ..Default::default() + }) }) } diff --git a/codex-rs/mxc-sandbox/src/policy_tests.rs b/codex-rs/mxc-sandbox/src/policy_tests.rs index d7b13d6340..0fd8d550b3 100644 --- a/codex-rs/mxc-sandbox/src/policy_tests.rs +++ b/codex-rs/mxc-sandbox/src/policy_tests.rs @@ -16,12 +16,11 @@ use codex_protocol::protocol::FileSystemSpecialPath; use codex_protocol::protocol::NetworkSandboxPolicy; use codex_utils_absolute_path::AbsolutePathBuf; use codex_utils_path_uri::PathUri; -use mxc_sdk::mxc_common::models::NetworkAction; -use mxc_sdk::mxc_common::models::NetworkCidr; -use mxc_sdk::mxc_common::models::NetworkEgressPolicy; -use mxc_sdk::mxc_common::models::NetworkIngressPolicy; -use mxc_sdk::mxc_common::models::NetworkPeer; -use mxc_sdk::mxc_common::models::NetworkRule; +use mxc_sdk::v1::NetworkAction; +use mxc_sdk::v1::NetworkEgressPolicy; +use mxc_sdk::v1::NetworkIngressPolicy; +use mxc_sdk::v1::NetworkPeerPolicy; +use mxc_sdk::v1::NetworkRulePolicy; use pretty_assertions::assert_eq; use crate::CreateMxcCommandArgsParams; @@ -202,17 +201,21 @@ fn wrapper_preserves_exact_argv_and_separate_command_cwd() -> Result<()> { ), (&profile, root.path(), &argv) ); - let request = build_request(&parsed, &cwd, vec!["CUSTOM=value".to_owned()], &[], &[])?; + let request = build_request(&parsed, &cwd, vec!["CUSTOM=x=y".to_owned()], &[], &[])?; assert_eq!( - (request.script_code, request.working_directory, request.env), + ( + request.command, + request.working_directory, + request.environment + ), ( r#""C:\Program Files\tool.exe" --permissions "" "quotes\" and slash\\""#.to_owned(), - cwd.to_str().unwrap().to_owned(), - Some(vec!["CUSTOM=value".to_owned()]), + Some(cwd.to_str().unwrap().to_owned()), + Some(vec![("CUSTOM".to_owned(), "x=y".to_owned())]), ) ); assert_eq!( - build_request(&parsed, &cwd, Vec::new(), &[], &[])?.env, + build_request(&parsed, &cwd, Vec::new(), &[], &[])?.environment, None ); Ok(()) @@ -250,6 +253,7 @@ fn native_grants_preserve_denies_and_read_only_carveouts() -> Result<()> { let profile = PermissionProfile::from_runtime_permissions(&fs, NetworkSandboxPolicy::Restricted); let request = build_request(&command(&profile, root), root, Vec::new(), &[], &[])?; + let request = request.filesystem.unwrap(); let mut expected_read = [ root.join(".agents"), root.join(".aws"), @@ -264,9 +268,9 @@ fn native_grants_preserve_denies_and_read_only_carveouts() -> Result<()> { expected_read.sort(); assert_eq!( ( - request.policy.readwrite_paths, - request.policy.readonly_paths, - request.policy.denied_paths + request.readwrite_paths, + request.readonly_paths, + request.denied_paths ), ( vec![ @@ -280,7 +284,6 @@ fn native_grants_preserve_denies_and_read_only_carveouts() -> Result<()> { vec![denied.to_str().unwrap().to_owned()], ) ); - assert!(!request.policy.fallback.allow_dacl_mutation); Ok(()) } @@ -309,6 +312,7 @@ fn volume_expansion_does_not_turn_read_only_child_writable() -> Result<()> { &[root.to_owned()], &[], )?; + let request = request.filesystem.unwrap(); let mut expected_write_paths = vec![root.to_str().unwrap(), writable.to_str().unwrap()]; if cfg!(windows) { expected_write_paths.insert(1, missing.to_str().unwrap()); @@ -321,10 +325,10 @@ fn volume_expansion_does_not_turn_read_only_child_writable() -> Result<()> { assert!(!directory.join(".chatgptcreated").exists()); } } - assert_eq!(request.policy.readwrite_paths, expected_write_paths); - assert_eq!(request.policy.denied_paths, vec![denied.to_str().unwrap()]); + assert_eq!(request.readwrite_paths, expected_write_paths); + assert_eq!(request.denied_paths, vec![denied.to_str().unwrap()]); assert_eq!( - request.policy.readonly_paths, + request.readonly_paths, vec![ root.join(".agents").to_str().unwrap(), root.join(".aws").to_str().unwrap(), @@ -363,8 +367,9 @@ fn volume_expansion_skips_broken_links_and_preserves_other_grants() -> Result<() std::slice::from_ref(&root), &[], )?; + let request = request.filesystem.unwrap(); assert_eq!( - (request.policy.readwrite_paths, request.policy.denied_paths), + (request.readwrite_paths, request.denied_paths), ( vec![ root.to_str().unwrap().to_owned(), @@ -407,7 +412,7 @@ fn only_write_access_expands_volume_children() -> Result<()> { &volumes, &[], )?; - let native = request.policy; + let native = request.filesystem.unwrap(); let (granted, other) = if access == FileSystemAccessMode::Write { (native.readwrite_paths, native.readonly_paths) } else { @@ -447,34 +452,26 @@ fn managed_network_allows_authorized_loopback_without_lan_or_dns_access() -> Res })?; let parsed = crate::transport::decode(&mut env)?; let request = build_request(&parsed, root.path(), Vec::new(), &[], &[])?; + let network = request.network.unwrap(); assert_eq!( - request.policy.network_egress, + network.egress, Some(NetworkEgressPolicy { - default: NetworkAction::Deny, - allow: vec![NetworkRule { - to: vec![ - NetworkPeer { - cidr: "127.0.0.0/8".parse()?, - except: Vec::new() - }, - NetworkPeer { - cidr: NetworkCidr { - address: std::net::Ipv6Addr::LOCALHOST.into(), - prefix_length: 128 - }, - except: Vec::new() - }, - ], - ports: Vec::new(), - }], - deny: Vec::new(), + default: Some(NetworkAction::Deny), + allow: Some(vec![NetworkRulePolicy { + to: Some(vec![ + NetworkPeerPolicy::new("127.0.0.0/8"), + NetworkPeerPolicy::new("::1/128"), + ]), + ports: None, + }]), + deny: None, }) ); assert_eq!( - request.policy.network_ingress, + network.ingress, Some(NetworkIngressPolicy { - default: NetworkAction::Deny, - host_loopback: NetworkAction::Allow, + default: Some(NetworkAction::Deny), + host_loopback: Some(NetworkAction::Allow), }) ); Ok(()) @@ -536,16 +533,17 @@ fn deny_globs_expand_files_and_directories_before_launch() -> Result<()> { let profile = PermissionProfile::from_runtime_permissions(&fs, NetworkSandboxPolicy::Restricted); let request = build_request(&command(&profile, &root), &nested, Vec::new(), &[], &[])?; + let request = request.filesystem.unwrap(); #[cfg(windows)] { assert!(missing.parent().unwrap().is_dir()); assert!(!missing.exists()); } - assert_eq!(request.policy.readwrite_paths, vec![root.to_str().unwrap()]); + assert_eq!(request.readwrite_paths, vec![root.to_str().unwrap()]); let mut expected = [file, directory, missing]; expected.sort(); assert_eq!( - request.policy.denied_paths, + request.denied_paths, expected.map(|path| path.to_str().unwrap().to_owned()) ); Ok(()) @@ -574,10 +572,11 @@ fn denied_parents_are_created_before_glob_expansion() -> Result<()> { let profile = PermissionProfile::from_runtime_permissions(&fs, NetworkSandboxPolicy::Restricted); let request = build_request(&command(&profile, &root), &root, Vec::new(), &[], &[])?; + let request = request.filesystem.unwrap(); assert!(missing.is_dir()); assert!(!missing.join("child").exists()); assert_eq!( - request.policy.denied_paths, + request.denied_paths, vec![ missing.to_str().unwrap(), missing.join("child").to_str().unwrap() @@ -654,6 +653,7 @@ fn root_deny_keeps_only_narrow_explicit_grants() -> Result<()> { &[root.to_owned()], &[], )?; + let request = request.filesystem.unwrap(); let allowed = vec![child.to_str().unwrap().to_owned()]; let expected = match access { FileSystemAccessMode::Read => (Vec::new(), allowed), @@ -665,14 +665,8 @@ fn root_deny_keeps_only_narrow_explicit_grants() -> Result<()> { ), FileSystemAccessMode::Deny => unreachable!(), }; - assert_eq!( - ( - request.policy.readwrite_paths, - request.policy.readonly_paths - ), - expected - ); - assert_eq!(request.policy.denied_paths, Vec::::new()); + assert_eq!((request.readwrite_paths, request.readonly_paths), expected); + assert_eq!(request.denied_paths, Vec::::new()); } Ok(()) } @@ -712,11 +706,12 @@ fn windows_temp_roots_use_filtered_environment_and_keep_explicit_denies() -> Res &[], &[], )?; + let request = request.filesystem.unwrap(); assert_eq!( - request.policy.readwrite_paths, + request.readwrite_paths, vec![first.to_str().unwrap(), second.to_str().unwrap()] ); - assert_eq!(request.policy.denied_paths, vec![denied.to_str().unwrap()]); + assert_eq!(request.denied_paths, vec![denied.to_str().unwrap()]); for value in [ None, @@ -736,8 +731,9 @@ fn windows_temp_roots_use_filtered_environment_and_keep_explicit_denies() -> Res &[], &[], )?; - assert_eq!(request.policy.readwrite_paths, Vec::::new()); - assert_eq!(request.policy.denied_paths, vec![denied.to_str().unwrap()]); + let request = request.filesystem.unwrap(); + assert_eq!(request.readwrite_paths, Vec::::new()); + assert_eq!(request.denied_paths, vec![denied.to_str().unwrap()]); } Ok(()) } @@ -769,13 +765,14 @@ fn minimal_platform_roots_preserve_explicit_denies() -> Result<()> { &[], &[allowed.clone(), denied.clone()], )?; + let request = request.filesystem.unwrap(); let expected_read = if include_defaults { vec![allowed.to_str().unwrap().to_owned()] } else { Vec::new() }; assert_eq!( - (request.policy.readonly_paths, request.policy.denied_paths), + (request.readonly_paths, request.denied_paths), (expected_read, vec![denied.to_str().unwrap().to_owned()]) ); } @@ -813,8 +810,9 @@ fn symbolic_root_preserves_equal_path_precedence_and_denies() -> Result<()> { &volumes, &[], )?; + let request = request.filesystem.unwrap(); assert_eq!( - request.policy.readwrite_paths, + request.readwrite_paths, vec![ volumes[0].to_str().unwrap().to_owned(), volumes[0].join("child").to_str().unwrap().to_owned(), @@ -823,7 +821,6 @@ fn symbolic_root_preserves_equal_path_precedence_and_denies() -> Result<()> { ] ); let reads_in_volumes: Vec<_> = request - .policy .readonly_paths .into_iter() .filter(|path| Path::new(path).starts_with(&base)) @@ -841,10 +838,7 @@ fn symbolic_root_preserves_equal_path_precedence_and_denies() -> Result<()> { ) .collect::>() ); - assert_eq!( - request.policy.denied_paths, - vec![volumes[2].to_str().unwrap()] - ); + assert_eq!(request.denied_paths, vec![volumes[2].to_str().unwrap()]); Ok(()) } @@ -878,10 +872,11 @@ fn narrowing_one_volume_keeps_the_other_volume_root_grant() -> Result<()> { &volumes, &[], )?; + let request = request.filesystem.unwrap(); let granted = if root_access == FileSystemAccessMode::Write { - request.policy.readwrite_paths + request.readwrite_paths } else { - request.policy.readonly_paths + request.readonly_paths }; let second_grants: Vec<_> = granted .into_iter() @@ -917,8 +912,9 @@ fn volume_enumeration_uses_windows_identity_for_read_write_overrides() -> Result std::slice::from_ref(&root), &[], )?; + let request = request.filesystem.unwrap(); assert_eq!( - request.policy.readwrite_paths, + request.readwrite_paths, vec![ PathUri::from_host_native_path(&alias)? .to_abs_path()? @@ -929,7 +925,6 @@ fn volume_enumeration_uses_windows_identity_for_read_write_overrides() -> Result ] ); let readonly_child: Vec<_> = request - .policy .readonly_paths .into_iter() .filter(|path| path.eq_ignore_ascii_case(child.to_str().unwrap())) diff --git a/codex-rs/mxc-sandbox/src/windows.rs b/codex-rs/mxc-sandbox/src/windows.rs index c0c9d8b10b..0e5b3de59f 100644 --- a/codex-rs/mxc-sandbox/src/windows.rs +++ b/codex-rs/mxc-sandbox/src/windows.rs @@ -67,7 +67,7 @@ pub(super) fn run() -> Result { &volumes, &platform_read_roots()?, )?; - crate::native::launch(&request) + crate::native::launch(request) } pub(super) fn volume_roots(