From a38e8ced7e3d25642ae03ecb35a2da5a6884db44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dietmar=20K=C3=BChl?= <dietmar.kuehl@me.com>
Date: Mon, 20 Apr 2026 22:41:27 +0100
Subject: [PATCH 1/5] fixed some types of when_all

---
 include/beman/execution/detail/when_all.hpp  | 17 ++++++++++++++---
 tests/beman/execution/exec-read-env.test.cpp | 20 ++++++++++++++++++++
 tests/beman/execution/exec-when-all.test.cpp |  5 ++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/include/beman/execution/detail/when_all.hpp b/include/beman/execution/detail/when_all.hpp
index 47ce6fde..1813b367 100644
--- a/include/beman/execution/detail/when_all.hpp
+++ b/include/beman/execution/detail/when_all.hpp
@@ -16,6 +16,7 @@ import std;
 #include <type_traits>
 #include <utility>
 #include <variant>
+#include <iostream> //-dk:TODO remove
 #endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution.detail.basic_sender;
@@ -47,6 +48,7 @@ import beman.execution.detail.meta.to;
 import beman.execution.detail.meta.transform;
 import beman.execution.detail.meta.unique;
 import beman.execution.detail.on_stop_request;
+import beman.execution.detail.prop;
 import beman.execution.detail.sender;
 import beman.execution.detail.sender_in;
 import beman.execution.detail.sends_stopped;
@@ -85,6 +87,7 @@ import beman.execution.detail.value_types_of_t;
 #include <beman/execution/detail/meta_transform.hpp>
 #include <beman/execution/detail/meta_unique.hpp>
 #include <beman/execution/detail/on_stop_request.hpp>
+#include <beman/execution/detail/prop.hpp>
 #include <beman/execution/detail/sender.hpp>
 #include <beman/execution/detail/sender_in.hpp>
 #include <beman/execution/detail/sends_stopped.hpp>
@@ -117,13 +120,20 @@ concept valid_when_all_sender = ::beman::execution::dependent_sender<Sender> ||
 inline constexpr auto make_when_all_env = [](const ::beman::execution::inplace_stop_source& stop_src,
                                              const auto&                                    env) noexcept {
     return ::beman::execution::detail::join_env(
-        ::beman::execution::detail::make_env(::beman::execution::get_stop_token, stop_src.get_token()), env);
+        ::beman::execution::env{::beman::execution::prop{::beman::execution::get_stop_token, stop_src.get_token()}},
+        env);
 };
 
 template <typename Env>
 using when_all_env =
     decltype(make_when_all_env(::std::declval<::beman::execution::inplace_stop_source>(), ::std::declval<Env>()));
 
+static_assert(std::same_as<::beman::execution::never_stop_token,
+                           decltype(::beman::execution::get_stop_token(::std::declval<::beman::execution::env<>>()))>);
+static_assert(std::same_as<::beman::execution::inplace_stop_token,
+                           decltype(::beman::execution::get_stop_token(
+                               ::std::declval<when_all_env<::beman::execution::env<>>>()))>);
+
 struct when_all_t {
     template <::beman::execution::sender... Sender>
         requires(0u != sizeof...(Sender)) && (... && beman::execution::detail::valid_when_all_sender<Sender>) &&
@@ -188,6 +198,7 @@ struct when_all_t {
         struct get_env_impl {
             template <typename State, typename Receiver>
             auto operator()(auto&&, State& state, const Receiver& receiver) const noexcept {
+                std::cout << "when_all::get_env()\n";
                 return make_when_all_env(state.stop_src, ::beman::execution::get_env(receiver));
             }
         };
@@ -202,7 +213,7 @@ struct when_all_t {
         template <typename Receiver, typename... Sender>
         struct state_type {
             struct nonesuch {};
-            using env_t     = ::beman::execution::env_of_t<Receiver>;
+            using env_t     = when_all_env<::beman::execution::env_of_t<Receiver>>;
             using copy_fail = ::std::conditional_t<
                 (... && ::beman::execution::value_types_of_t<Sender,
                                                              env_t,
@@ -291,7 +302,7 @@ struct when_all_t {
 
         template <typename Receiver>
         struct make_state {
-            template <::beman::execution::sender_in<::beman::execution::env_of_t<Receiver>>... Sender>
+            template <::beman::execution::sender_in<when_all_env<::beman::execution::env_of_t<Receiver>>>... Sender>
             auto operator()(auto, auto, Sender&&...) const {
                 return state_type<Receiver, Sender...>{};
             }
diff --git a/tests/beman/execution/exec-read-env.test.cpp b/tests/beman/execution/exec-read-env.test.cpp
index 13968254..2b7ae745 100644
--- a/tests/beman/execution/exec-read-env.test.cpp
+++ b/tests/beman/execution/exec-read-env.test.cpp
@@ -9,12 +9,15 @@ import beman.execution;
 #include <beman/execution/detail/read_env.hpp>
 #include <beman/execution/detail/common.hpp>
 #include <beman/execution/detail/get_domain.hpp>
+#include <beman/execution/detail/join_env.hpp>
 #include <beman/execution/detail/sender.hpp>
 #include <beman/execution/detail/sender_in.hpp>
 #include <beman/execution/detail/receiver.hpp>
 #include <beman/execution/detail/connect.hpp>
 #include <beman/execution/detail/start.hpp>
 #include <beman/execution/detail/get_stop_token.hpp>
+#include <beman/execution/detail/sync_wait.hpp>
+#include <beman/execution/detail/when_all.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
@@ -74,7 +77,24 @@ auto test_read_env_completions() -> void {
     auto r{test_std::read_env(test_std::get_stop_token)};
     test::check_type<test_std::completion_signatures<test_std::set_value_t(test_std::never_stop_token)>>(
         test_std::get_completion_signatures<decltype(r), test_std::env<>>());
+    test::check_type<test_std::completion_signatures<test_std::set_value_t(test_std::never_stop_token)>>(
+        test_std::get_completion_signatures<decltype(r), decltype(test_std::env{})>());
+    test::check_type<test_std::completion_signatures<test_std::set_value_t(test_std::inplace_stop_token)>>(
+        test_std::get_completion_signatures<decltype(r),
+                                            decltype(test_std::env{
+                                                test_std::prop{test_std::get_stop_token,
+                                                               std::declval<test_std::inplace_stop_token>()}})>());
+    test::check_type<test_std::completion_signatures<test_std::set_value_t(test_std::inplace_stop_token)>>(
+        test_std::get_completion_signatures<
+            decltype(r),
+            decltype(test_detail::join_env(
+                test_std::env{test_std::prop{test_std::get_stop_token, std::declval<test_std::inplace_stop_token>()}},
+                test_std::env{
+                    test_std::prop{test_std::get_stop_token, std::declval<test_std::never_stop_token>()}}))>());
     test::use(r);
+
+    test_std::sync_wait(test_std::read_env(test_std::get_stop_token));
+    test_std::sync_wait(test_std::when_all(test_std::read_env(test_std::get_scheduler)));
 }
 } // namespace
 
diff --git a/tests/beman/execution/exec-when-all.test.cpp b/tests/beman/execution/exec-when-all.test.cpp
index cb6a1dea..6bf697fe 100644
--- a/tests/beman/execution/exec-when-all.test.cpp
+++ b/tests/beman/execution/exec-when-all.test.cpp
@@ -234,6 +234,10 @@ auto test_when_all() -> void {
                           await_cancel(),
                           add_value{test_std::just_stopped()},
                           test_std::just(true, 3.5));
+
+    test_std::sync_wait(test_std::read_env(test_std::get_stop_token));
+    test_std::sync_wait(
+        test_std::when_all(test_std::read_env(test_std::get_stop_token) | test_std::then([](auto&&) {})));
 }
 
 auto test_when_all_with_variant() -> void {
@@ -265,7 +269,6 @@ TEST(exec_when_all) {
     static_assert(std::same_as<const test_std::when_all_with_variant_t, decltype(test_std::when_all_with_variant)>);
 
     try {
-
         test_when_all();
         test_when_all_with_variant();
     } catch (...) {

From 7dc405b350ec923ff8b7aa5347bc6c31a07c847a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dietmar=20K=C3=BChl?= <dietmar.kuehl@me.com>
Date: Mon, 20 Apr 2026 22:45:25 +0100
Subject: [PATCH 2/5] removed debug output

---
 include/beman/execution/detail/when_all.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/beman/execution/detail/when_all.hpp b/include/beman/execution/detail/when_all.hpp
index 1813b367..db794a28 100644
--- a/include/beman/execution/detail/when_all.hpp
+++ b/include/beman/execution/detail/when_all.hpp
@@ -16,7 +16,6 @@ import std;
 #include <type_traits>
 #include <utility>
 #include <variant>
-#include <iostream> //-dk:TODO remove
 #endif
 #ifdef BEMAN_HAS_MODULES
 import beman.execution.detail.basic_sender;
@@ -198,7 +197,6 @@ struct when_all_t {
         struct get_env_impl {
             template <typename State, typename Receiver>
             auto operator()(auto&&, State& state, const Receiver& receiver) const noexcept {
-                std::cout << "when_all::get_env()\n";
                 return make_when_all_env(state.stop_src, ::beman::execution::get_env(receiver));
             }
         };

From dcc595d53e64545985b36fd159c1434fd86df132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dietmar=20K=C3=BChl?= <dietmar.kuehl@me.com>
Date: Mon, 20 Apr 2026 22:50:38 +0100
Subject: [PATCH 3/5] added missing import

---
 include/beman/execution/detail/when_all.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/beman/execution/detail/when_all.hpp b/include/beman/execution/detail/when_all.hpp
index db794a28..e865fb98 100644
--- a/include/beman/execution/detail/when_all.hpp
+++ b/include/beman/execution/detail/when_all.hpp
@@ -46,6 +46,7 @@ import beman.execution.detail.meta.size;
 import beman.execution.detail.meta.to;
 import beman.execution.detail.meta.transform;
 import beman.execution.detail.meta.unique;
+import beman.execution.detail.never_stop_token;
 import beman.execution.detail.on_stop_request;
 import beman.execution.detail.prop;
 import beman.execution.detail.sender;

From 4b3f2f292b3ef7e56a5de0bd7a946cffc4908f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dietmar=20K=C3=BChl?= <dietmar.kuehl@me.com>
Date: Mon, 20 Apr 2026 23:24:52 +0100
Subject: [PATCH 4/5] fixed the result computation using the stop token

---
 include/beman/execution/detail/when_all.hpp  | 6 +++---
 tests/beman/execution/exec-read-env.test.cpp | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/beman/execution/detail/when_all.hpp b/include/beman/execution/detail/when_all.hpp
index e865fb98..c3bd2d67 100644
--- a/include/beman/execution/detail/when_all.hpp
+++ b/include/beman/execution/detail/when_all.hpp
@@ -166,12 +166,12 @@ struct when_all_t {
         using value_types =
             typename ::beman::execution::detail::when_all_value_types<::beman::execution::detail::meta::combine<
                 ::beman::execution::
-                    value_types_of_t<Sender, Env, ::beman::execution::detail::type_list, ::std::type_identity_t>...>>::
+                    value_types_of_t<Sender, when_all_env<Env>, ::beman::execution::detail::type_list, ::std::type_identity_t>...>>::
                 type;
         using error_types = ::beman::execution::detail::meta::unique<::beman::execution::detail::meta::combine<
-            ::beman::execution::error_types_of_t<Sender, Env, error_comps>...>>;
+            ::beman::execution::error_types_of_t<Sender, when_all_env<Env>, error_comps>...>>;
         using stopped_types =
-            ::std::conditional_t<(false || ... || ::beman::execution::sends_stopped<Sender, Env>),
+            ::std::conditional_t<(false || ... || ::beman::execution::sends_stopped<Sender, when_all_env<Env>>),
                                  ::beman::execution::completion_signatures<::beman::execution::set_stopped_t()>,
                                  ::beman::execution::completion_signatures<>>;
         using type = ::beman::execution::detail::meta::combine<value_types, error_types, stopped_types>;
diff --git a/tests/beman/execution/exec-read-env.test.cpp b/tests/beman/execution/exec-read-env.test.cpp
index 2b7ae745..aa1a4a80 100644
--- a/tests/beman/execution/exec-read-env.test.cpp
+++ b/tests/beman/execution/exec-read-env.test.cpp
@@ -5,6 +5,7 @@
 #include <test/execution.hpp>
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
+import beman.execution.detail.join_env;
 #else
 #include <beman/execution/detail/read_env.hpp>
 #include <beman/execution/detail/common.hpp>
@@ -94,6 +95,7 @@ auto test_read_env_completions() -> void {
     test::use(r);
 
     test_std::sync_wait(test_std::read_env(test_std::get_stop_token));
+    test_std::sync_wait(test_std::when_all(test_std::read_env(test_std::get_stop_token)));
     test_std::sync_wait(test_std::when_all(test_std::read_env(test_std::get_scheduler)));
 }
 } // namespace

From ac3bc0ca4e40d2ff87f4465b762ced6af1eefc17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dietmar=20K=C3=BChl?= <dietmar.kuehl@me.com>
Date: Mon, 20 Apr 2026 23:26:23 +0100
Subject: [PATCH 5/5] clang format

---
 include/beman/execution/detail/when_all.hpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/beman/execution/detail/when_all.hpp b/include/beman/execution/detail/when_all.hpp
index c3bd2d67..ec6ab4be 100644
--- a/include/beman/execution/detail/when_all.hpp
+++ b/include/beman/execution/detail/when_all.hpp
@@ -165,9 +165,10 @@ struct when_all_t {
 
         using value_types =
             typename ::beman::execution::detail::when_all_value_types<::beman::execution::detail::meta::combine<
-                ::beman::execution::
-                    value_types_of_t<Sender, when_all_env<Env>, ::beman::execution::detail::type_list, ::std::type_identity_t>...>>::
-                type;
+                ::beman::execution::value_types_of_t<Sender,
+                                                     when_all_env<Env>,
+                                                     ::beman::execution::detail::type_list,
+                                                     ::std::type_identity_t>...>>::type;
         using error_types = ::beman::execution::detail::meta::unique<::beman::execution::detail::meta::combine<
             ::beman::execution::error_types_of_t<Sender, when_all_env<Env>, error_comps>...>>;
         using stopped_types =