Sync wasi-cli with wit definitions in standards repo

Cargo.toml

@@ -195,7 +195,7 @@ system-interface = { version = "0.26.0", features = ["cap_std_impls"] }
 io-lifetimes = { version = "2.0.2", default-features = false }
 io-extras = "0.18.0"
 rustix = "0.38.4"
-
+is-terminal = "0.4.0"
 # wit-bindgen:
 wit-bindgen = { version = "0.9.0", default-features = false }
 

crates/test-programs/Cargo.toml

@@ -13,6 +13,8 @@ cargo_metadata = "0.15.3"
 wit-component = { workspace = true }
 heck = { workspace = true }
 
+[dependencies]
+is-terminal = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }

crates/test-programs/command-tests/src/bin/stream_pollable_lifetimes.rs

@@ -1,5 +1,5 @@
-use command_tests::wasi::cli_base::environment;
-use command_tests::wasi::cli_base::stdin;
+use command_tests::wasi::cli::environment;
+use command_tests::wasi::cli::stdin;
 use command_tests::wasi::io::streams;
 use command_tests::wasi::poll::poll;
 

crates/test-programs/src/lib.rs

@@ -35,3 +35,10 @@ pub fn wasi_tests_environment() -> &'static [(&'static str, &'static str)] {
         ]
     }
 }
+
+pub fn stdio_is_terminal() -> bool {
+    use is_terminal::is_terminal;
+    is_terminal(&std::io::stdin())
+        && is_terminal(&std::io::stdout())
+        && is_terminal(&std::io::stderr())
+}

crates/test-programs/tests/command.rs

@@ -8,7 +8,7 @@ use wasmtime::{
 use wasmtime_wasi::preview2::{
     command::{add_to_linker, Command},
     pipe::MemoryInputPipe,
-    DirPerms, FilePerms, HostMonotonicClock, HostWallClock, Table, WasiCtx, WasiCtxBuilder,
+    DirPerms, FilePerms, HostMonotonicClock, HostWallClock, IsATTY, Table, WasiCtx, WasiCtxBuilder,
     WasiView,
 };
 
@@ -68,6 +68,7 @@ async fn hello_stdout() -> Result<()> {
     let (mut store, command) =
         instantiate(get_component("hello_stdout"), CommandCtx { table, wasi }).await?;
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -90,7 +91,7 @@ async fn panic() -> Result<()> {
         .build(&mut table)?;
     let (mut store, command) =
         instantiate(get_component("panic"), CommandCtx { table, wasi }).await?;
-    let r = command.call_run(&mut store).await;
+    let r = command.wasi_cli_run().call_run(&mut store).await;
     assert!(r.is_err());
     println!("{:?}", r);
     Ok(())
@@ -105,6 +106,7 @@ async fn args() -> Result<()> {
     let (mut store, command) =
         instantiate(get_component("args"), CommandCtx { table, wasi }).await?;
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -118,6 +120,7 @@ async fn random() -> Result<()> {
         instantiate(get_component("random"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -164,6 +167,7 @@ async fn time() -> Result<()> {
         instantiate(get_component("time"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -173,15 +177,17 @@ async fn time() -> Result<()> {
 async fn stdin() -> Result<()> {
     let mut table = Table::new();
     let wasi = WasiCtxBuilder::new()
-        .stdin(MemoryInputPipe::new(
-            "So rested he by the Tumtum tree".into(),
-        ))
+        .stdin(
+            MemoryInputPipe::new("So rested he by the Tumtum tree".into()),
+            IsATTY::No,
+        )
         .build(&mut table)?;
 
     let (mut store, command) =
         instantiate(get_component("stdin"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -191,15 +197,17 @@ async fn stdin() -> Result<()> {
 async fn poll_stdin() -> Result<()> {
     let mut table = Table::new();
     let wasi = WasiCtxBuilder::new()
-        .stdin(MemoryInputPipe::new(
-            "So rested he by the Tumtum tree".into(),
-        ))
+        .stdin(
+            MemoryInputPipe::new("So rested he by the Tumtum tree".into()),
+            IsATTY::No,
+        )
         .build(&mut table)?;
 
     let (mut store, command) =
         instantiate(get_component("poll_stdin"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -217,6 +225,7 @@ async fn env() -> Result<()> {
         instantiate(get_component("env"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -239,6 +248,7 @@ async fn file_read() -> Result<()> {
         instantiate(get_component("file_read"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -261,6 +271,7 @@ async fn file_append() -> Result<()> {
     let (mut store, command) =
         instantiate(get_component("file_append"), CommandCtx { table, wasi }).await?;
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))?;
@@ -294,6 +305,7 @@ async fn file_dir_sync() -> Result<()> {
         instantiate(get_component("file_dir_sync"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -307,7 +319,7 @@ async fn exit_success() -> Result<()> {
     let (mut store, command) =
         instantiate(get_component("exit_success"), CommandCtx { table, wasi }).await?;
 
-    let r = command.call_run(&mut store).await;
+    let r = command.wasi_cli_run().call_run(&mut store).await;
     let err = r.unwrap_err();
     let status = err
         .downcast_ref::<wasmtime_wasi::preview2::I32Exit>()
@@ -324,7 +336,7 @@ async fn exit_default() -> Result<()> {
     let (mut store, command) =
         instantiate(get_component("exit_default"), CommandCtx { table, wasi }).await?;
 
-    let r = command.call_run(&mut store).await?;
+    let r = command.wasi_cli_run().call_run(&mut store).await?;
     assert!(r.is_ok());
     Ok(())
 }
@@ -337,7 +349,7 @@ async fn exit_failure() -> Result<()> {
     let (mut store, command) =
         instantiate(get_component("exit_failure"), CommandCtx { table, wasi }).await?;
 
-    let r = command.call_run(&mut store).await;
+    let r = command.wasi_cli_run().call_run(&mut store).await;
     let err = r.unwrap_err();
     let status = err
         .downcast_ref::<wasmtime_wasi::preview2::I32Exit>()
@@ -354,7 +366,7 @@ async fn exit_panic() -> Result<()> {
     let (mut store, command) =
         instantiate(get_component("exit_panic"), CommandCtx { table, wasi }).await?;
 
-    let r = command.call_run(&mut store).await;
+    let r = command.wasi_cli_run().call_run(&mut store).await;
     let err = r.unwrap_err();
     // The panic should trap.
     assert!(err
@@ -387,6 +399,7 @@ async fn directory_list() -> Result<()> {
         instantiate(get_component("directory_list"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -401,6 +414,7 @@ async fn default_clocks() -> Result<()> {
         instantiate(get_component("default_clocks"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -417,6 +431,7 @@ async fn export_cabi_realloc() -> Result<()> {
     .await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -439,6 +454,7 @@ async fn read_only() -> Result<()> {
         instantiate(get_component("read_only"), CommandCtx { table, wasi }).await?;
 
     command
+        .wasi_cli_run()
         .call_run(&mut store)
         .await?
         .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
@@ -452,7 +468,7 @@ async fn stream_pollable_lifetimes() -> Result<()> {
         let mut table = Table::new();
         let wasi = WasiCtxBuilder::new()
             .args(&["correct"])
-            .stdin(MemoryInputPipe::new(" ".into()))
+            .stdin(MemoryInputPipe::new(" ".into()), IsATTY::No)
             .build(&mut table)?;
 
         let (mut store, command) = instantiate(
@@ -462,6 +478,7 @@ async fn stream_pollable_lifetimes() -> Result<()> {
         .await?;
 
         command
+            .wasi_cli_run()
             .call_run(&mut store)
             .await?
             .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))?;
@@ -471,7 +488,7 @@ async fn stream_pollable_lifetimes() -> Result<()> {
         let mut table = Table::new();
         let wasi = WasiCtxBuilder::new()
             .args(&["trap"])
-            .stdin(MemoryInputPipe::new(" ".into()))
+            .stdin(MemoryInputPipe::new(" ".into()), IsATTY::No)
             .build(&mut table)?;
 
         let (mut store, command) = instantiate(
@@ -481,6 +498,7 @@ async fn stream_pollable_lifetimes() -> Result<()> {
         .await?;
 
         let trap = command
+            .wasi_cli_run()
             .call_run(&mut store)
             .await
             .err()

crates/test-programs/tests/reactor.rs

@@ -30,11 +30,16 @@ wasmtime::component::bindgen!({
        "wasi:io/streams": preview2::bindings::io::streams,
        "wasi:filesystem/types": preview2::bindings::filesystem::types,
        "wasi:filesystem/preopens": preview2::bindings::filesystem::preopens,
-       "wasi:cli-base/environment": preview2::bindings::cli_base::environment,
-       "wasi:cli-base/exit": preview2::bindings::cli_base::exit,
-       "wasi:cli-base/stdin": preview2::bindings::cli_base::stdin,
-       "wasi:cli-base/stdout": preview2::bindings::cli_base::stdout,
-       "wasi:cli-base/stderr": preview2::bindings::cli_base::stderr,
+       "wasi:cli/environment": preview2::bindings::cli::environment,
+       "wasi:cli/exit": preview2::bindings::cli::exit,
+       "wasi:cli/stdin": preview2::bindings::cli::stdin,
+       "wasi:cli/stdout": preview2::bindings::cli::stdout,
+       "wasi:cli/stderr": preview2::bindings::cli::stderr,
+       "wasi:cli/terminal_input": preview2::bindings::cli::terminal_input,
+       "wasi:cli/terminal_output": preview2::bindings::cli::terminal_output,
+       "wasi:cli/terminal_stdin": preview2::bindings::cli::terminal_stdin,
+       "wasi:cli/terminal_stdout": preview2::bindings::cli::terminal_stdout,
+       "wasi:cli/terminal_stderr": preview2::bindings::cli::terminal_stderr,
     },
     ownership: Borrowing {
         duplicate_if_necessary: false
@@ -71,11 +76,16 @@ async fn instantiate(
     preview2::bindings::filesystem::types::add_to_linker(&mut linker, |x| x)?;
     preview2::bindings::filesystem::preopens::add_to_linker(&mut linker, |x| x)?;
     preview2::bindings::io::streams::add_to_linker(&mut linker, |x| x)?;
-    preview2::bindings::cli_base::environment::add_to_linker(&mut linker, |x| x)?;
-    preview2::bindings::cli_base::exit::add_to_linker(&mut linker, |x| x)?;
-    preview2::bindings::cli_base::stdin::add_to_linker(&mut linker, |x| x)?;
-    preview2::bindings::cli_base::stdout::add_to_linker(&mut linker, |x| x)?;
-    preview2::bindings::cli_base::stderr::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::environment::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::exit::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::stdin::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::stdout::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::stderr::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::terminal_input::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::terminal_output::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::terminal_stdin::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::terminal_stdout::add_to_linker(&mut linker, |x| x)?;
+    preview2::bindings::cli::terminal_stderr::add_to_linker(&mut linker, |x| x)?;
 
     let mut store = Store::new(&ENGINE, wasi_ctx);
 

crates/test-programs/tests/wasi-cap-std-sync.rs

@@ -160,8 +160,8 @@ fn interesting_paths() {
     run("interesting_paths", true).unwrap()
 }
 #[test_log::test]
-fn isatty() {
-    run("isatty", true).unwrap()
+fn regular_file_isatty() {
+    run("regular_file_isatty", true).unwrap()
 }
 #[test_log::test]
 fn nofollow_errors() {
@@ -253,6 +253,19 @@ fn sched_yield() {
 fn stdio() {
     run("stdio", true).unwrap()
 }
+#[test_log::test]
+fn stdio_isatty() {
+    if test_programs::stdio_is_terminal() {
+        // Inherit stdio, which is a terminal in the test runner's environment:
+        run("stdio_isatty", true).unwrap()
+    }
+}
+#[test_log::test]
+fn stdio_not_isatty() {
+    // Don't inherit stdio, test asserts each is not tty:
+    run("stdio_not_isatty", false).unwrap()
+}
+
 #[test_log::test]
 fn symlink_create() {
     run("symlink_create", true).unwrap()