feat(p3)!: vendor 0.3.0-rc-2026-01-06

Update wasmtime's WASI implementation from version
0.3.0-rc-2025-09-16 to 0.3.0-rc-2026-01-06, using wkg for WIT vendoring.

This involves API changes in clocks and HTTP.

Author: ricochet

ci/vendor-wit.sh

@@ -1,96 +1,119 @@
 #!/usr/bin/env bash
 
-# Script to re-vendor the WIT files that Wasmtime uses as defined by a
-# particular tag in upstream repositories.
+# Script to re-vendor the WIT files that Wasmtime uses using wkg to fetch
+# packages from the OCI registry.
 #
 # This script is executed on CI to ensure that everything is up-to-date.
 set -ex
 
-# The make_vendor function takes a base path (e.g., "wasi") and a list
-# of packages in the format "name@tag". It constructs the full destination
-# path, downloads the tarballs from GitHub, extracts the relevant files, and
-# removes any unwanted directories.
-make_vendor() {
+# Temporary directory for downloads
+cache_dir=$(mktemp -d)
+trap "rm -rf $cache_dir" EXIT
+
+# vendor_wkg fetches packages from the OCI registry using wkg.
+# Using --format wit preserves @unstable annotations.
+# Each package is placed in its own directory for wit-bindgen compatibility.
+#
+# Arguments:
+#   $1 - Base path for the crate (e.g., "wasi/src/p2")
+#   $2 - Space-separated list of packages in format "name@version"
+vendor_wkg() {
+  local name=$1
+  local packages=$2
+  local path="crates/$name/wit/deps"
+
+  rm -rf "$path"
+  mkdir -p "$path"
+
+  for package in $packages; do
+    IFS='@' read -r pkg_name version <<< "$package"
+    wkg get "wasi:${pkg_name}@${version}" --format wit --overwrite -o "$path/${pkg_name}.wit"
+  done
+}
+
+# vendor_github fetches packages from GitHub tarballs for packages not
+# available in the OCI registry.
+#
+# Arguments:
+#   $1 - Base path for the crate (e.g., "wasi-tls")
+#   $2 - Space-separated list of packages in format "name@tag[@subdir]"
+vendor_github() {
   local name=$1
   local packages=$2
   local path="crates/$name/wit/deps"
 
-  rm -rf $path
-  mkdir -p $path
+  rm -rf "$path"
+  mkdir -p "$path"
 
   for package in $packages; do
     IFS='@' read -r repo tag subdir <<< "$package"
     mkdir -p "$path/$repo"
-    cached_extracted_dir="$cache_dir/$repo-$tag"
-
-    if [[ ! -d $cached_extracted_dir ]]; then
-      mkdir -p $cached_extracted_dir
-      curl --retry 5 --retry-all-errors -sLO https://github.com/WebAssembly/wasi-$repo/archive/$tag.tar.gz
-      tar xzf $tag.tar.gz --strip-components=1 -C $cached_extracted_dir
-      rm $tag.tar.gz
-      rm -rf $cached_extracted_dir/${subdir:-"wit"}/deps*
+    local extracted_dir="$cache_dir/$repo-$tag"
+
+    if [[ ! -d $extracted_dir ]]; then
+      mkdir -p "$extracted_dir"
+      curl --retry 5 --retry-all-errors -sLO "https://github.com/WebAssembly/wasi-$repo/archive/$tag.tar.gz"
+      tar xzf "$tag.tar.gz" --strip-components=1 -C "$extracted_dir"
+      rm "$tag.tar.gz"
+      rm -rf "$extracted_dir/${subdir:-wit}/deps"*
     fi
 
-    cp -r $cached_extracted_dir/${subdir:-"wit"}/* $path/$repo
+    cp -r "$extracted_dir/${subdir:-wit}"/* "$path/$repo"
   done
 }
 
-cache_dir=$(mktemp -d)
+# WASI Preview 2 packages (0.2.6)
+vendor_wkg "wasi-io" "[email protected]"
 
-make_vendor "wasi-io" "
-  [email protected]
+vendor_wkg "wasi/src/p2" "
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
 "
 
-make_vendor "wasi/src/p2" "
-  [email protected]
-  [email protected]
-  [email protected]
-  [email protected]
-  [email protected]
-  [email protected]
+vendor_wkg "wasi-http" "
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
 "
 
-make_vendor "wasi-http" "
-  [email protected]
-  [email protected]
-  [email protected]
-  [email protected]
-  [email protected]
-  [email protected]
-  [email protected]
-"
-
-make_vendor "wasi-tls" "
+# wasi-tls is not yet published to OCI registry, use GitHub
+vendor_github "wasi-tls" "
   [email protected]
   [email protected]+505fc98
 "
 
-make_vendor "wasi-config" "[email protected]"
-
-make_vendor "wasi-keyvalue" "keyvalue@219ea36"
-
-make_vendor "wasi/src/p3" "
-    [email protected]@wit-0.3.0-draft
-    [email protected]@wit-0.3.0-draft
-    [email protected]@wit-0.3.0-draft
-    [email protected]@wit-0.3.0-draft
-    [email protected]@wit-0.3.0-draft
+# wasi-config and wasi-keyvalue from OCI registry
+vendor_wkg "wasi-config" "[email protected]"
+vendor_wkg "wasi-keyvalue" "[email protected]"
+
+# WASI Preview 3 packages (0.3.0-rc-2026-01-06)
+vendor_wkg "wasi/src/p3" "
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
 "
 
-make_vendor "wasi-http/src/p3" "
-    cli@v0.3.0-rc-[email protected]
-    clocks@v0.3.0-rc-[email protected]
-    filesystem@v0.3.0-rc-[email protected]
-    http@v0.3.0-rc-[email protected]
-    random@v0.3.0-rc-[email protected]
-    sockets@v0.3.0-rc-[email protected]
+vendor_wkg "wasi-http/src/p3" "
+  cli@0.3.0-rc-2026-01-06
+  clocks@0.3.0-rc-2026-01-06
+  filesystem@0.3.0-rc-2026-01-06
+  http@0.3.0-rc-2026-01-06
+  random@0.3.0-rc-2026-01-06
+  sockets@0.3.0-rc-2026-01-06
 "
 
-rm -rf $cache_dir
-
-# Separately (for now), vendor the `wasi-nn` WIT files since their retrieval is
-# slightly different than above.
+# wasi-nn is fetched separately since it's not in the standard WASI registry
 repo=https://raw.githubusercontent.com/WebAssembly/wasi-nn
 revision=0.2.0-rc-2024-10-28
-curl --retry 5 --retry-all-errors -L $repo/$revision/wasi-nn.witx -o crates/wasi-nn/witx/wasi-nn.witx
-curl --retry 5 --retry-all-errors -L $repo/$revision/wit/wasi-nn.wit -o crates/wasi-nn/wit/wasi-nn.wit
+curl --retry 5 --retry-all-errors -L "$repo/$revision/wasi-nn.witx" -o crates/wasi-nn/witx/wasi-nn.witx
+curl --retry 5 --retry-all-errors -L "$repo/$revision/wit/wasi-nn.wit" -o crates/wasi-nn/wit/wasi-nn.wit

crates/test-programs/src/bin/p2_api_reactor.rs

@@ -4,6 +4,7 @@ wit_bindgen::generate!({
     world: "test-reactor",
     path: "../wasi/src/p2/wit",
     generate_all,
+    features: ["cli-exit-with-code", "clocks-timezone"],
 });
 
 struct T;

crates/test-programs/src/bin/p3_http_middleware.rs

@@ -1,24 +1,34 @@
+mod bindings {
+    wit_bindgen::generate!({
+        path: "../wasi-http/src/p3/wit",
+        world: "wasi:http/middleware",
+        generate_all,
+        features: ["clocks-timezone"],
+    });
+
+    use super::Component;
+    export!(Component);
+}
+
 use {
-    flate2::{
-        Compression,
-        write::{DeflateDecoder, DeflateEncoder},
-    },
-    std::{io::Write, mem},
-    test_programs::p3::{
-        proxy::exports::wasi::http::handler::Guest as Handler,
+    bindings::{
+        exports::wasi::http::handler::Guest as Handler,
         wasi::http::{
             handler,
             types::{ErrorCode, Headers, Request, Response},
         },
         wit_future, wit_stream,
     },
+    flate2::{
+        Compression,
+        write::{DeflateDecoder, DeflateEncoder},
+    },
+    std::{io::Write, mem},
     wit_bindgen::StreamResult,
 };
 
 struct Component;
 
-test_programs::p3::proxy::export!(Component);
-
 impl Handler for Component {
     /// Forward the specified request to the imported `wasi:http/handler`, transparently decoding the request body
     /// if it is `deflate`d and then encoding the response body if the client has provided an `accept-encoding:

crates/test-programs/src/bin/p3_http_middleware_with_chain.rs

@@ -6,18 +6,19 @@ mod bindings {
 package local:local;
 
 world middleware-with-chain {
-  include wasi:http/proxy@0.3.0-rc-2025-09-16;
+  include wasi:http/service@0.3.0-rc-2026-01-06;
 
   import chain-http;
 }
 
 interface chain-http {
-  use wasi:http/[email protected]2025-09-16.{request, response, error-code};
+  use wasi:http/[email protected]2026-01-06.{request, response, error-code};
 
   handle: async func(request: request) -> result<response, error-code>;
 }
         ",
         generate_all,
+        features: ["clocks-timezone"],
     });
 
     use super::Component;

crates/test-programs/src/bin/p3_http_outbound_request_content_length.rs

@@ -1,5 +1,5 @@
 use futures::join;
-use test_programs::p3::wasi::http::handler;
+use test_programs::p3::wasi::http::client;
 use test_programs::p3::wasi::http::types::{ErrorCode, Headers, Method, Request, Scheme, Trailers};
 use test_programs::p3::{wit_future, wit_stream};
 use wit_bindgen::{FutureReader, FutureWriter, StreamWriter};
@@ -47,7 +47,7 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
         {
             let (request, mut contents_tx, trailers_tx, transmit) = make_request();
             let (handle, transmit, ()) = join!(
-                async { handler::handle(request).await },
+                async { client::send(request).await },
                 async { transmit.await },
                 async {
                     let remaining = contents_tx.write_all(b"long enough".to_vec()).await;
@@ -64,7 +64,7 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
         {
             let (request, mut contents_tx, trailers_tx, transmit) = make_request();
             let (handle, transmit, ()) = join!(
-                async { handler::handle(request).await },
+                async { client::send(request).await },
                 async { transmit.await },
                 async {
                     let remaining = contents_tx.write_all(b"msg".to_vec()).await;
@@ -93,7 +93,7 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
         {
             let (request, mut contents_tx, trailers_tx, transmit) = make_request();
             let (handle, transmit, ()) = join!(
-                async { handler::handle(request).await },
+                async { client::send(request).await },
                 async { transmit.await },
                 async {
                     let remaining = contents_tx.write_all(b"more than 11 bytes".to_vec()).await;

crates/test-programs/src/bin/p3_http_outbound_request_missing_path_and_query.rs

@@ -1,4 +1,4 @@
-use test_programs::p3::wasi::http::handler::handle;
+use test_programs::p3::wasi::http::client::send;
 use test_programs::p3::wasi::http::types::{Fields, Method, Request, Scheme};
 use test_programs::p3::wit_future;
 
@@ -18,7 +18,7 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
         // Don't set path/query
         // req.set_path_with_query(Some("/")).unwrap();
 
-        let res = handle(req).await;
+        let res = send(req).await;
         assert!(res.is_err());
         Ok(())
     }

crates/test-programs/src/bin/p3_http_proxy.rs

@@ -2,7 +2,7 @@ use {
     test_programs::p3::{
         proxy::exports::wasi::http::handler::Guest as Handler,
         wasi::http::{
-            handler,
+            client,
             types::{ErrorCode, Fields, Request, Response, Scheme},
         },
         wit_future,
@@ -42,7 +42,7 @@ impl Handler for Component {
                 outgoing_request
                     .set_authority(Some(url.authority()))
                     .unwrap();
-                handler::handle(outgoing_request).await?
+                client::send(outgoing_request).await?
             } else {
                 bad_request()
             },

crates/test-programs/src/lib.rs

@@ -25,7 +25,7 @@ wit_bindgen::generate!({
         "../wasi-tls/wit/deps/tls",
     ],
     world: "wasmtime:test/test",
-    features: ["cli-exit-with-code", "tls"],
+    features: ["cli-exit-with-code", "clocks-timezone", "tls"],
     generate_all,
 });
 
@@ -35,6 +35,7 @@ pub mod proxy {
         world: "wasi:http/proxy",
         default_bindings_module: "test_programs::proxy",
         pub_export_macro: true,
+        features: ["cli-exit-with-code", "clocks-timezone"],
         with: {
             "wasi:http/[email protected]": crate::wasi::http::types,
             "wasi:http/[email protected]": crate::wasi::http::outgoing_handler,

crates/test-programs/src/p3/http.rs

@@ -2,7 +2,7 @@ use anyhow::{Context as _, Result, anyhow};
 use core::fmt;
 use futures::join;
 
-use crate::p3::wasi::http::{handler, types};
+use crate::p3::wasi::http::{client, types};
 use crate::p3::{wit_future, wit_stream};
 
 pub struct Response {
@@ -91,7 +91,7 @@ pub async fn request(
     let (transmit, handle) = join!(
         async { transmit.await.context("failed to transmit request") },
         async {
-            let response = handler::handle(request).await?;
+            let response = client::send(request).await?;
             let status = response.get_status_code();
             let headers = response.get_headers().copy_all();
             let (_, result_rx) = wit_future::new(|| Ok(()));