diff --git a/Makefile.toml b/Makefile.toml
index dce595a801..09c847181a 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -374,6 +374,7 @@ install_crate = "clippy"
 command = "cargo"
 args = [
     "clippy",
+    "--all-targets",
     "--fix",
     "--allow-dirty",
     "--allow-staged",
diff --git a/cli/golem-cli/wit/deps/golem-1.x/golem-host.wit b/cli/golem-cli/wit/deps/golem-1.x/golem-host.wit
index db737a53c2..af5cd62fd3 100644
--- a/cli/golem-cli/wit/deps/golem-1.x/golem-host.wit
+++ b/cli/golem-cli/wit/deps/golem-1.x/golem-host.wit
@@ -196,12 +196,19 @@ interface host {
         revert-last-invocations(u64)
     }
 
-    /// Indicates which agent the code is running on after `fork`
-    enum fork-result {
+    /// Details about the fork result
+    record fork-details {
+        forked-phantom-id: uuid,
+    }
+
+    /// Indicates which agent the code is running on after `fork`.
+    /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+    /// created agent.
+    variant fork-result {
         /// The original agent that called `fork`
-        original,
+        original(fork-details),
         /// The new agent
-        forked
+        forked(fork-details)
     }
 
     resource get-promise-result {
@@ -305,10 +312,11 @@ interface host {
     /// Returns none when no component for the specified component-reference or no agent with the specified agent-name exists.
     resolve-agent-id-strict: func(component-reference: string, agent-name: string) -> option<agent-id>;
 
-    /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-    /// and this agent continues running as well. The return value is going to be different in this agent and
-    /// the forked agent.
-    fork: func(new-name: string) -> fork-result;
+    /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+    /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+    /// both sides. The newly created agent continues running from the same point, but the return value is
+    /// going to be different in this agent and the forked agent.
+    fork: func() -> fork-result;
 }
 
 /// Interface providing user-defined snapshotting capability. This can be used to perform manual update of agents
diff --git a/cli/golem-cli/wit/deps/golem-agent/host.wit b/cli/golem-cli/wit/deps/golem-agent/host.wit
index f6c2103932..c8070cb027 100644
--- a/cli/golem-cli/wit/deps/golem-agent/host.wit
+++ b/cli/golem-cli/wit/deps/golem-agent/host.wit
@@ -1,7 +1,7 @@
 package golem:agent;
 
 interface host {
-    use golem:rpc/types@0.2.2.{component-id};
+    use golem:rpc/types@0.2.2.{component-id, uuid};
     use common.{agent-error, agent-type, data-value};
 
     /// Associates an agent type with a component that implements it
@@ -17,8 +17,10 @@ interface host {
     get-agent-type: func(agent-type-name: string) -> option<registered-agent-type>;
 
     /// Constructs a string agent-id from the agent type and its constructor parameters
-    make-agent-id: func(agent-type-name: string, input:  data-value) -> result<string, agent-error>;
+    /// and an optional phantom ID
+    make-agent-id: func(agent-type-name: string, input: data-value, phantom-id: option<uuid>) -> result<string, agent-error>;
 
     /// Parses an agent-id (created by `make-agent-id`) into an agent type name and its constructor parameters
-    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value>, agent-error>;
+    /// and an optional phantom ID
+    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value, option<uuid>>, agent-error>;
 }
diff --git a/cli/golem-templates/src/lib.rs b/cli/golem-templates/src/lib.rs
index 8ec00afd71..049ae4af44 100644
--- a/cli/golem-templates/src/lib.rs
+++ b/cli/golem-templates/src/lib.rs
@@ -45,7 +45,7 @@ static APP_MANIFEST_HEADER: &str = indoc! {"
 "};
 
 static GOLEM_RUST_VERSION: &str = "1.9.0";
-static GOLEM_TS_VERSION: &str = "0.0.60";
+static GOLEM_TS_VERSION: &str = "0.0.63";
 
 fn all_templates(dev_mode: bool) -> Vec<Template> {
     let mut result: Vec<Template> = vec![];
diff --git a/cli/golem-templates/wit/deps/golem-1.x/golem-host.wit b/cli/golem-templates/wit/deps/golem-1.x/golem-host.wit
index db737a53c2..af5cd62fd3 100644
--- a/cli/golem-templates/wit/deps/golem-1.x/golem-host.wit
+++ b/cli/golem-templates/wit/deps/golem-1.x/golem-host.wit
@@ -196,12 +196,19 @@ interface host {
         revert-last-invocations(u64)
     }
 
-    /// Indicates which agent the code is running on after `fork`
-    enum fork-result {
+    /// Details about the fork result
+    record fork-details {
+        forked-phantom-id: uuid,
+    }
+
+    /// Indicates which agent the code is running on after `fork`.
+    /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+    /// created agent.
+    variant fork-result {
         /// The original agent that called `fork`
-        original,
+        original(fork-details),
         /// The new agent
-        forked
+        forked(fork-details)
     }
 
     resource get-promise-result {
@@ -305,10 +312,11 @@ interface host {
     /// Returns none when no component for the specified component-reference or no agent with the specified agent-name exists.
     resolve-agent-id-strict: func(component-reference: string, agent-name: string) -> option<agent-id>;
 
-    /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-    /// and this agent continues running as well. The return value is going to be different in this agent and
-    /// the forked agent.
-    fork: func(new-name: string) -> fork-result;
+    /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+    /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+    /// both sides. The newly created agent continues running from the same point, but the return value is
+    /// going to be different in this agent and the forked agent.
+    fork: func() -> fork-result;
 }
 
 /// Interface providing user-defined snapshotting capability. This can be used to perform manual update of agents
diff --git a/cli/golem-templates/wit/deps/golem-agent/host.wit b/cli/golem-templates/wit/deps/golem-agent/host.wit
index f6c2103932..c8070cb027 100644
--- a/cli/golem-templates/wit/deps/golem-agent/host.wit
+++ b/cli/golem-templates/wit/deps/golem-agent/host.wit
@@ -1,7 +1,7 @@
 package golem:agent;
 
 interface host {
-    use golem:rpc/types@0.2.2.{component-id};
+    use golem:rpc/types@0.2.2.{component-id, uuid};
     use common.{agent-error, agent-type, data-value};
 
     /// Associates an agent type with a component that implements it
@@ -17,8 +17,10 @@ interface host {
     get-agent-type: func(agent-type-name: string) -> option<registered-agent-type>;
 
     /// Constructs a string agent-id from the agent type and its constructor parameters
-    make-agent-id: func(agent-type-name: string, input:  data-value) -> result<string, agent-error>;
+    /// and an optional phantom ID
+    make-agent-id: func(agent-type-name: string, input: data-value, phantom-id: option<uuid>) -> result<string, agent-error>;
 
     /// Parses an agent-id (created by `make-agent-id`) into an agent type name and its constructor parameters
-    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value>, agent-error>;
+    /// and an optional phantom ID
+    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value, option<uuid>>, agent-error>;
 }
diff --git a/golem-common/src/model/agent/mod.rs b/golem-common/src/model/agent/mod.rs
index 9c0708ca9b..2381574f57 100644
--- a/golem-common/src/model/agent/mod.rs
+++ b/golem-common/src/model/agent/mod.rs
@@ -49,9 +49,12 @@ use golem_wasm::{
     parse_value_and_type, print_value_and_type, IntoValue, IntoValueAndType, Value, ValueAndType,
 };
 use golem_wasm_derive::{FromValue, IntoValue};
+use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
+use std::sync::LazyLock;
+use uuid::Uuid;
 
 #[derive(
     Debug,
@@ -950,15 +953,17 @@ pub struct RegisteredAgentType {
 pub struct AgentId {
     pub agent_type: String,
     pub parameters: DataValue,
+    pub phantom_id: Option<Uuid>,
     wrapper_agent_type: String,
 }
 
 impl AgentId {
-    pub fn new(agent_type: String, parameters: DataValue) -> Self {
+    pub fn new(agent_type: String, parameters: DataValue, phantom_id: Option<Uuid>) -> Self {
         let wrapper_agent_type = agent_type.to_wit_naming();
         Self {
             agent_type,
             parameters,
+            phantom_id,
             wrapper_agent_type,
         }
     }
@@ -971,30 +976,36 @@ impl AgentId {
         s: impl AsRef<str>,
         resolver: impl AgentTypeResolver,
     ) -> Result<(Self, AgentType), String> {
+        static AGENT_ID_REGEX: LazyLock<Regex> = LazyLock::new(|| {
+            Regex::new(r"^([^(]+)\((.*)\)(?:\[([^\]]+)\])?$").expect("Invalid agent ID regex")
+        });
+
         let s = s.as_ref();
 
-        if let Some((agent_type, param_list)) = s.split_once('(') {
-            if let Some(param_list) = param_list.strip_suffix(')') {
-                let agent_type = resolver.resolve_agent_type_by_wrapper_name(agent_type)?;
-                let value = DataValue::parse(param_list, &agent_type.constructor.input_schema)?;
-                Ok((
-                    AgentId {
-                        agent_type: agent_type.type_name.clone(),
-                        wrapper_agent_type: agent_type.type_name.to_wit_naming(),
-                        parameters: value,
-                    },
-                    agent_type,
-                ))
-            } else {
-                Err(format!(
-                    "Unexpected agent-id format - missing closing ')', got: {s}"
-                ))
-            }
-        } else {
-            Err(format!(
-                "Unexpected agent-id format - must be 'agent-type(...)', got: {s}"
-            ))
-        }
+        let captures = AGENT_ID_REGEX.captures(s).ok_or_else(|| {
+            format!("Unexpected agent-id format - must be 'agent-type(...)' or 'agent-type(...)[uuid]', got: {s}")
+        })?;
+
+        let agent_type_name = captures.get(1).unwrap().as_str();
+        let param_list = captures.get(2).unwrap().as_str();
+        let phantom_id = captures
+            .get(3)
+            .map(|m| Uuid::parse_str(m.as_str()))
+            .transpose()
+            .map_err(|e| format!("Invalid UUID in phantom ID: {e}"))?;
+
+        let agent_type = resolver.resolve_agent_type_by_wrapper_name(agent_type_name)?;
+        let value = DataValue::parse(param_list, &agent_type.constructor.input_schema)?;
+
+        Ok((
+            AgentId {
+                agent_type: agent_type.type_name.clone(),
+                wrapper_agent_type: agent_type.type_name.to_wit_naming(),
+                parameters: value,
+                phantom_id,
+            },
+            agent_type,
+        ))
     }
 
     pub fn wrapper_agent_type(&self) -> &str {
@@ -1009,7 +1020,11 @@ impl Display for AgentId {
             "{}({})",
             self.wrapper_agent_type,
             self.parameters.to_compact_string()
-        )
+        )?;
+        if let Some(phantom_id) = &self.phantom_id {
+            write!(f, "[{phantom_id}]")?;
+        }
+        Ok(())
     }
 }
 
diff --git a/golem-common/src/model/agent/tests.rs b/golem-common/src/model/agent/tests.rs
index 51798f3281..f2e2ae621e 100644
--- a/golem-common/src/model/agent/tests.rs
+++ b/golem-common/src/model/agent/tests.rs
@@ -29,6 +29,7 @@ use proptest::string::string_regex;
 use proptest::{prop_assert_eq, prop_oneof, proptest};
 use std::collections::HashMap;
 use test_r::test;
+use uuid::Uuid;
 
 #[test]
 fn agent_id_wave_normalization() {
@@ -163,7 +164,7 @@ proptest! {
                 ]
             }
         );
-        let id = AgentId::new("agent-6".to_string(), parameters);
+        let id = AgentId::new("agent-6".to_string(), parameters, None);
         let s = id.to_string();
         println!("{s}");
         let id2 = AgentId::parse(s, TestAgentTypes::new()).unwrap();
@@ -186,7 +187,7 @@ proptest! {
                 ]
             }
         );
-        let id = AgentId::new("agent-6".to_string(), parameters);
+        let id = AgentId::new("agent-6".to_string(), parameters, None);
         let s = id.to_string();
         println!("{s}");
         let id2 = AgentId::parse(s, TestAgentTypes::new()).unwrap();
@@ -309,21 +310,90 @@ fn invalid_text_url() {
     )
 }
 
+#[test]
+fn roundtrip_test_with_phantom_id() {
+    let phantom_id = Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap();
+    roundtrip_test_with_id(
+        "agent-1",
+        DataValue::Tuple(ElementValues { elements: vec![] }),
+        Some(phantom_id),
+    )
+}
+
+#[test]
+fn roundtrip_test_phantom_id_complex() {
+    let phantom_id = Uuid::parse_str("f47ac10b-58cc-4372-a567-0e02b2c3d479").unwrap();
+    roundtrip_test_with_id(
+        "agent-3",
+        DataValue::Tuple(ElementValues {
+            elements: vec![
+                ElementValue::ComponentModel(12u32.into_value_and_type()),
+                ElementValue::ComponentModel(ValueAndType::new(
+                    Value::Record(vec![
+                        Value::U32(1),
+                        Value::U32(2),
+                        Value::Flags(vec![true, false, true]),
+                    ]),
+                    record(vec![
+                        field("x", u32()),
+                        field("y", u32()),
+                        field("properties", flags(&["a", "b", "c"])),
+                    ]),
+                )),
+            ],
+        }),
+        Some(phantom_id),
+    )
+}
+
+#[test]
+fn invalid_phantom_id() {
+    failure_test_with_string(
+        "agent-1()[not-a-uuid]",
+        "Invalid UUID in phantom ID: invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `n` at 1",
+    )
+}
+
+#[test]
+fn roundtrip_without_phantom_id_maintains_none() {
+    roundtrip_test_with_id(
+        "agent-1",
+        DataValue::Tuple(ElementValues { elements: vec![] }),
+        None,
+    )
+}
+
 fn roundtrip_test(agent_type: &str, parameters: DataValue) {
-    let id = AgentId::new(agent_type.to_string(), parameters);
+    let id = AgentId::new(agent_type.to_string(), parameters, None);
+    let s = id.to_string();
+    println!("{s}");
+    let id2 = AgentId::parse(s, TestAgentTypes::new()).unwrap();
+    assert_eq!(id, id2);
+}
+
+fn roundtrip_test_with_id(agent_type: &str, parameters: DataValue, phantom_id: Option<Uuid>) {
+    let id = AgentId::new(agent_type.to_string(), parameters, phantom_id);
     let s = id.to_string();
     println!("{s}");
     let id2 = AgentId::parse(s, TestAgentTypes::new()).unwrap();
     assert_eq!(id, id2);
+    assert_eq!(id.phantom_id, phantom_id);
 }
 
 fn failure_test(agent_type: &str, parameters: DataValue, expected_failure: &str) {
-    let id = AgentId::new(agent_type.to_string(), parameters);
+    let id = AgentId::new(agent_type.to_string(), parameters, None);
     let s = id.to_string();
     let id2 = AgentId::parse(s, TestAgentTypes::new()).err().unwrap();
     assert_eq!(id2, expected_failure.to_string());
 }
 
+fn failure_test_with_string(agent_id_str: &str, expected_failure: &str) {
+    let id2 = AgentId::parse(agent_id_str, TestAgentTypes::new())
+        .err()
+        .unwrap();
+    assert_eq!(id2, expected_failure.to_string());
+}
+
 struct TestAgentTypes {
     types: HashMap<String, AgentType>,
 }
diff --git a/golem-common/src/model/oplog/payload/mod.rs b/golem-common/src/model/oplog/payload/mod.rs
index 20761e3402..ae53301946 100644
--- a/golem-common/src/model/oplog/payload/mod.rs
+++ b/golem-common/src/model/oplog/payload/mod.rs
@@ -95,9 +95,6 @@ oplog_payload! {
             component_slug: String,
             agent_name: String
         },
-        GolemApiFork {
-            name: String,
-        },
         GolemApiForkAgent {
             source_agent_id: WorkerId,
             target_agent_id: WorkerId,
@@ -231,6 +228,7 @@ oplog_payload! {
             result: Result<Option<ComponentId>, String>
         },
         GolemApiFork {
+            forked_phantom_id: Uuid,
             result: Result<ForkResult, String>,
         },
         GolemApiIdempotencyKey {
@@ -421,7 +419,7 @@ pub mod host_functions {
         (GolemApiRevertWorker => "golem::api", "revert_worker", GolemApiRevertAgent, GolemApiUnit),
         (GolemApiResolveComponentId => "golem::api", "resolve_component_id", GolemApiComponentSlug, GolemApiComponentId),
         (GolemApiResolveWorkerIdStrict => "golem::api", "resolve_worker_id_strict", GolemApiComponentSlugAndAgentName, GolemApiAgentId),
-        (GolemApiFork => "golem::api", "fork", GolemApiFork, GolemApiFork)
+        (GolemApiFork => "golem::api", "fork", NoInput, GolemApiFork)
     }
 }
 
diff --git a/golem-common/wit/deps/golem-1.x/golem-host.wit b/golem-common/wit/deps/golem-1.x/golem-host.wit
index db737a53c2..af5cd62fd3 100644
--- a/golem-common/wit/deps/golem-1.x/golem-host.wit
+++ b/golem-common/wit/deps/golem-1.x/golem-host.wit
@@ -196,12 +196,19 @@ interface host {
         revert-last-invocations(u64)
     }
 
-    /// Indicates which agent the code is running on after `fork`
-    enum fork-result {
+    /// Details about the fork result
+    record fork-details {
+        forked-phantom-id: uuid,
+    }
+
+    /// Indicates which agent the code is running on after `fork`.
+    /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+    /// created agent.
+    variant fork-result {
         /// The original agent that called `fork`
-        original,
+        original(fork-details),
         /// The new agent
-        forked
+        forked(fork-details)
     }
 
     resource get-promise-result {
@@ -305,10 +312,11 @@ interface host {
     /// Returns none when no component for the specified component-reference or no agent with the specified agent-name exists.
     resolve-agent-id-strict: func(component-reference: string, agent-name: string) -> option<agent-id>;
 
-    /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-    /// and this agent continues running as well. The return value is going to be different in this agent and
-    /// the forked agent.
-    fork: func(new-name: string) -> fork-result;
+    /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+    /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+    /// both sides. The newly created agent continues running from the same point, but the return value is
+    /// going to be different in this agent and the forked agent.
+    fork: func() -> fork-result;
 }
 
 /// Interface providing user-defined snapshotting capability. This can be used to perform manual update of agents
diff --git a/golem-common/wit/deps/golem-agent/host.wit b/golem-common/wit/deps/golem-agent/host.wit
index f6c2103932..c8070cb027 100644
--- a/golem-common/wit/deps/golem-agent/host.wit
+++ b/golem-common/wit/deps/golem-agent/host.wit
@@ -1,7 +1,7 @@
 package golem:agent;
 
 interface host {
-    use golem:rpc/types@0.2.2.{component-id};
+    use golem:rpc/types@0.2.2.{component-id, uuid};
     use common.{agent-error, agent-type, data-value};
 
     /// Associates an agent type with a component that implements it
@@ -17,8 +17,10 @@ interface host {
     get-agent-type: func(agent-type-name: string) -> option<registered-agent-type>;
 
     /// Constructs a string agent-id from the agent type and its constructor parameters
-    make-agent-id: func(agent-type-name: string, input:  data-value) -> result<string, agent-error>;
+    /// and an optional phantom ID
+    make-agent-id: func(agent-type-name: string, input: data-value, phantom-id: option<uuid>) -> result<string, agent-error>;
 
     /// Parses an agent-id (created by `make-agent-id`) into an agent type name and its constructor parameters
-    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value>, agent-error>;
+    /// and an optional phantom ID
+    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value, option<uuid>>, agent-error>;
 }
diff --git a/golem-wasm/wit/deps/golem-1.x/golem-host.wit b/golem-wasm/wit/deps/golem-1.x/golem-host.wit
index db737a53c2..af5cd62fd3 100644
--- a/golem-wasm/wit/deps/golem-1.x/golem-host.wit
+++ b/golem-wasm/wit/deps/golem-1.x/golem-host.wit
@@ -196,12 +196,19 @@ interface host {
         revert-last-invocations(u64)
     }
 
-    /// Indicates which agent the code is running on after `fork`
-    enum fork-result {
+    /// Details about the fork result
+    record fork-details {
+        forked-phantom-id: uuid,
+    }
+
+    /// Indicates which agent the code is running on after `fork`.
+    /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+    /// created agent.
+    variant fork-result {
         /// The original agent that called `fork`
-        original,
+        original(fork-details),
         /// The new agent
-        forked
+        forked(fork-details)
     }
 
     resource get-promise-result {
@@ -305,10 +312,11 @@ interface host {
     /// Returns none when no component for the specified component-reference or no agent with the specified agent-name exists.
     resolve-agent-id-strict: func(component-reference: string, agent-name: string) -> option<agent-id>;
 
-    /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-    /// and this agent continues running as well. The return value is going to be different in this agent and
-    /// the forked agent.
-    fork: func(new-name: string) -> fork-result;
+    /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+    /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+    /// both sides. The newly created agent continues running from the same point, but the return value is
+    /// going to be different in this agent and the forked agent.
+    fork: func() -> fork-result;
 }
 
 /// Interface providing user-defined snapshotting capability. This can be used to perform manual update of agents
diff --git a/golem-worker-executor/src/durable_host/golem/agent.rs b/golem-worker-executor/src/durable_host/golem/agent.rs
index baca6397df..195777a5a1 100644
--- a/golem-worker-executor/src/durable_host/golem/agent.rs
+++ b/golem-worker-executor/src/durable_host/golem/agent.rs
@@ -94,6 +94,7 @@ impl<Ctx: WorkerCtx> Host for DurableWorkerCtx<Ctx> {
         &mut self,
         agent_type_name: String,
         input: DataValue,
+        phantom_id: Option<crate::preview2::golem::rpc::types::Uuid>,
     ) -> anyhow::Result<Result<String, AgentError>> {
         DurabilityHost::observe_function_call(self, "golem_agent", "make_agent_id");
 
@@ -103,7 +104,11 @@ impl<Ctx: WorkerCtx> Host for DurableWorkerCtx<Ctx> {
                 agent_type.agent_type.constructor.input_schema,
             ) {
                 Ok(input) => {
-                    let agent_id = AgentId::new(agent_type_name.to_wit_naming(), input);
+                    let agent_id = AgentId::new(
+                        agent_type_name.to_wit_naming(),
+                        input,
+                        phantom_id.map(|id| id.into()),
+                    );
                     Ok(Ok(agent_id.to_string()))
                 }
                 Err(err) => Ok(Err(AgentError::InvalidInput(err))),
@@ -116,12 +121,25 @@ impl<Ctx: WorkerCtx> Host for DurableWorkerCtx<Ctx> {
     async fn parse_agent_id(
         &mut self,
         agent_id: String,
-    ) -> anyhow::Result<Result<(String, DataValue), AgentError>> {
+    ) -> anyhow::Result<
+        Result<
+            (
+                String,
+                DataValue,
+                Option<crate::preview2::golem::rpc::types::Uuid>,
+            ),
+            AgentError,
+        >,
+    > {
         DurabilityHost::observe_function_call(self, "golem_agent", "parse_agent_id");
 
         let component_metadata = &self.component_metadata().metadata;
         match AgentId::parse(agent_id, component_metadata) {
-            Ok(agent_id) => Ok(Ok((agent_id.agent_type, agent_id.parameters.into()))),
+            Ok(agent_id) => Ok(Ok((
+                agent_id.agent_type,
+                agent_id.parameters.into(),
+                agent_id.phantom_id.map(|id| id.into()),
+            ))),
             Err(error) => Ok(Err(AgentError::InvalidAgentId(error))),
         }
     }
diff --git a/golem-worker-executor/src/durable_host/golem/v1x.rs b/golem-worker-executor/src/durable_host/golem/v1x.rs
index 8d9960fa39..d966d4faa8 100644
--- a/golem-worker-executor/src/durable_host/golem/v1x.rs
+++ b/golem-worker-executor/src/durable_host/golem/v1x.rs
@@ -18,7 +18,7 @@ use crate::model::public_oplog::{
     find_component_version_at, get_public_oplog_chunk, search_public_oplog,
 };
 use crate::preview2::golem_api_1_x::host::{
-    AgentAnyFilter, ForkResult, GetAgents, Host, HostGetAgents, HostGetPromiseResult,
+    AgentAnyFilter, ForkDetails, ForkResult, GetAgents, Host, HostGetAgents, HostGetPromiseResult,
 };
 use crate::preview2::golem_api_1_x::oplog::{
     Host as OplogHost, HostGetOplog, HostSearchOplog, SearchOplog,
@@ -31,10 +31,7 @@ use crate::worker::status::calculate_last_known_status;
 use crate::workerctx::{InvocationManagement, StatusManagement, WorkerCtx};
 use anyhow::anyhow;
 use async_trait::async_trait;
-use desert_rust::{
-    BinaryDeserializer, BinaryOutput, BinarySerializer, DeserializationContext,
-    SerializationContext,
-};
+use golem_common::model::agent::AgentId;
 use golem_common::model::oplog::host_functions::{
     GolemApiCompletePromise, GolemApiCreatePromise, GolemApiFork, GolemApiForkWorker,
     GolemApiGenerateIdempotencyKey, GolemApiGetAgentMetadata, GolemApiGetPromiseResult,
@@ -44,13 +41,13 @@ use golem_common::model::oplog::host_functions::{
 use golem_common::model::oplog::types::AgentMetadataForGuests;
 use golem_common::model::oplog::{
     DurableFunctionType, HostRequestGolemApiAgentId, HostRequestGolemApiComponentSlug,
-    HostRequestGolemApiComponentSlugAndAgentName, HostRequestGolemApiFork,
-    HostRequestGolemApiForkAgent, HostRequestGolemApiPromiseId, HostRequestGolemApiRevertAgent,
-    HostRequestGolemApiUpdateAgent, HostRequestNoInput, HostResponseGolemApiAgentId,
-    HostResponseGolemApiAgentMetadata, HostResponseGolemApiComponentId, HostResponseGolemApiFork,
-    HostResponseGolemApiIdempotencyKey, HostResponseGolemApiPromiseCompletion,
-    HostResponseGolemApiPromiseId, HostResponseGolemApiPromiseResult,
-    HostResponseGolemApiSelfAgentMetadata, HostResponseGolemApiUnit, OplogEntry,
+    HostRequestGolemApiComponentSlugAndAgentName, HostRequestGolemApiForkAgent,
+    HostRequestGolemApiPromiseId, HostRequestGolemApiRevertAgent, HostRequestGolemApiUpdateAgent,
+    HostRequestNoInput, HostResponseGolemApiAgentId, HostResponseGolemApiAgentMetadata,
+    HostResponseGolemApiComponentId, HostResponseGolemApiFork, HostResponseGolemApiIdempotencyKey,
+    HostResponseGolemApiPromiseCompletion, HostResponseGolemApiPromiseId,
+    HostResponseGolemApiPromiseResult, HostResponseGolemApiSelfAgentMetadata,
+    HostResponseGolemApiUnit, OplogEntry,
 };
 use golem_common::model::regions::OplogRegion;
 use golem_common::model::{ComponentId, ComponentVersion, OwnedWorkerId, ScanCursor, WorkerId};
@@ -787,11 +784,24 @@ impl<Ctx: WorkerCtx> Host for DurableWorkerCtx<Ctx> {
             .map_err(|err| anyhow!(err))
     }
 
-    async fn fork(&mut self, new_name: String) -> anyhow::Result<ForkResult> {
+    async fn fork(&mut self) -> anyhow::Result<ForkResult> {
         let durability =
             Durability::<GolemApiFork>::new(self, DurableFunctionType::WriteRemote).await?;
 
         let result = if durability.is_live() {
+            let forked_phantom_id = Uuid::new_v4();
+
+            let new_name = if let Some(agent_id) = self.agent_id() {
+                AgentId::new(
+                    agent_id.agent_type.clone(),
+                    agent_id.parameters.clone(),
+                    Some(forked_phantom_id),
+                )
+                .to_string()
+            } else {
+                format!("{}-{}", self.worker_id().worker_name, forked_phantom_id)
+            };
+
             let target_agent_id = WorkerId {
                 component_id: self.owned_worker_id.component_id(),
                 worker_name: new_name.clone(),
@@ -811,6 +821,7 @@ impl<Ctx: WorkerCtx> Host for DurableWorkerCtx<Ctx> {
                     &self.owned_worker_id,
                     &target_agent_id,
                     oplog_index_cut_off,
+                    forked_phantom_id,
                 )
                 .await
                 .map(|_| golem_common::model::ForkResult::Original)
@@ -820,8 +831,9 @@ impl<Ctx: WorkerCtx> Host for DurableWorkerCtx<Ctx> {
             Ok(durability
                 .persist(
                     self,
-                    HostRequestGolemApiFork { name: new_name },
+                    HostRequestNoInput {},
                     HostResponseGolemApiFork {
+                        forked_phantom_id,
                         result: fork_result,
                     },
                 )
@@ -831,10 +843,15 @@ impl<Ctx: WorkerCtx> Host for DurableWorkerCtx<Ctx> {
         }?;
 
         match result.result {
-            Ok(result) => Ok(match result {
-                golem_common::model::ForkResult::Original => ForkResult::Original,
-                golem_common::model::ForkResult::Forked => ForkResult::Forked,
-            }),
+            Ok(fork_result) => {
+                let details = ForkDetails {
+                    forked_phantom_id: result.forked_phantom_id.into(),
+                };
+                Ok(match fork_result {
+                    golem_common::model::ForkResult::Original => ForkResult::Original(details),
+                    golem_common::model::ForkResult::Forked => ForkResult::Forked(details),
+                })
+            }
             Err(err) => Err(anyhow!(err)),
         }
     }
@@ -1433,31 +1450,6 @@ impl GetAgentsEntry {
     }
 }
 
-impl BinarySerializer for ForkResult {
-    fn serialize<Output: BinaryOutput>(
-        &self,
-        context: &mut SerializationContext<Output>,
-    ) -> Result<(), desert_rust::Error> {
-        match self {
-            ForkResult::Original => <u8 as BinarySerializer>::serialize(&0u8, context),
-            ForkResult::Forked => <u8 as BinarySerializer>::serialize(&1u8, context),
-        }
-    }
-}
-
-impl BinaryDeserializer for ForkResult {
-    fn deserialize(context: &mut DeserializationContext<'_>) -> Result<Self, desert_rust::Error> {
-        let value = <u8 as BinaryDeserializer>::deserialize(context)?;
-        match value {
-            0 => Ok(ForkResult::Original),
-            1 => Ok(ForkResult::Forked),
-            other => Err(desert_rust::Error::InvalidConstructorId {
-                constructor_id: other as u32,
-                type_name: "ForkResult".to_string(),
-            }),
-        }
-    }
-}
 #[derive(Clone)]
 pub struct GetPromiseResultEntry {
     promise_id: PromiseId,
diff --git a/golem-worker-executor/src/preview2/mod.rs b/golem-worker-executor/src/preview2/mod.rs
index 21db21b7da..cb6ed72403 100644
--- a/golem-worker-executor/src/preview2/mod.rs
+++ b/golem-worker-executor/src/preview2/mod.rs
@@ -59,19 +59,3 @@ pub type Pollable = golem_wasm::wasi::io::poll::Pollable;
 pub use self::golem::api1_3_0 as golem_api_1_x;
 pub use self::golem::durability as golem_durability;
 pub use golem_common::model::agent::bindings::golem::agent as golem_agent;
-use golem_wasm::analysis::analysed_type::r#enum;
-use golem_wasm::analysis::AnalysedType;
-use golem_wasm::{IntoValue, Value};
-
-impl IntoValue for golem_api_1_x::host::ForkResult {
-    fn into_value(self) -> Value {
-        match self {
-            Self::Original => Value::Enum(0),
-            Self::Forked => Value::Enum(1),
-        }
-    }
-
-    fn get_type() -> AnalysedType {
-        r#enum(&["original", "forked"])
-    }
-}
diff --git a/golem-worker-executor/src/services/worker_fork.rs b/golem-worker-executor/src/services/worker_fork.rs
index dd27456716..66d6ceaff4 100644
--- a/golem-worker-executor/src/services/worker_fork.rs
+++ b/golem-worker-executor/src/services/worker_fork.rs
@@ -41,7 +41,7 @@ use async_trait::async_trait;
 use golem_common::model::invocation_context::InvocationContextStack;
 use golem_common::model::oplog::host_functions::GolemApiFork;
 use golem_common::model::oplog::{
-    DurableFunctionType, HostPayloadPair, HostRequest, HostRequestGolemApiFork, HostResponse,
+    DurableFunctionType, HostPayloadPair, HostRequest, HostRequestNoInput, HostResponse,
     HostResponseGolemApiFork, OplogIndex, OplogIndexRange,
 };
 use golem_common::model::{AccountId, ProjectId, Timestamp, WorkerMetadata};
@@ -50,6 +50,7 @@ use golem_common::read_only_lock;
 use golem_service_base::error::worker_executor::WorkerExecutorError;
 use std::sync::Arc;
 use tokio::runtime::Handle;
+use uuid::Uuid;
 
 #[async_trait]
 pub trait WorkerForkService: Send + Sync {
@@ -67,6 +68,7 @@ pub trait WorkerForkService: Send + Sync {
         source_worker_id: &OwnedWorkerId,
         target_worker_id: &WorkerId,
         oplog_index_cut_off: OplogIndex,
+        forked_phantom_id: Uuid,
     ) -> Result<(), WorkerExecutorError>;
 }
 
@@ -547,6 +549,7 @@ impl<Ctx: WorkerCtx> WorkerForkService for DefaultWorkerFork<Ctx> {
         source_worker_id: &OwnedWorkerId,
         target_worker_id: &WorkerId,
         oplog_index_cut_off: OplogIndex,
+        forked_phantom_id: Uuid,
     ) -> Result<(), WorkerExecutorError> {
         let new_oplog = self
             .copy_source_oplog(
@@ -564,10 +567,9 @@ impl<Ctx: WorkerCtx> WorkerForkService for DefaultWorkerFork<Ctx> {
         let _ = new_oplog
             .add_imported_function_invoked(
                 GolemApiFork::HOST_FUNCTION_NAME,
-                &HostRequest::GolemApiFork(HostRequestGolemApiFork {
-                    name: target_worker_id.worker_name.clone(),
-                }),
+                &HostRequest::NoInput(HostRequestNoInput {}),
                 &HostResponse::GolemApiFork(HostResponseGolemApiFork {
+                    forked_phantom_id,
                     result: Ok(golem_common::model::ForkResult::Forked),
                 }),
                 DurableFunctionType::WriteRemote,
diff --git a/golem-worker-executor/tests/agent.rs b/golem-worker-executor/tests/agent.rs
index 535ac197bd..647cca484a 100644
--- a/golem-worker-executor/tests/agent.rs
+++ b/golem-worker-executor/tests/agent.rs
@@ -319,6 +319,9 @@ async fn ephemeral_agent_works(
         .start_worker(&component_id, "ephemeral-echo-agent(\"param2\")")
         .await;
 
+    executor.log_output(&worker_id1).await;
+    executor.log_output(&worker_id2).await;
+
     let result1 = executor
         .invoke_and_await(
             &worker_id1,
diff --git a/golem-worker-executor/tests/rust_rpc.rs b/golem-worker-executor/tests/rust_rpc.rs
index 024428fefe..45e3cfa10b 100644
--- a/golem-worker-executor/tests/rust_rpc.rs
+++ b/golem-worker-executor/tests/rust_rpc.rs
@@ -845,3 +845,48 @@ async fn ephemeral_worker_invocation_via_rpc1(
 
     assert_eq!(result, Ok(vec![Value::U32(1)]));
 }
+
+#[test]
+#[tracing::instrument]
+async fn ephemeral_worker_invocation_via_rpc2(
+    last_unique_id: &LastUniqueId,
+    deps: &WorkerExecutorTestDependencies,
+    _tracing: &Tracing,
+) {
+    let context = TestContext::new(last_unique_id);
+    let executor = start(deps, &context)
+        .await
+        .unwrap()
+        .into_admin_with_unique_project()
+        .await;
+
+    let component_id = executor
+        .component("it_agent_counters_release")
+        .name("it:agent-counters")
+        .store()
+        .await;
+    let worker_id = WorkerId {
+        component_id,
+        worker_name: "counter(\"ephemeral_worker_invocation_via_rpc2\")".to_string(),
+    };
+
+    let _ = executor
+        .invoke_and_await(
+            &worker_id,
+            "it:agent-counters/counter.{increment-through-rpc-to-ephemeral-phantom}",
+            vec![],
+        )
+        .await;
+    let result = executor
+        .invoke_and_await(
+            &worker_id,
+            "it:agent-counters/counter.{increment-through-rpc-to-ephemeral-phantom}",
+            vec![],
+        )
+        .await;
+
+    executor.check_oplog_is_queryable(&worker_id).await;
+    drop(executor);
+
+    assert_eq!(result, Ok(vec![Value::U32(1)]));
+}
diff --git a/integration-tests/src/benchmarks/durability_overhead.rs b/integration-tests/src/benchmarks/durability_overhead.rs
index b22baf2abb..5f59b4773a 100644
--- a/integration-tests/src/benchmarks/durability_overhead.rs
+++ b/integration-tests/src/benchmarks/durability_overhead.rs
@@ -160,7 +160,7 @@ impl Benchmark for DurabilityOverhead {
                     invoke_and_await(
                         &deps_clone,
                         worker_id,
-                        "benchmark:direct-rust-exports/benchmark-direct-rust-api.{echo}",
+                        "benchmark:agent-rust/benchmark-agent.{echo}",
                         vec!["test".into_value_and_type()],
                     )
                     .await
diff --git a/integration-tests/tests/fork.rs b/integration-tests/tests/fork.rs
index ad4e01f0c8..03dd438a70 100644
--- a/integration-tests/tests/fork.rs
+++ b/integration-tests/tests/fork.rs
@@ -709,6 +709,9 @@ async fn fork_self(deps: &EnvBasedTestDependencies, _tracing: &Tracing) {
     let admin = deps.admin().await;
     let component_id = admin.component("golem-rust-tests").store().await;
 
+    let (fork_phantom_id_tx, fork_phantom_id_rx) = tokio::sync::oneshot::channel::<String>();
+    let fork_phantom_id_tx = Arc::new(Mutex::new(Some(fork_phantom_id_tx)));
+
     let (port_tx, port_rx) = tokio::sync::oneshot::channel::<u16>();
     let http_server = tokio::spawn(
         async move {
@@ -720,9 +723,17 @@ async fn fork_self(deps: &EnvBasedTestDependencies, _tracing: &Tracing) {
                     }),
                 )
                 .route(
-                    "/fork-test/step2/:name/:fork/:input",
-                    get(move |args: Path<(String, String, String)>| async move {
-                        Json(format!("{}-{}-{}", args.0 .0, args.0 .1, args.0 .2))
+                    "/fork-test/step2/:name/:fork/:phantom_id",
+                    get(move |args: Path<(String, String, String)>| {
+                        let fork_phantom_id_tx = fork_phantom_id_tx.clone();
+                        async move {
+                            if let Some(fork_phantom_id_tx) =
+                                fork_phantom_id_tx.lock().unwrap().take()
+                            {
+                                fork_phantom_id_tx.send(args.2.clone()).unwrap();
+                            }
+                            Json(format!("{}-{}-{}", args.0 .0, args.0 .1, args.0 .2))
+                        }
                     }),
                 );
 
@@ -760,9 +771,11 @@ async fn fork_self(deps: &EnvBasedTestDependencies, _tracing: &Tracing) {
         .await
         .unwrap();
 
+    let forked_phantom_id = fork_phantom_id_rx.await.unwrap();
+
     let target_worker_id = WorkerId {
         component_id: component_id.clone(),
-        worker_name: "forked-worker".to_string(),
+        worker_name: format!("source-worker-{forked_phantom_id}"),
     };
     let target_result = admin
         .invoke_and_await_with_key(
@@ -778,14 +791,15 @@ async fn fork_self(deps: &EnvBasedTestDependencies, _tracing: &Tracing) {
 
     assert_eq!(
         source_result,
-        vec![Value::String(
-            "source-worker-hello::source-worker-original-hello".to_string()
-        )]
+        vec![Value::String(format!(
+            "source-worker-hello::source-worker-original-{forked_phantom_id}"
+        ))]
     );
     assert_eq!(
         target_result,
-        vec![Value::String(
-            "source-worker-hello::forked-worker-forked-hello".to_string()
-        )]
+        vec![Value::String(format!(
+            "source-worker-hello::{}-forked-{forked_phantom_id}",
+            target_worker_id.worker_name
+        ))]
     );
 }
diff --git a/sdks/rust/golem-rust-macro/src/agentic/allowed_mimetypes_derviation.rs b/sdks/rust/golem-rust-macro/src/agentic/allowed_mimetypes_derivation.rs
similarity index 100%
rename from sdks/rust/golem-rust-macro/src/agentic/allowed_mimetypes_derviation.rs
rename to sdks/rust/golem-rust-macro/src/agentic/allowed_mimetypes_derivation.rs
diff --git a/sdks/rust/golem-rust-macro/src/agentic/client_generation.rs b/sdks/rust/golem-rust-macro/src/agentic/client_generation.rs
index 05fcf3470d..a780140c67 100644
--- a/sdks/rust/golem-rust-macro/src/agentic/client_generation.rs
+++ b/sdks/rust/golem-rust-macro/src/agentic/client_generation.rs
@@ -26,7 +26,7 @@ pub fn get_remote_client(
     constructor_param_defs: Vec<proc_macro2::TokenStream>,
     constructor_param_idents: Vec<proc_macro2::TokenStream>,
 ) -> proc_macro2::TokenStream {
-    let remote_trait_name = format_ident!("{}Client", item_trait.ident);
+    let remote_client_type_name = format_ident!("{}Client", item_trait.ident);
 
     let type_name = item_trait.ident.to_string();
     let method_impls = get_remote_method_impls(item_trait, type_name.to_string());
@@ -34,13 +34,13 @@ pub fn get_remote_client(
     match constructor_param_type {
         DefaultOrMultimodal::Default => {
             quote! {
-                pub struct #remote_trait_name {
+                pub struct #remote_client_type_name {
                     agent_id: golem_rust::wasm_rpc::AgentId,
                     wasm_rpc: golem_rust::wasm_rpc::WasmRpc,
                 }
 
-                impl #remote_trait_name {
-                    pub fn get(#(#constructor_param_defs), *) -> #remote_trait_name {
+                impl #remote_client_type_name {
+                    pub fn get(#(#constructor_param_defs), *) -> #remote_client_type_name {
                         let agent_type =
                            golem_rust::golem_agentic::golem::agent::host::get_agent_type(#type_name).expect("Internal Error: Agent type not registered");
 
@@ -49,13 +49,63 @@ pub fn get_remote_client(
                          let data_value  = golem_rust::golem_agentic::golem::agent::common::DataValue::Tuple(element_values);
 
                          let agent_id_string =
-                           golem_rust::golem_agentic::golem::agent::host::make_agent_id(#type_name, &data_value).expect("Internal Error: Failed to make agent id");
+                           golem_rust::golem_agentic::golem::agent::host::make_agent_id(
+                                #type_name,
+                                &data_value,
+                                None
+                           ).expect("Internal Error: Failed to make agent id");
+
+                         let agent_id = golem_rust::wasm_rpc::AgentId { agent_id: agent_id_string, component_id: agent_type.implemented_by.clone() };
+
+                         let wasm_rpc = golem_rust::wasm_rpc::WasmRpc::new(&agent_id);
+
+                         #remote_client_type_name { agent_id: agent_id, wasm_rpc: wasm_rpc }
+
+                    }
+
+                    pub fn new_phantom(#(#constructor_param_defs), *) -> #remote_client_type_name {
+                        let agent_type =
+                           golem_rust::golem_agentic::golem::agent::host::get_agent_type(#type_name).expect("Internal Error: Agent type not registered");
+
+                         let element_values = vec![#(golem_rust::agentic::Schema::to_element_value(#constructor_param_idents).expect("Failed to convert constructor parameter to ElementValue")),*];
+
+                         let data_value  = golem_rust::golem_agentic::golem::agent::common::DataValue::Tuple(element_values);
+
+                         let agent_id_string =
+                           golem_rust::golem_agentic::golem::agent::host::make_agent_id(
+                                #type_name,
+                                &data_value,
+                                Some(golem_rust::Uuid::new_v4().into())
+                           ).expect("Internal Error: Failed to make agent id");
 
                          let agent_id = golem_rust::wasm_rpc::AgentId { agent_id: agent_id_string, component_id: agent_type.implemented_by.clone() };
 
                          let wasm_rpc = golem_rust::wasm_rpc::WasmRpc::new(&agent_id);
 
-                         #remote_trait_name { agent_id: agent_id, wasm_rpc: wasm_rpc }
+                         #remote_client_type_name { agent_id: agent_id, wasm_rpc: wasm_rpc }
+
+                    }
+
+                    pub fn get_phantom(phantom_id: golem_rust::Uuid, #(#constructor_param_defs), *) -> #remote_client_type_name {
+                        let agent_type =
+                           golem_rust::golem_agentic::golem::agent::host::get_agent_type(#type_name).expect("Internal Error: Agent type not registered");
+
+                         let element_values = vec![#(golem_rust::agentic::Schema::to_element_value(#constructor_param_idents).expect("Failed to convert constructor parameter to ElementValue")),*];
+
+                         let data_value  = golem_rust::golem_agentic::golem::agent::common::DataValue::Tuple(element_values);
+
+                         let agent_id_string =
+                           golem_rust::golem_agentic::golem::agent::host::make_agent_id(
+                                #type_name,
+                                &data_value,
+                                Some(phantom_id.into())
+                           ).expect("Internal Error: Failed to make agent id");
+
+                         let agent_id = golem_rust::wasm_rpc::AgentId { agent_id: agent_id_string, component_id: agent_type.implemented_by.clone() };
+
+                         let wasm_rpc = golem_rust::wasm_rpc::WasmRpc::new(&agent_id);
+
+                         #remote_client_type_name { agent_id: agent_id, wasm_rpc: wasm_rpc }
 
                     }
 
@@ -63,6 +113,12 @@ pub fn get_remote_client(
                         self.agent_id.agent_id.clone()
                     }
 
+                    pub fn phantom_id(&self) -> Option<golem_rust::Uuid> {
+                        let (_, _, phantom_id) = golem_rust::golem_agentic::golem::agent::host::parse_agent_id(&self.agent_id.agent_id)
+                            .unwrap();
+                        phantom_id.map(|id| id.into())
+                    }
+
                     #method_impls
                 }
             }
@@ -72,13 +128,13 @@ pub fn get_remote_client(
             let constructor_param = &constructor_param_idents[0];
 
             quote! {
-                pub struct #remote_trait_name {
+                pub struct #remote_client_type_name {
                     agent_id: golem_rust::wasm_rpc::AgentId,
                     wasm_rpc: golem_rust::wasm_rpc::WasmRpc,
                 }
 
-                impl #remote_trait_name {
-                    pub fn get(#(#constructor_param_defs), *) -> #remote_trait_name {
+                impl #remote_client_type_name {
+                    pub fn get(#(#constructor_param_defs), *) -> #remote_client_type_name {
                         let agent_type =
                            golem_rust::golem_agentic::golem::agent::host::get_agent_type(#type_name).expect("Internal Error: Agent type not registered");
 
@@ -91,7 +147,7 @@ pub fn get_remote_client(
 
                          let wasm_rpc = golem_rust::wasm_rpc::WasmRpc::new(&agent_id);
 
-                         #remote_trait_name { agent_id: agent_id, wasm_rpc: wasm_rpc }
+                         #remote_client_type_name { agent_id: agent_id, wasm_rpc: wasm_rpc }
                     }
 
                     pub fn get_agent_id(&self) -> String {
diff --git a/sdks/rust/golem-rust-macro/src/agentic/mod.rs b/sdks/rust/golem-rust-macro/src/agentic/mod.rs
index 444e432d22..3be52f13f4 100644
--- a/sdks/rust/golem-rust-macro/src/agentic/mod.rs
+++ b/sdks/rust/golem-rust-macro/src/agentic/mod.rs
@@ -15,7 +15,7 @@
 pub use agent_definition_impl::*;
 pub use agent_implementation_impl::*;
 pub use allowed_language_derivation::*;
-pub use allowed_mimetypes_derviation::*;
+pub use allowed_mimetypes_derivation::*;
 pub use client_generation::*;
 pub use compile_errors::*;
 pub use multimodal_derivation::*;
@@ -24,7 +24,7 @@ pub use schema_derivation::*;
 mod agent_definition_impl;
 mod agent_implementation_impl;
 mod allowed_language_derivation;
-mod allowed_mimetypes_derviation;
+mod allowed_mimetypes_derivation;
 mod client_generation;
 mod compile_errors;
 mod helpers;
diff --git a/sdks/rust/golem-rust/src/agentic/agent.rs b/sdks/rust/golem-rust/src/agentic/agent.rs
index e87057b54e..56fbd339ce 100644
--- a/sdks/rust/golem-rust/src/agentic/agent.rs
+++ b/sdks/rust/golem-rust/src/agentic/agent.rs
@@ -13,14 +13,29 @@
 // limitations under the License.
 
 use crate::golem_agentic::exports::golem::agent::guest::{AgentError, AgentType, DataValue};
+use crate::golem_agentic::golem::agent::host::parse_agent_id;
 
 #[async_trait::async_trait(?Send)]
 pub trait Agent {
+    /// Gets the agent ID string of this agent.
+    ///
+    /// The agent ID consists of the agent type name, constructor parameter values and optional
+    /// phantom ID.
     fn get_agent_id(&self) -> String;
+
+    /// Dynamically performs a method invocation on this agent
     async fn invoke(
         &mut self,
         method_name: String,
         input: DataValue,
     ) -> Result<DataValue, AgentError>;
+
+    /// Gets the agent type metadata of this agent
     fn get_definition(&self) -> AgentType;
+
+    /// Gets the phantom ID of the agent
+    fn phantom_id(&self) -> Option<crate::Uuid> {
+        let (_, _, phantom_id) = parse_agent_id(&self.get_agent_id()).unwrap(); // Not user-provided string so we can assume it's always correct
+        phantom_id.map(|id| id.into())
+    }
 }
diff --git a/sdks/rust/golem-rust/src/lib.rs b/sdks/rust/golem-rust/src/lib.rs
index b9263f7b85..611cee15f3 100644
--- a/sdks/rust/golem-rust/src/lib.rs
+++ b/sdks/rust/golem-rust/src/lib.rs
@@ -19,6 +19,8 @@ use std::str::FromStr;
 #[cfg(test)]
 test_r::enable!();
 
+pub use uuid::Uuid;
+
 pub mod bindings {
     use wit_bindgen::generate;
 
diff --git a/sdks/rust/golem-rust/wit/deps/golem-1.x/golem-host.wit b/sdks/rust/golem-rust/wit/deps/golem-1.x/golem-host.wit
index db737a53c2..af5cd62fd3 100644
--- a/sdks/rust/golem-rust/wit/deps/golem-1.x/golem-host.wit
+++ b/sdks/rust/golem-rust/wit/deps/golem-1.x/golem-host.wit
@@ -196,12 +196,19 @@ interface host {
         revert-last-invocations(u64)
     }
 
-    /// Indicates which agent the code is running on after `fork`
-    enum fork-result {
+    /// Details about the fork result
+    record fork-details {
+        forked-phantom-id: uuid,
+    }
+
+    /// Indicates which agent the code is running on after `fork`.
+    /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+    /// created agent.
+    variant fork-result {
         /// The original agent that called `fork`
-        original,
+        original(fork-details),
         /// The new agent
-        forked
+        forked(fork-details)
     }
 
     resource get-promise-result {
@@ -305,10 +312,11 @@ interface host {
     /// Returns none when no component for the specified component-reference or no agent with the specified agent-name exists.
     resolve-agent-id-strict: func(component-reference: string, agent-name: string) -> option<agent-id>;
 
-    /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-    /// and this agent continues running as well. The return value is going to be different in this agent and
-    /// the forked agent.
-    fork: func(new-name: string) -> fork-result;
+    /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+    /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+    /// both sides. The newly created agent continues running from the same point, but the return value is
+    /// going to be different in this agent and the forked agent.
+    fork: func() -> fork-result;
 }
 
 /// Interface providing user-defined snapshotting capability. This can be used to perform manual update of agents
diff --git a/sdks/rust/golem-rust/wit/deps/golem-agent/host.wit b/sdks/rust/golem-rust/wit/deps/golem-agent/host.wit
index f6c2103932..c8070cb027 100644
--- a/sdks/rust/golem-rust/wit/deps/golem-agent/host.wit
+++ b/sdks/rust/golem-rust/wit/deps/golem-agent/host.wit
@@ -1,7 +1,7 @@
 package golem:agent;
 
 interface host {
-    use golem:rpc/types@0.2.2.{component-id};
+    use golem:rpc/types@0.2.2.{component-id, uuid};
     use common.{agent-error, agent-type, data-value};
 
     /// Associates an agent type with a component that implements it
@@ -17,8 +17,10 @@ interface host {
     get-agent-type: func(agent-type-name: string) -> option<registered-agent-type>;
 
     /// Constructs a string agent-id from the agent type and its constructor parameters
-    make-agent-id: func(agent-type-name: string, input:  data-value) -> result<string, agent-error>;
+    /// and an optional phantom ID
+    make-agent-id: func(agent-type-name: string, input: data-value, phantom-id: option<uuid>) -> result<string, agent-error>;
 
     /// Parses an agent-id (created by `make-agent-id`) into an agent type name and its constructor parameters
-    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value>, agent-error>;
+    /// and an optional phantom ID
+    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value, option<uuid>>, agent-error>;
 }
diff --git a/sdks/ts/wit/deps/golem-1.x/golem-host.wit b/sdks/ts/wit/deps/golem-1.x/golem-host.wit
index db737a53c2..af5cd62fd3 100644
--- a/sdks/ts/wit/deps/golem-1.x/golem-host.wit
+++ b/sdks/ts/wit/deps/golem-1.x/golem-host.wit
@@ -196,12 +196,19 @@ interface host {
         revert-last-invocations(u64)
     }
 
-    /// Indicates which agent the code is running on after `fork`
-    enum fork-result {
+    /// Details about the fork result
+    record fork-details {
+        forked-phantom-id: uuid,
+    }
+
+    /// Indicates which agent the code is running on after `fork`.
+    /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+    /// created agent.
+    variant fork-result {
         /// The original agent that called `fork`
-        original,
+        original(fork-details),
         /// The new agent
-        forked
+        forked(fork-details)
     }
 
     resource get-promise-result {
@@ -305,10 +312,11 @@ interface host {
     /// Returns none when no component for the specified component-reference or no agent with the specified agent-name exists.
     resolve-agent-id-strict: func(component-reference: string, agent-name: string) -> option<agent-id>;
 
-    /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-    /// and this agent continues running as well. The return value is going to be different in this agent and
-    /// the forked agent.
-    fork: func(new-name: string) -> fork-result;
+    /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+    /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+    /// both sides. The newly created agent continues running from the same point, but the return value is
+    /// going to be different in this agent and the forked agent.
+    fork: func() -> fork-result;
 }
 
 /// Interface providing user-defined snapshotting capability. This can be used to perform manual update of agents
diff --git a/sdks/ts/wit/deps/golem-agent/host.wit b/sdks/ts/wit/deps/golem-agent/host.wit
index f6c2103932..c8070cb027 100644
--- a/sdks/ts/wit/deps/golem-agent/host.wit
+++ b/sdks/ts/wit/deps/golem-agent/host.wit
@@ -1,7 +1,7 @@
 package golem:agent;
 
 interface host {
-    use golem:rpc/types@0.2.2.{component-id};
+    use golem:rpc/types@0.2.2.{component-id, uuid};
     use common.{agent-error, agent-type, data-value};
 
     /// Associates an agent type with a component that implements it
@@ -17,8 +17,10 @@ interface host {
     get-agent-type: func(agent-type-name: string) -> option<registered-agent-type>;
 
     /// Constructs a string agent-id from the agent type and its constructor parameters
-    make-agent-id: func(agent-type-name: string, input:  data-value) -> result<string, agent-error>;
+    /// and an optional phantom ID
+    make-agent-id: func(agent-type-name: string, input: data-value, phantom-id: option<uuid>) -> result<string, agent-error>;
 
     /// Parses an agent-id (created by `make-agent-id`) into an agent type name and its constructor parameters
-    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value>, agent-error>;
+    /// and an optional phantom ID
+    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value, option<uuid>>, agent-error>;
 }
diff --git a/test-components/agent-counters/Cargo.lock b/test-components/agent-counters/Cargo.lock
index 2ac1ac7aec..2f08b22ced 100644
--- a/test-components/agent-counters/Cargo.lock
+++ b/test-components/agent-counters/Cargo.lock
@@ -391,6 +391,7 @@ name = "golem-rust"
 version = "0.0.0"
 dependencies = [
  "async-trait",
+ "ctor",
  "golem-rust-macro",
  "golem-wasm",
  "serde",
diff --git a/test-components/agent-counters/components-rust/it-agent-counters/src/lib.rs b/test-components/agent-counters/components-rust/it-agent-counters/src/lib.rs
index 77403ed522..a9657f190d 100644
--- a/test-components/agent-counters/components-rust/it-agent-counters/src/lib.rs
+++ b/test-components/agent-counters/components-rust/it-agent-counters/src/lib.rs
@@ -6,6 +6,7 @@ trait Counter {
     fn increment(&mut self) -> u32;
     async fn increment_through_rpc(&mut self) -> u32;
     async fn increment_through_rpc_to_ephemeral(&mut self) -> u32;
+    async fn increment_through_rpc_to_ephemeral_phantom(&mut self) -> u32;
 }
 
 struct CounterImpl {
@@ -33,6 +34,11 @@ impl Counter for CounterImpl {
         let mut client = EphemeralCounterClient::get(format!("{}-ephemeral", self.id));
         client.increment().await
     }
+
+    async fn increment_through_rpc_to_ephemeral_phantom(&mut self) -> u32 {
+        let mut client = EphemeralSingletonCounterClient::new_phantom();
+        client.increment().await
+    }
 }
 
 #[agent_definition(ephemeral)]
@@ -58,6 +64,30 @@ impl EphemeralCounter for EphemeralCounterImpl {
     }
 }
 
+
+#[agent_definition(ephemeral)]
+trait EphemeralSingletonCounter {
+    fn new() -> Self;
+    fn increment(&mut self) -> u32;
+}
+
+struct EphemeralSingletonCounterImpl {
+    count: u32
+}
+
+#[agent_implementation]
+impl EphemeralSingletonCounter for EphemeralSingletonCounterImpl {
+    fn new() -> Self {
+        Self { count: 0 }
+    }
+
+    fn increment(&mut self) -> u32 {
+        self.count += 1;
+        self.count
+    }
+}
+
+
 #[agent_definition(ephemeral)]
 trait HostFunctionTests {
     fn new(id: String) -> Self;
diff --git a/test-components/auction-example/Cargo.lock b/test-components/auction-example/Cargo.lock
index 39fd32f32b..cc21354a9a 100644
--- a/test-components/auction-example/Cargo.lock
+++ b/test-components/auction-example/Cargo.lock
@@ -29,6 +29,17 @@ version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "auction"
 version = "0.0.1"
@@ -80,6 +91,12 @@ version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
+[[package]]
+name = "bytes"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
+
 [[package]]
 name = "camino"
 version = "1.1.9"
@@ -217,6 +234,12 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "foldhash"
 version = "0.1.5"
@@ -341,19 +364,22 @@ dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasi 0.14.1+wasi-0.2.3",
 ]
 
 [[package]]
 name = "golem-rust"
 version = "0.0.0"
 dependencies = [
+ "async-trait",
  "golem-rust-macro",
  "golem-wasm",
  "serde",
  "serde_json",
  "uuid",
+ "wasi 0.14.1+wasi-0.2.3",
  "wit-bindgen",
+ "wstd",
 ]
 
 [[package]]
@@ -394,6 +420,17 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.61"
@@ -1001,9 +1038,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.14.1+wasi-0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "ad7df608df60a1c33e247881838b0f809512086e3e3bb1c18323b77eeb1f844e"
 dependencies = [
  "wit-bindgen-rt 0.39.0",
 ]
@@ -1310,6 +1347,33 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
+[[package]]
+name = "wstd"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f51495e1ae93476d1629b5810bd6068fdf22545a8ada7ea5929e2faed7b793"
+dependencies = [
+ "futures-core",
+ "http",
+ "itoa",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "slab",
+ "wasi 0.14.1+wasi-0.2.3",
+ "wstd-macro",
+]
+
+[[package]]
+name = "wstd-macro"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225ac858e4405bdf164d92d070422c0b3b9b81f9b0b68836841f4d1bafc446b3"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "yoke"
 version = "0.8.0"
diff --git a/test-components/auction.wasm b/test-components/auction.wasm
index 5a86f66310..d0eb7259cd 100755
Binary files a/test-components/auction.wasm and b/test-components/auction.wasm differ
diff --git a/test-components/auction_registry.wasm b/test-components/auction_registry.wasm
index 9d2a6d797f..643864b8d9 100644
Binary files a/test-components/auction_registry.wasm and b/test-components/auction_registry.wasm differ
diff --git a/test-components/auction_registry_composed.wasm b/test-components/auction_registry_composed.wasm
index 1658bf1923..ecc2bbaed5 100644
Binary files a/test-components/auction_registry_composed.wasm and b/test-components/auction_registry_composed.wasm differ
diff --git a/test-components/benchmark_agent_rust_release.wasm b/test-components/benchmark_agent_rust_release.wasm
index 7b629ccd8e..45e7abd38a 100644
Binary files a/test-components/benchmark_agent_rust_release.wasm and b/test-components/benchmark_agent_rust_release.wasm differ
diff --git a/test-components/benchmark_agent_ts.wasm b/test-components/benchmark_agent_ts.wasm
index 4d5f6e50d4..cf75fd4e4e 100644
Binary files a/test-components/benchmark_agent_ts.wasm and b/test-components/benchmark_agent_ts.wasm differ
diff --git a/test-components/benchmark_agent_ts_large.wasm b/test-components/benchmark_agent_ts_large.wasm
index 31bb40b6c3..d39d9d6394 100644
Binary files a/test-components/benchmark_agent_ts_large.wasm and b/test-components/benchmark_agent_ts_large.wasm differ
diff --git a/test-components/benchmark_direct_rust.wasm b/test-components/benchmark_direct_rust.wasm
index 8db46fe0a5..eff3e924d9 100644
Binary files a/test-components/benchmark_direct_rust.wasm and b/test-components/benchmark_direct_rust.wasm differ
diff --git a/test-components/benchmark_direct_rust_rpc_child.wasm b/test-components/benchmark_direct_rust_rpc_child.wasm
index 7b7dee5eea..a78412269b 100644
Binary files a/test-components/benchmark_direct_rust_rpc_child.wasm and b/test-components/benchmark_direct_rust_rpc_child.wasm differ
diff --git a/test-components/benchmarks/Cargo.toml b/test-components/benchmarks/Cargo.toml
index 62aca3fc72..058b15df9b 100644
--- a/test-components/benchmarks/Cargo.toml
+++ b/test-components/benchmarks/Cargo.toml
@@ -8,7 +8,6 @@ lto = true
 
 [workspace.dependencies]
 golem-rust = { path="../../sdks/rust/golem-rust", features = ["export_load_snapshot", "export_save_snapshot", "export_oplog_processor", "export_golem_agentic"] }
-reqwest = { git = "https://github.com/zivergetech/reqwest", branch = "update-sep-2025", features = ["json"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 wit-bindgen-rt = { version = "0.42.1", features = ["bitflags"] }
diff --git a/test-components/blob-store-service.wasm b/test-components/blob-store-service.wasm
index d613c51e4f..37d734ab2a 100755
Binary files a/test-components/blob-store-service.wasm and b/test-components/blob-store-service.wasm differ
diff --git a/test-components/build-components.sh b/test-components/build-components.sh
index 0581898f37..984143c612 100755
--- a/test-components/build-components.sh
+++ b/test-components/build-components.sh
@@ -6,7 +6,7 @@ rust_test_components=("write-stdout" "write-stderr" "read-stdin" "clocks" "shopp
 "option-service" "flags-service" "http-client-2" "failing-component" "variant-service" "key-value-service" "blob-store-service" "runtime-service" "networking" "shopping-cart-resource"
 "update-test-v1" "update-test-v2-11" "update-test-v3-11" "update-test-v4" "rust-echo" "logging" "oplog-processor" "rdbms-service" "component-resolve" "http-client-3" "golem-rust-tests")
 
-rust_test_apps=("auction-example" "rpc" "rust-service/rpc" "custom-durability" "invocation-context" "scheduled-invocation" "high-volume-logging" "ifs-update" "ifs-update-inside-exported-function" "agent-counters")
+rust_test_apps=("auction-example" "rust-service/rpc" "custom-durability" "invocation-context" "scheduled-invocation" "high-volume-logging" "ifs-update" "ifs-update-inside-exported-function" "agent-counters"  "rpc" )
 c_test_components=("large-initial-memory" "large-dynamic-memory")
 ts_test_apps=("agent-constructor-parameter-echo" "agent-promise" "agent-self-rpc" "agent-rpc" "benchmarks")
 
diff --git a/test-components/caller.wasm b/test-components/caller.wasm
index 65d3637b43..1408baa558 100644
Binary files a/test-components/caller.wasm and b/test-components/caller.wasm differ
diff --git a/test-components/caller_composed.wasm b/test-components/caller_composed.wasm
index a480685f84..917cf44ece 100644
Binary files a/test-components/caller_composed.wasm and b/test-components/caller_composed.wasm differ
diff --git a/test-components/child_component.wasm b/test-components/child_component.wasm
index 3dc9cd037c..1c343ca113 100755
Binary files a/test-components/child_component.wasm and b/test-components/child_component.wasm differ
diff --git a/test-components/clock-service.wasm b/test-components/clock-service.wasm
index 928c28592f..b893fc264a 100755
Binary files a/test-components/clock-service.wasm and b/test-components/clock-service.wasm differ
diff --git a/test-components/clocks.wasm b/test-components/clocks.wasm
index 583ceb3e68..45b7cefc90 100755
Binary files a/test-components/clocks.wasm and b/test-components/clocks.wasm differ
diff --git a/test-components/component-resolve.wasm b/test-components/component-resolve.wasm
index 7edabe3f2c..1cb59577d2 100644
Binary files a/test-components/component-resolve.wasm and b/test-components/component-resolve.wasm differ
diff --git a/test-components/component-resolve/src/bindings.rs b/test-components/component-resolve/src/bindings.rs
index a7a3785d79..1f4c1e5ef4 100644
--- a/test-components/component-resolve/src/bindings.rs
+++ b/test-components/component-resolve/src/bindings.rs
@@ -588,14 +588,31 @@ pub mod golem {
                     }
                 }
             }
-            /// Indicates which agent the code is running on after `fork`
-            #[repr(u8)]
-            #[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+            /// Details about the fork result
+            #[repr(C)]
+            #[derive(Clone, Copy)]
+            pub struct ForkDetails {
+                pub forked_phantom_id: Uuid,
+            }
+            impl ::core::fmt::Debug for ForkDetails {
+                fn fmt(
+                    &self,
+                    f: &mut ::core::fmt::Formatter<'_>,
+                ) -> ::core::fmt::Result {
+                    f.debug_struct("ForkDetails")
+                        .field("forked-phantom-id", &self.forked_phantom_id)
+                        .finish()
+                }
+            }
+            /// Indicates which agent the code is running on after `fork`.
+            /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+            /// created agent.
+            #[derive(Clone, Copy)]
             pub enum ForkResult {
                 /// The original agent that called `fork`
-                Original,
+                Original(ForkDetails),
                 /// The new agent
-                Forked,
+                Forked(ForkDetails),
             }
             impl ::core::fmt::Debug for ForkResult {
                 fn fmt(
@@ -603,28 +620,15 @@ pub mod golem {
                     f: &mut ::core::fmt::Formatter<'_>,
                 ) -> ::core::fmt::Result {
                     match self {
-                        ForkResult::Original => {
-                            f.debug_tuple("ForkResult::Original").finish()
+                        ForkResult::Original(e) => {
+                            f.debug_tuple("ForkResult::Original").field(e).finish()
                         }
-                        ForkResult::Forked => {
-                            f.debug_tuple("ForkResult::Forked").finish()
+                        ForkResult::Forked(e) => {
+                            f.debug_tuple("ForkResult::Forked").field(e).finish()
                         }
                     }
                 }
             }
-            impl ForkResult {
-                #[doc(hidden)]
-                pub unsafe fn _lift(val: u8) -> ForkResult {
-                    if !cfg!(debug_assertions) {
-                        return ::core::mem::transmute(val);
-                    }
-                    match val {
-                        0 => ForkResult::Original,
-                        1 => ForkResult::Forked,
-                        _ => panic!("invalid enum discriminant"),
-                    }
-                }
-            }
             #[derive(Debug)]
             #[repr(transparent)]
             pub struct GetPromiseResult {
@@ -2502,26 +2506,59 @@ pub mod golem {
                 }
             }
             #[allow(unused_unsafe, clippy::all)]
-            /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-            /// and this agent continues running as well. The return value is going to be different in this agent and
-            /// the forked agent.
-            pub fn fork(new_name: &str) -> ForkResult {
+            /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+            /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+            /// both sides. The newly created agent continues running from the same point, but the return value is
+            /// going to be different in this agent and the forked agent.
+            pub fn fork() -> ForkResult {
                 unsafe {
-                    let vec0 = new_name;
-                    let ptr0 = vec0.as_ptr().cast::<u8>();
-                    let len0 = vec0.len();
+                    #[repr(align(8))]
+                    struct RetArea([::core::mem::MaybeUninit<u8>; 24]);
+                    let mut ret_area = RetArea([::core::mem::MaybeUninit::uninit(); 24]);
+                    let ptr0 = ret_area.0.as_mut_ptr().cast::<u8>();
                     #[cfg(target_arch = "wasm32")]
                     #[link(wasm_import_module = "golem:api/host@1.3.0")]
                     unsafe extern "C" {
                         #[link_name = "fork"]
-                        fn wit_import1(_: *mut u8, _: usize) -> i32;
+                        fn wit_import1(_: *mut u8);
                     }
                     #[cfg(not(target_arch = "wasm32"))]
-                    unsafe extern "C" fn wit_import1(_: *mut u8, _: usize) -> i32 {
+                    unsafe extern "C" fn wit_import1(_: *mut u8) {
                         unreachable!()
                     }
-                    let ret = unsafe { wit_import1(ptr0.cast_mut(), len0) };
-                    ForkResult::_lift(ret as u8)
+                    unsafe { wit_import1(ptr0) };
+                    let l2 = i32::from(*ptr0.add(0).cast::<u8>());
+                    let v7 = match l2 {
+                        0 => {
+                            let e7 = {
+                                let l3 = *ptr0.add(8).cast::<i64>();
+                                let l4 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l3 as u64,
+                                        low_bits: l4 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Original(e7)
+                        }
+                        n => {
+                            debug_assert_eq!(n, 1, "invalid enum discriminant");
+                            let e7 = {
+                                let l5 = *ptr0.add(8).cast::<i64>();
+                                let l6 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l5 as u64,
+                                        low_bits: l6 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Forked(e7)
+                        }
+                    };
+                    let result8 = v7;
+                    result8
                 }
             }
         }
@@ -6451,8 +6488,8 @@ pub(crate) use __export_component_resolve_impl as export;
 )]
 #[doc(hidden)]
 #[allow(clippy::octal_escapes)]
-pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 5532] = *b"\
-\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\x94*\x01A\x02\x01A\x15\
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 5570] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xba*\x01A\x02\x01A\x15\
 \x01B\x0a\x04\0\x08pollable\x03\x01\x01h\0\x01@\x01\x04self\x01\0\x7f\x04\0\x16[\
 method]pollable.ready\x01\x02\x01@\x01\x04self\x01\x01\0\x04\0\x16[method]pollab\
 le.block\x01\x03\x01p\x01\x01py\x01@\x01\x02in\x04\0\x05\x04\0\x04poll\x01\x06\x03\
@@ -6506,7 +6543,7 @@ ethod]cancellation-token.cancel\x01F\x01j\x01\x05\x01s\x01@\x01\x04uuids\0\xc7\0
 \x04\0\x0aparse-uuid\x01H\x01@\x01\x04uuid\x05\0s\x04\0\x0euuid-to-string\x01I\x03\
 \0\x15golem:rpc/types@0.2.2\x05\x05\x02\x03\0\x01\x08duration\x02\x03\0\x03\x0cc\
 omponent-id\x02\x03\0\x03\x04uuid\x02\x03\0\x03\x0evalue-and-type\x02\x03\0\x03\x08\
-agent-id\x01B\x85\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
+agent-id\x01B\x87\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
 \x07\x04\0\x0ccomponent-id\x03\0\x02\x02\x03\x02\x01\x08\x04\0\x04uuid\x03\0\x04\
 \x02\x03\x02\x01\x09\x04\0\x0evalue-and-type\x03\0\x06\x02\x03\x02\x01\x0a\x04\0\
 \x08agent-id\x03\0\x08\x02\x03\x02\x01\x01\x04\0\x08pollable\x03\0\x0a\x01w\x04\0\
@@ -6534,38 +6571,39 @@ rs4\x04\0\x10agent-any-filter\x03\05\x01ps\x01o\x02ss\x01p8\x01r\x07\x08agent-id
 \x09\x04args7\x03env9\x0bconfig-vars9\x06status\"\x11component-versionw\x0bretry\
 -countw\x04\0\x0eagent-metadata\x03\0:\x04\0\x0aget-agents\x03\x01\x01q\x02\x15r\
 evert-to-oplog-index\x01\x0d\0\x17revert-last-invocations\x01w\0\x04\0\x13revert\
--agent-target\x03\0=\x01m\x02\x08original\x06forked\x04\0\x0bfork-result\x03\0?\x04\
-\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\x06fil\
-ter\xc2\0\x07precise\x7f\0\xc3\0\x04\0\x17[constructor]get-agents\x01D\x01h<\x01\
-p;\x01k\xc6\0\x01@\x01\x04self\xc5\0\0\xc7\0\x04\0\x1b[method]get-agents.get-nex\
-t\x01H\x01hA\x01i\x0b\x01@\x01\x04self\xc9\0\0\xca\0\x04\0$[method]get-promise-r\
-esult.subscribe\x01K\x01p}\x01k\xcc\0\x01@\x01\x04self\xc9\0\0\xcd\0\x04\0\x1e[m\
-ethod]get-promise-result.get\x01N\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01O\x01i\
-A\x01@\x01\x0apromise-id\x0f\0\xd0\0\x04\0\x0bget-promise\x01Q\x01@\x02\x0apromi\
-se-id\x0f\x04data\xcc\0\0\x7f\x04\0\x10complete-promise\x01R\x01@\0\0\x0d\x04\0\x0f\
-get-oplog-index\x01S\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-index\x01\
-T\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01U\x04\0\x14mark-begin-ope\
-ration\x01S\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01V\x01@\0\0\
-\x18\x04\0\x10get-retry-policy\x01W\x01@\x01\x10new-retry-policy\x18\x01\0\x04\0\
-\x10set-retry-policy\x01X\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01Y\
-\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-leve\
-l\x01Z\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01[\x01@\x01\x0aidempotent\x7f\
-\x01\0\x04\0\x14set-idempotence-mode\x01\\\x01@\0\0\x05\x04\0\x18generate-idempo\
-tency-key\x01]\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
-\0\x0cupdate-agent\x01^\x01@\0\0;\x04\0\x11get-self-metadata\x01_\x01k;\x01@\x01\
-\x08agent-id\x09\0\xe0\0\x04\0\x12get-agent-metadata\x01a\x01@\x03\x0fsource-age\
+-agent-target\x03\0=\x01r\x01\x11forked-phantom-id\x05\x04\0\x0cfork-details\x03\
+\0?\x01q\x02\x08original\x01\xc0\0\0\x06forked\x01\xc0\0\0\x04\0\x0bfork-result\x03\
+\0A\x04\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\
+\x06filter\xc4\0\x07precise\x7f\0\xc5\0\x04\0\x17[constructor]get-agents\x01F\x01\
+h<\x01p;\x01k\xc8\0\x01@\x01\x04self\xc7\0\0\xc9\0\x04\0\x1b[method]get-agents.g\
+et-next\x01J\x01hC\x01i\x0b\x01@\x01\x04self\xcb\0\0\xcc\0\x04\0$[method]get-pro\
+mise-result.subscribe\x01M\x01p}\x01k\xce\0\x01@\x01\x04self\xcb\0\0\xcf\0\x04\0\
+\x1e[method]get-promise-result.get\x01P\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01\
+Q\x01iC\x01@\x01\x0apromise-id\x0f\0\xd2\0\x04\0\x0bget-promise\x01S\x01@\x02\x0a\
+promise-id\x0f\x04data\xce\0\0\x7f\x04\0\x10complete-promise\x01T\x01@\0\0\x0d\x04\
+\0\x0fget-oplog-index\x01U\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-in\
+dex\x01V\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01W\x04\0\x14mark-be\
+gin-operation\x01U\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01X\x01\
+@\0\0\x18\x04\0\x10get-retry-policy\x01Y\x01@\x01\x10new-retry-policy\x18\x01\0\x04\
+\0\x10set-retry-policy\x01Z\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01\
+[\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-lev\
+el\x01\\\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01]\x01@\x01\x0aidempotent\x7f\
+\x01\0\x04\0\x14set-idempotence-mode\x01^\x01@\0\0\x05\x04\0\x18generate-idempot\
+ency-key\x01_\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
+\0\x0cupdate-agent\x01`\x01@\0\0;\x04\0\x11get-self-metadata\x01a\x01k;\x01@\x01\
+\x08agent-id\x09\0\xe2\0\x04\0\x12get-agent-metadata\x01c\x01@\x03\x0fsource-age\
 nt-id\x09\x0ftarget-agent-id\x09\x11oplog-idx-cut-off\x0d\x01\0\x04\0\x0afork-ag\
-ent\x01b\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
-c\x01k\x03\x01@\x01\x13component-references\0\xe4\0\x04\0\x14resolve-component-i\
-d\x01e\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe6\0\x04\0\x10\
-resolve-agent-id\x01g\x04\0\x17resolve-agent-id-strict\x01g\x01@\x01\x08new-name\
-s\0\xc0\0\x04\0\x04fork\x01h\x03\0\x14golem:api/host@1.3.0\x05\x0b\x02\x03\0\x04\
-\x08agent-id\x02\x03\0\x04\x0ccomponent-id\x01B\x09\x02\x03\x02\x01\x0c\x04\0\x08\
-agent-id\x03\0\0\x02\x03\x02\x01\x0d\x04\0\x0ccomponent-id\x03\0\x02\x01k\x03\x01\
-k\x01\x01o\x03\x04\x05\x05\x01@\0\0\x06\x04\0\x03run\x01\x07\x04\0\x1egolem:it/c\
-omponent-resolve-api\x05\x0e\x04\0\x1agolem:it/component-resolve\x04\0\x0b\x17\x01\
-\0\x11component-resolve\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-c\
-omponent\x070.227.1\x10wit-bindgen-rust\x060.41.0";
+ent\x01d\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
+e\x01k\x03\x01@\x01\x13component-references\0\xe6\0\x04\0\x14resolve-component-i\
+d\x01g\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe8\0\x04\0\x10\
+resolve-agent-id\x01i\x04\0\x17resolve-agent-id-strict\x01i\x01@\0\0\xc2\0\x04\0\
+\x04fork\x01j\x03\0\x14golem:api/host@1.3.0\x05\x0b\x02\x03\0\x04\x08agent-id\x02\
+\x03\0\x04\x0ccomponent-id\x01B\x09\x02\x03\x02\x01\x0c\x04\0\x08agent-id\x03\0\0\
+\x02\x03\x02\x01\x0d\x04\0\x0ccomponent-id\x03\0\x02\x01k\x03\x01k\x01\x01o\x03\x04\
+\x05\x05\x01@\0\0\x06\x04\0\x03run\x01\x07\x04\0\x1egolem:it/component-resolve-a\
+pi\x05\x0e\x04\0\x1agolem:it/component-resolve\x04\0\x0b\x17\x01\0\x11component-\
+resolve\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.22\
+7.1\x10wit-bindgen-rust\x060.41.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {
diff --git a/test-components/counters.wasm b/test-components/counters.wasm
index 1568cb3eac..a2abd64646 100755
Binary files a/test-components/counters.wasm and b/test-components/counters.wasm differ
diff --git a/test-components/custom-durability/Cargo.lock b/test-components/custom-durability/Cargo.lock
index 66f556601a..145b2ecd9b 100644
--- a/test-components/custom-durability/Cargo.lock
+++ b/test-components/custom-durability/Cargo.lock
@@ -29,6 +29,17 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "auditable-serde"
 version = "0.8.0"
@@ -340,19 +351,22 @@ dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasi 0.14.1+wasi-0.2.3",
 ]
 
 [[package]]
 name = "golem-rust"
 version = "0.0.0"
 dependencies = [
+ "async-trait",
  "golem-rust-macro",
  "golem-wasm",
  "serde",
  "serde_json",
  "uuid",
+ "wasi 0.14.1+wasi-0.2.3",
  "wit-bindgen 0.40.0",
+ "wstd",
 ]
 
 [[package]]
@@ -1058,9 +1072,9 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.14.1+wasi-0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "ad7df608df60a1c33e247881838b0f809512086e3e3bb1c18323b77eeb1f844e"
 dependencies = [
  "wit-bindgen-rt 0.39.0",
 ]
@@ -1362,6 +1376,33 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
+[[package]]
+name = "wstd"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f51495e1ae93476d1629b5810bd6068fdf22545a8ada7ea5929e2faed7b793"
+dependencies = [
+ "futures-core",
+ "http",
+ "itoa",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "slab",
+ "wasi 0.14.1+wasi-0.2.3",
+ "wstd-macro",
+]
+
+[[package]]
+name = "wstd-macro"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225ac858e4405bdf164d92d070422c0b3b9b81f9b0b68836841f4d1bafc446b3"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "yoke"
 version = "0.7.5"
diff --git a/test-components/custom_durability.wasm b/test-components/custom_durability.wasm
index 887a40f6bc..75c40e4161 100644
Binary files a/test-components/custom_durability.wasm and b/test-components/custom_durability.wasm differ
diff --git a/test-components/directories.wasm b/test-components/directories.wasm
index 6fbaa29521..bd5f124322 100755
Binary files a/test-components/directories.wasm and b/test-components/directories.wasm differ
diff --git a/test-components/environment-service.wasm b/test-components/environment-service.wasm
index 410168ffd5..8861a7aace 100755
Binary files a/test-components/environment-service.wasm and b/test-components/environment-service.wasm differ
diff --git a/test-components/failing-component.wasm b/test-components/failing-component.wasm
index 62859a3dba..4e00961c88 100755
Binary files a/test-components/failing-component.wasm and b/test-components/failing-component.wasm differ
diff --git a/test-components/file-service.wasm b/test-components/file-service.wasm
index 3641f8157e..ec1b5d6360 100644
Binary files a/test-components/file-service.wasm and b/test-components/file-service.wasm differ
diff --git a/test-components/file-write-read-delete.wasm b/test-components/file-write-read-delete.wasm
index 851fd089cb..a607540b02 100755
Binary files a/test-components/file-write-read-delete.wasm and b/test-components/file-write-read-delete.wasm differ
diff --git a/test-components/flags-service.wasm b/test-components/flags-service.wasm
index 11771ef5fb..e8acd43e7a 100755
Binary files a/test-components/flags-service.wasm and b/test-components/flags-service.wasm differ
diff --git a/test-components/golem-rust-tests.wasm b/test-components/golem-rust-tests.wasm
index 502d76cd66..dbc733c1ca 100644
Binary files a/test-components/golem-rust-tests.wasm and b/test-components/golem-rust-tests.wasm differ
diff --git a/test-components/golem-rust-tests/Cargo.lock b/test-components/golem-rust-tests/Cargo.lock
index 97bdccd5f4..323389bb7e 100644
--- a/test-components/golem-rust-tests/Cargo.lock
+++ b/test-components/golem-rust-tests/Cargo.lock
@@ -29,17 +29,6 @@ version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
 
-[[package]]
-name = "async-trait"
-version = "0.1.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "auditable-serde"
 version = "0.8.0"
@@ -354,7 +343,6 @@ dependencies = [
 name = "golem-rust"
 version = "0.0.0"
 dependencies = [
- "async-trait",
  "golem-rust-macro 0.0.0",
  "golem-wasm",
  "serde",
diff --git a/test-components/golem-rust-tests/src/lib.rs b/test-components/golem-rust-tests/src/lib.rs
index 048ae039df..2db9c3d28e 100644
--- a/test-components/golem-rust-tests/src/lib.rs
+++ b/test-components/golem-rust-tests/src/lib.rs
@@ -145,16 +145,19 @@ impl Guest for Component {
 
         let part1: String = serde_json::from_str(&part1_raw).unwrap();
 
-        let url = match fork("forked-worker") {
-            ForkResult::Original => {
-                format!("http://localhost:{port}/fork-test/step2/{self_name}/original/{input}")
+        let url = match fork() {
+            ForkResult::Original(details) => {
+                let uuid: golem_rust::Uuid = Into::into(details.forked_phantom_id);
+                format!("http://localhost:{port}/fork-test/step2/{self_name}/original/{uuid}")
             }
-            ForkResult::Forked => {
+            ForkResult::Forked(details) => {
                 let self_name = get_self_metadata().agent_id.agent_id;
-                format!("http://localhost:{port}/fork-test/step2/{self_name}/forked/{input}")
+                let uuid: golem_rust::Uuid = Into::into(details.forked_phantom_id);
+                format!("http://localhost:{port}/fork-test/step2/{self_name}/forked/{uuid}")
             }
         };
 
+        println!("Trying to call {url}");
         let response2: Response = client.get(&url).send().expect("Request failed");
         let part2_raw = response2.text().expect("Invalid response");
         println!("Received {part2_raw}");
diff --git a/test-components/golem_ictest.wasm b/test-components/golem_ictest.wasm
index 378c2794e5..9474d356a8 100644
Binary files a/test-components/golem_ictest.wasm and b/test-components/golem_ictest.wasm differ
diff --git a/test-components/golem_it_agent_promise.wasm b/test-components/golem_it_agent_promise.wasm
index 97834112d1..f7e2f8011c 100644
Binary files a/test-components/golem_it_agent_promise.wasm and b/test-components/golem_it_agent_promise.wasm differ
diff --git a/test-components/golem_it_agent_rpc.wasm b/test-components/golem_it_agent_rpc.wasm
index db28079875..167d310934 100644
Binary files a/test-components/golem_it_agent_rpc.wasm and b/test-components/golem_it_agent_rpc.wasm differ
diff --git a/test-components/golem_it_agent_self_rpc.wasm b/test-components/golem_it_agent_self_rpc.wasm
index f18e68249e..f9a1250cde 100644
Binary files a/test-components/golem_it_agent_self_rpc.wasm and b/test-components/golem_it_agent_self_rpc.wasm differ
diff --git a/test-components/golem_it_constructor_parameter_echo.wasm b/test-components/golem_it_constructor_parameter_echo.wasm
index bbfc4b0b7a..6ac2fea35b 100644
Binary files a/test-components/golem_it_constructor_parameter_echo.wasm and b/test-components/golem_it_constructor_parameter_echo.wasm differ
diff --git a/test-components/golem_it_high_volume_logging.wasm b/test-components/golem_it_high_volume_logging.wasm
index 66983ad5dc..344e950071 100644
Binary files a/test-components/golem_it_high_volume_logging.wasm and b/test-components/golem_it_high_volume_logging.wasm differ
diff --git a/test-components/high-volume-logging/Cargo.lock b/test-components/high-volume-logging/Cargo.lock
index b00b29a5c8..3b5c878b2e 100644
--- a/test-components/high-volume-logging/Cargo.lock
+++ b/test-components/high-volume-logging/Cargo.lock
@@ -29,6 +29,17 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "auditable-serde"
 version = "0.8.0"
@@ -348,12 +359,15 @@ dependencies = [
 name = "golem-rust"
 version = "0.0.0"
 dependencies = [
+ "async-trait",
  "golem-rust-macro",
  "golem-wasm",
  "serde",
  "serde_json",
  "uuid",
+ "wasi",
  "wit-bindgen",
+ "wstd",
 ]
 
 [[package]]
@@ -1050,9 +1064,9 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.14.1+wasi-0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "ad7df608df60a1c33e247881838b0f809512086e3e3bb1c18323b77eeb1f844e"
 dependencies = [
  "wit-bindgen-rt 0.39.0",
 ]
@@ -1348,6 +1362,33 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
+[[package]]
+name = "wstd"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f51495e1ae93476d1629b5810bd6068fdf22545a8ada7ea5929e2faed7b793"
+dependencies = [
+ "futures-core",
+ "http",
+ "itoa",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "slab",
+ "wasi",
+ "wstd-macro",
+]
+
+[[package]]
+name = "wstd-macro"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225ac858e4405bdf164d92d070422c0b3b9b81f9b0b68836841f4d1bafc446b3"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "yoke"
 version = "0.8.0"
diff --git a/test-components/http-client-2.wasm b/test-components/http-client-2.wasm
index 2772fdb14d..78b4dc8715 100644
Binary files a/test-components/http-client-2.wasm and b/test-components/http-client-2.wasm differ
diff --git a/test-components/http-client-3.wasm b/test-components/http-client-3.wasm
index 094973e490..09e2d2c833 100644
Binary files a/test-components/http-client-3.wasm and b/test-components/http-client-3.wasm differ
diff --git a/test-components/http-client.wasm b/test-components/http-client.wasm
index 801aa5291d..3fbcdc4003 100755
Binary files a/test-components/http-client.wasm and b/test-components/http-client.wasm differ
diff --git a/test-components/interruption.wasm b/test-components/interruption.wasm
index 097a17f269..fb56bb98b9 100755
Binary files a/test-components/interruption.wasm and b/test-components/interruption.wasm differ
diff --git a/test-components/invocation-context/Cargo.lock b/test-components/invocation-context/Cargo.lock
index 912da43119..ed0aaa2f27 100644
--- a/test-components/invocation-context/Cargo.lock
+++ b/test-components/invocation-context/Cargo.lock
@@ -29,6 +29,17 @@ version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "auditable-serde"
 version = "0.8.0"
@@ -344,12 +355,15 @@ dependencies = [
 name = "golem-rust"
 version = "0.0.0"
 dependencies = [
+ "async-trait",
  "golem-rust-macro",
  "golem-wasm",
  "serde",
  "serde_json",
  "uuid",
+ "wasi 0.14.1+wasi-0.2.3",
  "wit-bindgen 0.40.0",
+ "wstd",
 ]
 
 [[package]]
@@ -1066,6 +1080,15 @@ dependencies = [
  "wit-bindgen-rt 0.33.0",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.14.1+wasi-0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad7df608df60a1c33e247881838b0f809512086e3e3bb1c18323b77eeb1f844e"
+dependencies = [
+ "wit-bindgen-rt 0.39.0",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.100"
@@ -1292,6 +1315,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.40.0"
@@ -1383,6 +1415,33 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
+[[package]]
+name = "wstd"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f51495e1ae93476d1629b5810bd6068fdf22545a8ada7ea5929e2faed7b793"
+dependencies = [
+ "futures-core",
+ "http",
+ "itoa",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "slab",
+ "wasi 0.14.1+wasi-0.2.3",
+ "wstd-macro",
+]
+
+[[package]]
+name = "wstd-macro"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225ac858e4405bdf164d92d070422c0b3b9b81f9b0b68836841f4d1bafc446b3"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "yoke"
 version = "0.7.5"
diff --git a/test-components/it_agent_counters_release.wasm b/test-components/it_agent_counters_release.wasm
index f1a70f1ced..23d8eb8f3c 100644
Binary files a/test-components/it_agent_counters_release.wasm and b/test-components/it_agent_counters_release.wasm differ
diff --git a/test-components/it_scheduled_invocation_client.wasm b/test-components/it_scheduled_invocation_client.wasm
index bbbe1bd72c..7288ddde42 100644
Binary files a/test-components/it_scheduled_invocation_client.wasm and b/test-components/it_scheduled_invocation_client.wasm differ
diff --git a/test-components/it_scheduled_invocation_client_stubless.wasm b/test-components/it_scheduled_invocation_client_stubless.wasm
index e684d81beb..a68f1f49e2 100644
Binary files a/test-components/it_scheduled_invocation_client_stubless.wasm and b/test-components/it_scheduled_invocation_client_stubless.wasm differ
diff --git a/test-components/it_scheduled_invocation_server.wasm b/test-components/it_scheduled_invocation_server.wasm
index d91af98a2f..fe81829a58 100644
Binary files a/test-components/it_scheduled_invocation_server.wasm and b/test-components/it_scheduled_invocation_server.wasm differ
diff --git a/test-components/it_scheduled_invocation_server_stubless.wasm b/test-components/it_scheduled_invocation_server_stubless.wasm
index a0df5eed42..844427190e 100644
Binary files a/test-components/it_scheduled_invocation_server_stubless.wasm and b/test-components/it_scheduled_invocation_server_stubless.wasm differ
diff --git a/test-components/key-value-service.wasm b/test-components/key-value-service.wasm
index 5c1d1f206f..f7d522d78b 100755
Binary files a/test-components/key-value-service.wasm and b/test-components/key-value-service.wasm differ
diff --git a/test-components/logging.wasm b/test-components/logging.wasm
index 739f2cf7bd..1d5a0291aa 100644
Binary files a/test-components/logging.wasm and b/test-components/logging.wasm differ
diff --git a/test-components/logging/Cargo.lock b/test-components/logging/Cargo.lock
index 8937d64596..02b22448c1 100644
--- a/test-components/logging/Cargo.lock
+++ b/test-components/logging/Cargo.lock
@@ -44,6 +44,17 @@ version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -430,7 +441,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasi 0.14.1+wasi-0.2.3",
 ]
 
 [[package]]
@@ -443,12 +454,15 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 name = "golem-rust"
 version = "0.0.0"
 dependencies = [
+ "async-trait",
  "golem-rust-macro",
  "golem-wasm",
  "serde",
  "serde_json",
  "uuid",
+ "wasi 0.14.1+wasi-0.2.3",
  "wit-bindgen 0.40.0",
+ "wstd",
 ]
 
 [[package]]
@@ -1731,9 +1745,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.14.1+wasi-0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "ad7df608df60a1c33e247881838b0f809512086e3e3bb1c18323b77eeb1f844e"
 dependencies = [
  "wit-bindgen-rt 0.39.0",
 ]
@@ -2322,6 +2336,33 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
+[[package]]
+name = "wstd"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f51495e1ae93476d1629b5810bd6068fdf22545a8ada7ea5929e2faed7b793"
+dependencies = [
+ "futures-core",
+ "http",
+ "itoa",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "slab",
+ "wasi 0.14.1+wasi-0.2.3",
+ "wstd-macro",
+]
+
+[[package]]
+name = "wstd-macro"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225ac858e4405bdf164d92d070422c0b3b9b81f9b0b68836841f4d1bafc446b3"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "yoke"
 version = "0.8.0"
diff --git a/test-components/networking.wasm b/test-components/networking.wasm
index dfc4743821..ccbf20ef6e 100755
Binary files a/test-components/networking.wasm and b/test-components/networking.wasm differ
diff --git a/test-components/networking/src/bindings.rs b/test-components/networking/src/bindings.rs
index 4165437253..7fb8637745 100644
--- a/test-components/networking/src/bindings.rs
+++ b/test-components/networking/src/bindings.rs
@@ -588,14 +588,31 @@ pub mod golem {
                     }
                 }
             }
-            /// Indicates which agent the code is running on after `fork`
-            #[repr(u8)]
-            #[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+            /// Details about the fork result
+            #[repr(C)]
+            #[derive(Clone, Copy)]
+            pub struct ForkDetails {
+                pub forked_phantom_id: Uuid,
+            }
+            impl ::core::fmt::Debug for ForkDetails {
+                fn fmt(
+                    &self,
+                    f: &mut ::core::fmt::Formatter<'_>,
+                ) -> ::core::fmt::Result {
+                    f.debug_struct("ForkDetails")
+                        .field("forked-phantom-id", &self.forked_phantom_id)
+                        .finish()
+                }
+            }
+            /// Indicates which agent the code is running on after `fork`.
+            /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+            /// created agent.
+            #[derive(Clone, Copy)]
             pub enum ForkResult {
                 /// The original agent that called `fork`
-                Original,
+                Original(ForkDetails),
                 /// The new agent
-                Forked,
+                Forked(ForkDetails),
             }
             impl ::core::fmt::Debug for ForkResult {
                 fn fmt(
@@ -603,28 +620,15 @@ pub mod golem {
                     f: &mut ::core::fmt::Formatter<'_>,
                 ) -> ::core::fmt::Result {
                     match self {
-                        ForkResult::Original => {
-                            f.debug_tuple("ForkResult::Original").finish()
+                        ForkResult::Original(e) => {
+                            f.debug_tuple("ForkResult::Original").field(e).finish()
                         }
-                        ForkResult::Forked => {
-                            f.debug_tuple("ForkResult::Forked").finish()
+                        ForkResult::Forked(e) => {
+                            f.debug_tuple("ForkResult::Forked").field(e).finish()
                         }
                     }
                 }
             }
-            impl ForkResult {
-                #[doc(hidden)]
-                pub unsafe fn _lift(val: u8) -> ForkResult {
-                    if !cfg!(debug_assertions) {
-                        return ::core::mem::transmute(val);
-                    }
-                    match val {
-                        0 => ForkResult::Original,
-                        1 => ForkResult::Forked,
-                        _ => panic!("invalid enum discriminant"),
-                    }
-                }
-            }
             #[derive(Debug)]
             #[repr(transparent)]
             pub struct GetPromiseResult {
@@ -2502,26 +2506,59 @@ pub mod golem {
                 }
             }
             #[allow(unused_unsafe, clippy::all)]
-            /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-            /// and this agent continues running as well. The return value is going to be different in this agent and
-            /// the forked agent.
-            pub fn fork(new_name: &str) -> ForkResult {
+            /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+            /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+            /// both sides. The newly created agent continues running from the same point, but the return value is
+            /// going to be different in this agent and the forked agent.
+            pub fn fork() -> ForkResult {
                 unsafe {
-                    let vec0 = new_name;
-                    let ptr0 = vec0.as_ptr().cast::<u8>();
-                    let len0 = vec0.len();
+                    #[repr(align(8))]
+                    struct RetArea([::core::mem::MaybeUninit<u8>; 24]);
+                    let mut ret_area = RetArea([::core::mem::MaybeUninit::uninit(); 24]);
+                    let ptr0 = ret_area.0.as_mut_ptr().cast::<u8>();
                     #[cfg(target_arch = "wasm32")]
                     #[link(wasm_import_module = "golem:api/host@1.3.0")]
                     unsafe extern "C" {
                         #[link_name = "fork"]
-                        fn wit_import1(_: *mut u8, _: usize) -> i32;
+                        fn wit_import1(_: *mut u8);
                     }
                     #[cfg(not(target_arch = "wasm32"))]
-                    unsafe extern "C" fn wit_import1(_: *mut u8, _: usize) -> i32 {
+                    unsafe extern "C" fn wit_import1(_: *mut u8) {
                         unreachable!()
                     }
-                    let ret = unsafe { wit_import1(ptr0.cast_mut(), len0) };
-                    ForkResult::_lift(ret as u8)
+                    unsafe { wit_import1(ptr0) };
+                    let l2 = i32::from(*ptr0.add(0).cast::<u8>());
+                    let v7 = match l2 {
+                        0 => {
+                            let e7 = {
+                                let l3 = *ptr0.add(8).cast::<i64>();
+                                let l4 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l3 as u64,
+                                        low_bits: l4 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Original(e7)
+                        }
+                        n => {
+                            debug_assert_eq!(n, 1, "invalid enum discriminant");
+                            let e7 = {
+                                let l5 = *ptr0.add(8).cast::<i64>();
+                                let l6 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l5 as u64,
+                                        low_bits: l6 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Forked(e7)
+                        }
+                    };
+                    let result8 = v7;
+                    result8
                 }
             }
         }
@@ -7086,8 +7123,8 @@ pub(crate) use __export_networking_impl as export;
 )]
 #[doc(hidden)]
 #[allow(clippy::octal_escapes)]
-pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 6585] = *b"\
-\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xb82\x01A\x02\x01A\x1c\
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 6623] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xde2\x01A\x02\x01A\x1c\
 \x01B\x0a\x04\0\x08pollable\x03\x01\x01h\0\x01@\x01\x04self\x01\0\x7f\x04\0\x16[\
 method]pollable.ready\x01\x02\x01@\x01\x04self\x01\x01\0\x04\0\x16[method]pollab\
 le.block\x01\x03\x01p\x01\x01py\x01@\x01\x02in\x04\0\x05\x04\0\x04poll\x01\x06\x03\
@@ -7141,7 +7178,7 @@ ethod]cancellation-token.cancel\x01F\x01j\x01\x05\x01s\x01@\x01\x04uuids\0\xc7\0
 \x04\0\x0aparse-uuid\x01H\x01@\x01\x04uuid\x05\0s\x04\0\x0euuid-to-string\x01I\x03\
 \0\x15golem:rpc/types@0.2.2\x05\x05\x02\x03\0\x01\x08duration\x02\x03\0\x03\x0cc\
 omponent-id\x02\x03\0\x03\x04uuid\x02\x03\0\x03\x0evalue-and-type\x02\x03\0\x03\x08\
-agent-id\x01B\x85\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
+agent-id\x01B\x87\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
 \x07\x04\0\x0ccomponent-id\x03\0\x02\x02\x03\x02\x01\x08\x04\0\x04uuid\x03\0\x04\
 \x02\x03\x02\x01\x09\x04\0\x0evalue-and-type\x03\0\x06\x02\x03\x02\x01\x0a\x04\0\
 \x08agent-id\x03\0\x08\x02\x03\x02\x01\x01\x04\0\x08pollable\x03\0\x0a\x01w\x04\0\
@@ -7169,59 +7206,59 @@ rs4\x04\0\x10agent-any-filter\x03\05\x01ps\x01o\x02ss\x01p8\x01r\x07\x08agent-id
 \x09\x04args7\x03env9\x0bconfig-vars9\x06status\"\x11component-versionw\x0bretry\
 -countw\x04\0\x0eagent-metadata\x03\0:\x04\0\x0aget-agents\x03\x01\x01q\x02\x15r\
 evert-to-oplog-index\x01\x0d\0\x17revert-last-invocations\x01w\0\x04\0\x13revert\
--agent-target\x03\0=\x01m\x02\x08original\x06forked\x04\0\x0bfork-result\x03\0?\x04\
-\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\x06fil\
-ter\xc2\0\x07precise\x7f\0\xc3\0\x04\0\x17[constructor]get-agents\x01D\x01h<\x01\
-p;\x01k\xc6\0\x01@\x01\x04self\xc5\0\0\xc7\0\x04\0\x1b[method]get-agents.get-nex\
-t\x01H\x01hA\x01i\x0b\x01@\x01\x04self\xc9\0\0\xca\0\x04\0$[method]get-promise-r\
-esult.subscribe\x01K\x01p}\x01k\xcc\0\x01@\x01\x04self\xc9\0\0\xcd\0\x04\0\x1e[m\
-ethod]get-promise-result.get\x01N\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01O\x01i\
-A\x01@\x01\x0apromise-id\x0f\0\xd0\0\x04\0\x0bget-promise\x01Q\x01@\x02\x0apromi\
-se-id\x0f\x04data\xcc\0\0\x7f\x04\0\x10complete-promise\x01R\x01@\0\0\x0d\x04\0\x0f\
-get-oplog-index\x01S\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-index\x01\
-T\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01U\x04\0\x14mark-begin-ope\
-ration\x01S\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01V\x01@\0\0\
-\x18\x04\0\x10get-retry-policy\x01W\x01@\x01\x10new-retry-policy\x18\x01\0\x04\0\
-\x10set-retry-policy\x01X\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01Y\
-\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-leve\
-l\x01Z\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01[\x01@\x01\x0aidempotent\x7f\
-\x01\0\x04\0\x14set-idempotence-mode\x01\\\x01@\0\0\x05\x04\0\x18generate-idempo\
-tency-key\x01]\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
-\0\x0cupdate-agent\x01^\x01@\0\0;\x04\0\x11get-self-metadata\x01_\x01k;\x01@\x01\
-\x08agent-id\x09\0\xe0\0\x04\0\x12get-agent-metadata\x01a\x01@\x03\x0fsource-age\
+-agent-target\x03\0=\x01r\x01\x11forked-phantom-id\x05\x04\0\x0cfork-details\x03\
+\0?\x01q\x02\x08original\x01\xc0\0\0\x06forked\x01\xc0\0\0\x04\0\x0bfork-result\x03\
+\0A\x04\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\
+\x06filter\xc4\0\x07precise\x7f\0\xc5\0\x04\0\x17[constructor]get-agents\x01F\x01\
+h<\x01p;\x01k\xc8\0\x01@\x01\x04self\xc7\0\0\xc9\0\x04\0\x1b[method]get-agents.g\
+et-next\x01J\x01hC\x01i\x0b\x01@\x01\x04self\xcb\0\0\xcc\0\x04\0$[method]get-pro\
+mise-result.subscribe\x01M\x01p}\x01k\xce\0\x01@\x01\x04self\xcb\0\0\xcf\0\x04\0\
+\x1e[method]get-promise-result.get\x01P\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01\
+Q\x01iC\x01@\x01\x0apromise-id\x0f\0\xd2\0\x04\0\x0bget-promise\x01S\x01@\x02\x0a\
+promise-id\x0f\x04data\xce\0\0\x7f\x04\0\x10complete-promise\x01T\x01@\0\0\x0d\x04\
+\0\x0fget-oplog-index\x01U\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-in\
+dex\x01V\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01W\x04\0\x14mark-be\
+gin-operation\x01U\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01X\x01\
+@\0\0\x18\x04\0\x10get-retry-policy\x01Y\x01@\x01\x10new-retry-policy\x18\x01\0\x04\
+\0\x10set-retry-policy\x01Z\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01\
+[\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-lev\
+el\x01\\\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01]\x01@\x01\x0aidempotent\x7f\
+\x01\0\x04\0\x14set-idempotence-mode\x01^\x01@\0\0\x05\x04\0\x18generate-idempot\
+ency-key\x01_\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
+\0\x0cupdate-agent\x01`\x01@\0\0;\x04\0\x11get-self-metadata\x01a\x01k;\x01@\x01\
+\x08agent-id\x09\0\xe2\0\x04\0\x12get-agent-metadata\x01c\x01@\x03\x0fsource-age\
 nt-id\x09\x0ftarget-agent-id\x09\x11oplog-idx-cut-off\x0d\x01\0\x04\0\x0afork-ag\
-ent\x01b\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
-c\x01k\x03\x01@\x01\x13component-references\0\xe4\0\x04\0\x14resolve-component-i\
-d\x01e\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe6\0\x04\0\x10\
-resolve-agent-id\x01g\x04\0\x17resolve-agent-id-strict\x01g\x01@\x01\x08new-name\
-s\0\xc0\0\x04\0\x04fork\x01h\x03\0\x14golem:api/host@1.3.0\x05\x0b\x01B\x11\x04\0\
-\x07network\x03\x01\x01m\x15\x07unknown\x0daccess-denied\x0dnot-supported\x10inv\
-alid-argument\x0dout-of-memory\x07timeout\x14concurrency-conflict\x0fnot-in-prog\
-ress\x0bwould-block\x0dinvalid-state\x10new-socket-limit\x14address-not-bindable\
-\x0eaddress-in-use\x12remote-unreachable\x12connection-refused\x10connection-res\
-et\x12connection-aborted\x12datagram-too-large\x11name-unresolvable\x1atemporary\
--resolver-failure\x1apermanent-resolver-failure\x04\0\x0aerror-code\x03\0\x01\x01\
-m\x02\x04ipv4\x04ipv6\x04\0\x11ip-address-family\x03\0\x03\x01o\x04}}}}\x04\0\x0c\
-ipv4-address\x03\0\x05\x01o\x08{{{{{{{{\x04\0\x0cipv6-address\x03\0\x07\x01q\x02\
-\x04ipv4\x01\x06\0\x04ipv6\x01\x08\0\x04\0\x0aip-address\x03\0\x09\x01r\x02\x04p\
-ort{\x07address\x06\x04\0\x13ipv4-socket-address\x03\0\x0b\x01r\x04\x04port{\x09\
-flow-infoy\x07address\x08\x08scope-idy\x04\0\x13ipv6-socket-address\x03\0\x0d\x01\
-q\x02\x04ipv4\x01\x0c\0\x04ipv6\x01\x0e\0\x04\0\x11ip-socket-address\x03\0\x0f\x03\
-\0\x1awasi:sockets/network@0.2.3\x05\x0c\x02\x03\0\x05\x07network\x02\x03\0\x05\x0a\
-error-code\x02\x03\0\x05\x0aip-address\x01B\x16\x02\x03\x02\x01\x01\x04\0\x08pol\
-lable\x03\0\0\x02\x03\x02\x01\x0d\x04\0\x07network\x03\0\x02\x02\x03\x02\x01\x0e\
-\x04\0\x0aerror-code\x03\0\x04\x02\x03\x02\x01\x0f\x04\0\x0aip-address\x03\0\x06\
-\x04\0\x16resolve-address-stream\x03\x01\x01h\x08\x01k\x07\x01j\x01\x0a\x01\x05\x01\
-@\x01\x04self\x09\0\x0b\x04\03[method]resolve-address-stream.resolve-next-addres\
-s\x01\x0c\x01i\x01\x01@\x01\x04self\x09\0\x0d\x04\0([method]resolve-address-stre\
-am.subscribe\x01\x0e\x01h\x03\x01i\x08\x01j\x01\x10\x01\x05\x01@\x02\x07network\x0f\
-\x04names\0\x11\x04\0\x11resolve-addresses\x01\x12\x03\0!wasi:sockets/ip-name-lo\
-okup@0.2.3\x05\x10\x01B\x05\x02\x03\x02\x01\x0d\x04\0\x07network\x03\0\0\x01i\x01\
-\x01@\0\0\x02\x04\0\x10instance-network\x01\x03\x03\0#wasi:sockets/instance-netw\
-ork@0.2.3\x05\x11\x01B\x03\x01ps\x01@\0\0\0\x04\0\x03get\x01\x01\x04\0\x0cgolem:\
-it/api\x05\x12\x04\0\x13golem:it/networking\x04\0\x0b\x10\x01\0\x0anetworking\x03\
-\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-\
-bindgen-rust\x060.41.0";
+ent\x01d\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
+e\x01k\x03\x01@\x01\x13component-references\0\xe6\0\x04\0\x14resolve-component-i\
+d\x01g\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe8\0\x04\0\x10\
+resolve-agent-id\x01i\x04\0\x17resolve-agent-id-strict\x01i\x01@\0\0\xc2\0\x04\0\
+\x04fork\x01j\x03\0\x14golem:api/host@1.3.0\x05\x0b\x01B\x11\x04\0\x07network\x03\
+\x01\x01m\x15\x07unknown\x0daccess-denied\x0dnot-supported\x10invalid-argument\x0d\
+out-of-memory\x07timeout\x14concurrency-conflict\x0fnot-in-progress\x0bwould-blo\
+ck\x0dinvalid-state\x10new-socket-limit\x14address-not-bindable\x0eaddress-in-us\
+e\x12remote-unreachable\x12connection-refused\x10connection-reset\x12connection-\
+aborted\x12datagram-too-large\x11name-unresolvable\x1atemporary-resolver-failure\
+\x1apermanent-resolver-failure\x04\0\x0aerror-code\x03\0\x01\x01m\x02\x04ipv4\x04\
+ipv6\x04\0\x11ip-address-family\x03\0\x03\x01o\x04}}}}\x04\0\x0cipv4-address\x03\
+\0\x05\x01o\x08{{{{{{{{\x04\0\x0cipv6-address\x03\0\x07\x01q\x02\x04ipv4\x01\x06\
+\0\x04ipv6\x01\x08\0\x04\0\x0aip-address\x03\0\x09\x01r\x02\x04port{\x07address\x06\
+\x04\0\x13ipv4-socket-address\x03\0\x0b\x01r\x04\x04port{\x09flow-infoy\x07addre\
+ss\x08\x08scope-idy\x04\0\x13ipv6-socket-address\x03\0\x0d\x01q\x02\x04ipv4\x01\x0c\
+\0\x04ipv6\x01\x0e\0\x04\0\x11ip-socket-address\x03\0\x0f\x03\0\x1awasi:sockets/\
+network@0.2.3\x05\x0c\x02\x03\0\x05\x07network\x02\x03\0\x05\x0aerror-code\x02\x03\
+\0\x05\x0aip-address\x01B\x16\x02\x03\x02\x01\x01\x04\0\x08pollable\x03\0\0\x02\x03\
+\x02\x01\x0d\x04\0\x07network\x03\0\x02\x02\x03\x02\x01\x0e\x04\0\x0aerror-code\x03\
+\0\x04\x02\x03\x02\x01\x0f\x04\0\x0aip-address\x03\0\x06\x04\0\x16resolve-addres\
+s-stream\x03\x01\x01h\x08\x01k\x07\x01j\x01\x0a\x01\x05\x01@\x01\x04self\x09\0\x0b\
+\x04\03[method]resolve-address-stream.resolve-next-address\x01\x0c\x01i\x01\x01@\
+\x01\x04self\x09\0\x0d\x04\0([method]resolve-address-stream.subscribe\x01\x0e\x01\
+h\x03\x01i\x08\x01j\x01\x10\x01\x05\x01@\x02\x07network\x0f\x04names\0\x11\x04\0\
+\x11resolve-addresses\x01\x12\x03\0!wasi:sockets/ip-name-lookup@0.2.3\x05\x10\x01\
+B\x05\x02\x03\x02\x01\x0d\x04\0\x07network\x03\0\0\x01i\x01\x01@\0\0\x02\x04\0\x10\
+instance-network\x01\x03\x03\0#wasi:sockets/instance-network@0.2.3\x05\x11\x01B\x03\
+\x01ps\x01@\0\0\0\x04\0\x03get\x01\x01\x04\0\x0cgolem:it/api\x05\x12\x04\0\x13go\
+lem:it/networking\x04\0\x0b\x10\x01\0\x0anetworking\x03\0\0\0G\x09producers\x01\x0c\
+processed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rust\x060.41.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {
diff --git a/test-components/oplog-processor.wasm b/test-components/oplog-processor.wasm
index d5b68c0df0..c7a8b0b0e3 100644
Binary files a/test-components/oplog-processor.wasm and b/test-components/oplog-processor.wasm differ
diff --git a/test-components/oplog-processor/src/bindings.rs b/test-components/oplog-processor/src/bindings.rs
index 34198dad21..7264050d50 100644
--- a/test-components/oplog-processor/src/bindings.rs
+++ b/test-components/oplog-processor/src/bindings.rs
@@ -615,14 +615,31 @@ pub mod golem {
                     }
                 }
             }
-            /// Indicates which agent the code is running on after `fork`
-            #[repr(u8)]
-            #[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+            /// Details about the fork result
+            #[repr(C)]
+            #[derive(Clone, Copy)]
+            pub struct ForkDetails {
+                pub forked_phantom_id: Uuid,
+            }
+            impl ::core::fmt::Debug for ForkDetails {
+                fn fmt(
+                    &self,
+                    f: &mut ::core::fmt::Formatter<'_>,
+                ) -> ::core::fmt::Result {
+                    f.debug_struct("ForkDetails")
+                        .field("forked-phantom-id", &self.forked_phantom_id)
+                        .finish()
+                }
+            }
+            /// Indicates which agent the code is running on after `fork`.
+            /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+            /// created agent.
+            #[derive(Clone, Copy)]
             pub enum ForkResult {
                 /// The original agent that called `fork`
-                Original,
+                Original(ForkDetails),
                 /// The new agent
-                Forked,
+                Forked(ForkDetails),
             }
             impl ::core::fmt::Debug for ForkResult {
                 fn fmt(
@@ -630,28 +647,15 @@ pub mod golem {
                     f: &mut ::core::fmt::Formatter<'_>,
                 ) -> ::core::fmt::Result {
                     match self {
-                        ForkResult::Original => {
-                            f.debug_tuple("ForkResult::Original").finish()
+                        ForkResult::Original(e) => {
+                            f.debug_tuple("ForkResult::Original").field(e).finish()
                         }
-                        ForkResult::Forked => {
-                            f.debug_tuple("ForkResult::Forked").finish()
+                        ForkResult::Forked(e) => {
+                            f.debug_tuple("ForkResult::Forked").field(e).finish()
                         }
                     }
                 }
             }
-            impl ForkResult {
-                #[doc(hidden)]
-                pub unsafe fn _lift(val: u8) -> ForkResult {
-                    if !cfg!(debug_assertions) {
-                        return ::core::mem::transmute(val);
-                    }
-                    match val {
-                        0 => ForkResult::Original,
-                        1 => ForkResult::Forked,
-                        _ => panic!("invalid enum discriminant"),
-                    }
-                }
-            }
             #[derive(Debug)]
             #[repr(transparent)]
             pub struct GetPromiseResult {
@@ -2529,26 +2533,59 @@ pub mod golem {
                 }
             }
             #[allow(unused_unsafe, clippy::all)]
-            /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-            /// and this agent continues running as well. The return value is going to be different in this agent and
-            /// the forked agent.
-            pub fn fork(new_name: &str) -> ForkResult {
+            /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+            /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+            /// both sides. The newly created agent continues running from the same point, but the return value is
+            /// going to be different in this agent and the forked agent.
+            pub fn fork() -> ForkResult {
                 unsafe {
-                    let vec0 = new_name;
-                    let ptr0 = vec0.as_ptr().cast::<u8>();
-                    let len0 = vec0.len();
+                    #[repr(align(8))]
+                    struct RetArea([::core::mem::MaybeUninit<u8>; 24]);
+                    let mut ret_area = RetArea([::core::mem::MaybeUninit::uninit(); 24]);
+                    let ptr0 = ret_area.0.as_mut_ptr().cast::<u8>();
                     #[cfg(target_arch = "wasm32")]
                     #[link(wasm_import_module = "golem:api/host@1.3.0")]
                     unsafe extern "C" {
                         #[link_name = "fork"]
-                        fn wit_import1(_: *mut u8, _: usize) -> i32;
+                        fn wit_import1(_: *mut u8);
                     }
                     #[cfg(not(target_arch = "wasm32"))]
-                    unsafe extern "C" fn wit_import1(_: *mut u8, _: usize) -> i32 {
+                    unsafe extern "C" fn wit_import1(_: *mut u8) {
                         unreachable!()
                     }
-                    let ret = unsafe { wit_import1(ptr0.cast_mut(), len0) };
-                    ForkResult::_lift(ret as u8)
+                    unsafe { wit_import1(ptr0) };
+                    let l2 = i32::from(*ptr0.add(0).cast::<u8>());
+                    let v7 = match l2 {
+                        0 => {
+                            let e7 = {
+                                let l3 = *ptr0.add(8).cast::<i64>();
+                                let l4 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l3 as u64,
+                                        low_bits: l4 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Original(e7)
+                        }
+                        n => {
+                            debug_assert_eq!(n, 1, "invalid enum discriminant");
+                            let e7 = {
+                                let l5 = *ptr0.add(8).cast::<i64>();
+                                let l6 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l5 as u64,
+                                        low_bits: l6 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Forked(e7)
+                        }
+                    };
+                    let result8 = v7;
+                    result8
                 }
             }
         }
@@ -25931,8 +25968,8 @@ pub(crate) use __export_oplog_processor_impl as export;
 )]
 #[doc(hidden)]
 #[allow(clippy::octal_escapes)]
-pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 11346] = *b"\
-\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xccW\x01A\x02\x01A(\x01\
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 11384] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xf2W\x01A\x02\x01A(\x01\
 B\x05\x01r\x02\x07secondsw\x0bnanosecondsy\x04\0\x08datetime\x03\0\0\x01@\0\0\x01\
 \x04\0\x03now\x01\x02\x04\0\x0aresolution\x01\x02\x03\0\x1cwasi:clocks/wall-cloc\
 k@0.2.3\x05\0\x01B\x0a\x04\0\x08pollable\x03\x01\x01h\0\x01@\x01\x04self\x01\0\x7f\
@@ -25986,7 +26023,7 @@ on\x01\x07\x01i\x01\x01@\x01\x04when\x03\0\x08\x04\0\x11subscribe-instant\x01\x0
 \x01@\x01\x04when\x05\0\x08\x04\0\x12subscribe-duration\x01\x0a\x03\0!wasi:clock\
 s/monotonic-clock@0.2.3\x05\x05\x02\x03\0\x03\x08duration\x02\x03\0\x02\x0ccompo\
 nent-id\x02\x03\0\x02\x04uuid\x02\x03\0\x02\x0evalue-and-type\x02\x03\0\x02\x08a\
-gent-id\x01B\x85\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
+gent-id\x01B\x87\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
 \x07\x04\0\x0ccomponent-id\x03\0\x02\x02\x03\x02\x01\x08\x04\0\x04uuid\x03\0\x04\
 \x02\x03\x02\x01\x09\x04\0\x0evalue-and-type\x03\0\x06\x02\x03\x02\x01\x0a\x04\0\
 \x08agent-id\x03\0\x08\x02\x03\x02\x01\x03\x04\0\x08pollable\x03\0\x0a\x01w\x04\0\
@@ -26014,154 +26051,155 @@ rs4\x04\0\x10agent-any-filter\x03\05\x01ps\x01o\x02ss\x01p8\x01r\x07\x08agent-id
 \x09\x04args7\x03env9\x0bconfig-vars9\x06status\"\x11component-versionw\x0bretry\
 -countw\x04\0\x0eagent-metadata\x03\0:\x04\0\x0aget-agents\x03\x01\x01q\x02\x15r\
 evert-to-oplog-index\x01\x0d\0\x17revert-last-invocations\x01w\0\x04\0\x13revert\
--agent-target\x03\0=\x01m\x02\x08original\x06forked\x04\0\x0bfork-result\x03\0?\x04\
-\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\x06fil\
-ter\xc2\0\x07precise\x7f\0\xc3\0\x04\0\x17[constructor]get-agents\x01D\x01h<\x01\
-p;\x01k\xc6\0\x01@\x01\x04self\xc5\0\0\xc7\0\x04\0\x1b[method]get-agents.get-nex\
-t\x01H\x01hA\x01i\x0b\x01@\x01\x04self\xc9\0\0\xca\0\x04\0$[method]get-promise-r\
-esult.subscribe\x01K\x01p}\x01k\xcc\0\x01@\x01\x04self\xc9\0\0\xcd\0\x04\0\x1e[m\
-ethod]get-promise-result.get\x01N\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01O\x01i\
-A\x01@\x01\x0apromise-id\x0f\0\xd0\0\x04\0\x0bget-promise\x01Q\x01@\x02\x0apromi\
-se-id\x0f\x04data\xcc\0\0\x7f\x04\0\x10complete-promise\x01R\x01@\0\0\x0d\x04\0\x0f\
-get-oplog-index\x01S\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-index\x01\
-T\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01U\x04\0\x14mark-begin-ope\
-ration\x01S\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01V\x01@\0\0\
-\x18\x04\0\x10get-retry-policy\x01W\x01@\x01\x10new-retry-policy\x18\x01\0\x04\0\
-\x10set-retry-policy\x01X\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01Y\
-\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-leve\
-l\x01Z\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01[\x01@\x01\x0aidempotent\x7f\
-\x01\0\x04\0\x14set-idempotence-mode\x01\\\x01@\0\0\x05\x04\0\x18generate-idempo\
-tency-key\x01]\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
-\0\x0cupdate-agent\x01^\x01@\0\0;\x04\0\x11get-self-metadata\x01_\x01k;\x01@\x01\
-\x08agent-id\x09\0\xe0\0\x04\0\x12get-agent-metadata\x01a\x01@\x03\x0fsource-age\
+-agent-target\x03\0=\x01r\x01\x11forked-phantom-id\x05\x04\0\x0cfork-details\x03\
+\0?\x01q\x02\x08original\x01\xc0\0\0\x06forked\x01\xc0\0\0\x04\0\x0bfork-result\x03\
+\0A\x04\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\
+\x06filter\xc4\0\x07precise\x7f\0\xc5\0\x04\0\x17[constructor]get-agents\x01F\x01\
+h<\x01p;\x01k\xc8\0\x01@\x01\x04self\xc7\0\0\xc9\0\x04\0\x1b[method]get-agents.g\
+et-next\x01J\x01hC\x01i\x0b\x01@\x01\x04self\xcb\0\0\xcc\0\x04\0$[method]get-pro\
+mise-result.subscribe\x01M\x01p}\x01k\xce\0\x01@\x01\x04self\xcb\0\0\xcf\0\x04\0\
+\x1e[method]get-promise-result.get\x01P\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01\
+Q\x01iC\x01@\x01\x0apromise-id\x0f\0\xd2\0\x04\0\x0bget-promise\x01S\x01@\x02\x0a\
+promise-id\x0f\x04data\xce\0\0\x7f\x04\0\x10complete-promise\x01T\x01@\0\0\x0d\x04\
+\0\x0fget-oplog-index\x01U\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-in\
+dex\x01V\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01W\x04\0\x14mark-be\
+gin-operation\x01U\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01X\x01\
+@\0\0\x18\x04\0\x10get-retry-policy\x01Y\x01@\x01\x10new-retry-policy\x18\x01\0\x04\
+\0\x10set-retry-policy\x01Z\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01\
+[\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-lev\
+el\x01\\\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01]\x01@\x01\x0aidempotent\x7f\
+\x01\0\x04\0\x14set-idempotence-mode\x01^\x01@\0\0\x05\x04\0\x18generate-idempot\
+ency-key\x01_\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
+\0\x0cupdate-agent\x01`\x01@\0\0;\x04\0\x11get-self-metadata\x01a\x01k;\x01@\x01\
+\x08agent-id\x09\0\xe2\0\x04\0\x12get-agent-metadata\x01c\x01@\x03\x0fsource-age\
 nt-id\x09\x0ftarget-agent-id\x09\x11oplog-idx-cut-off\x0d\x01\0\x04\0\x0afork-ag\
-ent\x01b\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
-c\x01k\x03\x01@\x01\x13component-references\0\xe4\0\x04\0\x14resolve-component-i\
-d\x01e\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe6\0\x04\0\x10\
-resolve-agent-id\x01g\x04\0\x17resolve-agent-id-strict\x01g\x01@\x01\x08new-name\
-s\0\xc0\0\x04\0\x04fork\x01h\x03\0\x14golem:api/host@1.3.0\x05\x0b\x01B7\x02\x03\
-\x02\x01\x02\x04\0\x08datetime\x03\0\0\x04\0\x04span\x03\x01\x04\0\x12invocation\
--context\x03\x01\x01q\x01\x06string\x01s\0\x04\0\x0fattribute-value\x03\0\x04\x01\
-r\x02\x03keys\x05value\x05\x04\0\x09attribute\x03\0\x06\x01p\x05\x01r\x02\x03key\
-s\x06values\x08\x04\0\x0fattribute-chain\x03\0\x09\x01s\x04\0\x08trace-id\x03\0\x0b\
-\x01s\x04\0\x07span-id\x03\0\x0d\x01h\x02\x01@\x01\x04self\x0f\0\x01\x04\0\x17[m\
-ethod]span.started-at\x01\x10\x01@\x03\x04self\x0f\x04names\x05value\x05\x01\0\x04\
-\0\x1a[method]span.set-attribute\x01\x11\x01p\x07\x01@\x02\x04self\x0f\x0aattrib\
-utes\x12\x01\0\x04\0\x1b[method]span.set-attributes\x01\x13\x01@\x01\x04self\x0f\
-\x01\0\x04\0\x13[method]span.finish\x01\x14\x01h\x03\x01@\x01\x04self\x15\0\x0c\x04\
-\0#[method]invocation-context.trace-id\x01\x16\x01@\x01\x04self\x15\0\x0e\x04\0\"\
-[method]invocation-context.span-id\x01\x17\x01i\x03\x01k\x18\x01@\x01\x04self\x15\
-\0\x19\x04\0![method]invocation-context.parent\x01\x1a\x01k\x05\x01@\x03\x04self\
-\x15\x03keys\x09inherited\x7f\0\x1b\x04\0([method]invocation-context.get-attribu\
-te\x01\x1c\x01@\x02\x04self\x15\x09inherited\x7f\0\x12\x04\0)[method]invocation-\
-context.get-attributes\x01\x1d\x01@\x02\x04self\x15\x03keys\0\x08\x04\0.[method]\
-invocation-context.get-attribute-chain\x01\x1e\x01p\x0a\x01@\x01\x04self\x15\0\x1f\
-\x04\0/[method]invocation-context.get-attribute-chains\x01\x20\x01o\x02ss\x01p!\x01\
-@\x01\x04self\x15\0\"\x04\00[method]invocation-context.trace-context-headers\x01\
-#\x01i\x02\x01@\x01\x04names\0$\x04\0\x0astart-span\x01%\x01@\0\0\x18\x04\0\x0fc\
-urrent-context\x01&\x01@\x01\x05allow\x7f\0\x7f\x04\0&allow-forwarding-trace-con\
-text-headers\x01'\x03\0\x17golem:api/context@1.3.0\x05\x0c\x02\x03\0\x04\x0aacco\
-unt-id\x02\x03\0\x04\x11component-version\x02\x03\0\x04\x0boplog-index\x02\x03\0\
-\x04\x11persistence-level\x02\x03\0\x04\x0aproject-id\x02\x03\0\x04\x0cretry-pol\
-icy\x02\x03\0\x04\x04uuid\x02\x03\0\x04\x08agent-id\x02\x03\0\x05\x09attribute\x02\
-\x03\0\x05\x0fattribute-value\x02\x03\0\x05\x07span-id\x02\x03\0\x05\x08trace-id\
-\x01B\x8f\x01\x02\x03\x02\x01\x02\x04\0\x08datetime\x03\0\0\x02\x03\x02\x01\x09\x04\
-\0\x0evalue-and-type\x03\0\x02\x02\x03\x02\x01\x0d\x04\0\x0aaccount-id\x03\0\x04\
-\x02\x03\x02\x01\x0e\x04\0\x11component-version\x03\0\x06\x02\x03\x02\x01\x0f\x04\
-\0\x0boplog-index\x03\0\x08\x02\x03\x02\x01\x10\x04\0\x11persistence-level\x03\0\
-\x0a\x02\x03\x02\x01\x11\x04\0\x0aproject-id\x03\0\x0c\x02\x03\x02\x01\x12\x04\0\
-\x0cretry-policy\x03\0\x0e\x02\x03\x02\x01\x13\x04\0\x04uuid\x03\0\x10\x02\x03\x02\
-\x01\x14\x04\0\x08agent-id\x03\0\x12\x02\x03\x02\x01\x15\x04\0\x09attribute\x03\0\
-\x14\x02\x03\x02\x01\x16\x04\0\x0fattribute-value\x03\0\x16\x02\x03\x02\x01\x17\x04\
-\0\x07span-id\x03\0\x18\x02\x03\x02\x01\x18\x04\0\x08trace-id\x03\0\x1a\x01k\x09\
-\x01q\x06\x0aread-local\0\0\x0bwrite-local\0\0\x0bread-remote\0\0\x0cwrite-remot\
-e\0\0\x14write-remote-batched\x01\x1c\0\x18write-remote-transaction\x01\x1c\0\x04\
-\0\x15wrapped-function-type\x03\0\x1d\x01o\x02ss\x01p\x1f\x01r\x04\x0finstallati\
-on-id\x11\x04names\x07versions\x0aparameters\x20\x04\0\x1fplugin-installation-de\
-scription\x03\0!\x01ps\x01k\x13\x01p\"\x01r\x0c\x09timestamp\x01\x08agent-id\x13\
-\x11component-version\x07\x04args#\x03env\x20\x0acreated-by\x05\x0aproject-id\x0d\
-\x06parent$\x0ecomponent-sizew\x20initial-total-linear-memory-sizew\x16initial-a\
-ctive-plugins%\x0bconfig-vars\x20\x04\0\x11create-parameters\x03\0&\x01r\x05\x09\
-timestamp\x01\x0dfunction-names\x07request\x03\x08response\x03\x15wrapped-functi\
-on-type\x1e\x04\0$imported-function-invoked-parameters\x03\0(\x01k\x19\x01kw\x01\
-p\x15\x01r\x06\x07span-id\x19\x05start\x01\x06parent*\x0elinked-context+\x0aattr\
-ibutes,\x09inherited\x7f\x04\0\x0flocal-span-data\x03\0-\x01r\x01\x07span-id\x19\
-\x04\0\x12external-span-data\x03\0/\x01q\x02\x0alocal-span\x01.\0\x0dexternal-sp\
-an\x010\0\x04\0\x09span-data\x03\01\x01p\x03\x01p2\x01p4\x01r\x07\x09timestamp\x01\
-\x0dfunction-names\x07request3\x0fidempotency-keys\x08trace-id\x1b\x0ctrace-stat\
-es#\x12invocation-context5\x04\0$exported-function-invoked-parameters\x03\06\x01\
-k\x03\x01r\x03\x09timestamp\x01\x08response8\x0dconsumed-fuelx\x04\0&exported-fu\
-nction-completed-parameters\x03\09\x01r\x03\x09timestamp\x01\x05errors\x0aretry-\
-from\x09\x04\0\x10error-parameters\x03\0;\x01r\x02\x05start\x09\x03end\x09\x04\0\
-\x0coplog-region\x03\0=\x01r\x02\x09timestamp\x01\x04jump>\x04\0\x0fjump-paramet\
-ers\x03\0?\x01r\x02\x09timestamp\x01\x0anew-policy\x0f\x04\0\x1echange-retry-pol\
-icy-parameters\x03\0A\x01r\x02\x09timestamp\x01\x0bbegin-index\x09\x04\0\x1cend-\
-atomic-region-parameters\x03\0C\x01r\x02\x09timestamp\x01\x0bbegin-index\x09\x04\
-\0\x1bend-remote-write-parameters\x03\0E\x01k3\x01r\x06\x0fidempotency-keys\x0df\
-unction-names\x05input\xc7\0\x08trace-ids\x0ctrace-states#\x12invocation-context\
-5\x04\0'exported-function-invocation-parameters\x03\0H\x01q\x02\x11exported-func\
-tion\x01\xc9\0\0\x0dmanual-update\x01\x07\0\x04\0\x10agent-invocation\x03\0J\x01\
-r\x02\x09timestamp\x01\x0ainvocation\xcb\0\x04\0#pending-agent-invocation-parame\
-ters\x03\0L\x01p}\x01q\x02\x0bauto-update\0\0\x0esnapshot-based\x01\xce\0\0\x04\0\
-\x12update-description\x03\0O\x01r\x03\x09timestamp\x01\x0etarget-version\x07\x12\
-update-description\xd0\0\x04\0\x19pending-update-parameters\x03\0Q\x01r\x04\x09t\
-imestamp\x01\x0etarget-version\x07\x12new-component-sizew\x12new-active-plugins%\
-\x04\0\x1csuccessful-update-parameters\x03\0S\x01ks\x01r\x03\x09timestamp\x01\x0e\
-target-version\x07\x07details\xd5\0\x04\0\x18failed-update-parameters\x03\0V\x01\
-r\x02\x09timestamp\x01\x05deltaw\x04\0\x16grow-memory-parameters\x03\0X\x01w\x04\
-\0\x11agent-resource-id\x03\0Z\x01r\x04\x09timestamp\x01\x0bresource-id\xdb\0\x04\
-names\x05owners\x04\0\x1acreate-resource-parameters\x03\0\\\x01r\x04\x09timestam\
-p\x01\x0bresource-id\xdb\0\x04names\x05owners\x04\0\x18drop-resource-parameters\x03\
-\0^\x01m\x08\x06stdout\x06stderr\x05trace\x05debug\x04info\x04warn\x05error\x08c\
-ritical\x04\0\x09log-level\x03\0`\x01r\x04\x09timestamp\x01\x05level\xe1\0\x07co\
-ntexts\x07messages\x04\0\x0elog-parameters\x03\0b\x01r\x02\x09timestamp\x01\x06p\
-lugin\"\x04\0\x1aactivate-plugin-parameters\x03\0d\x01r\x02\x09timestamp\x01\x06\
-plugin\"\x04\0\x1cdeactivate-plugin-parameters\x03\0f\x01r\x03\x09timestamp\x01\x05\
-start\x09\x03end\x09\x04\0\x11revert-parameters\x03\0h\x01r\x02\x09timestamp\x01\
-\x0fidempotency-keys\x04\0\x1ccancel-invocation-parameters\x03\0j\x01r\x05\x09ti\
-mestamp\x01\x07span-id\x19\x06parent*\x0elinked-context*\x0aattributes,\x04\0\x15\
-start-span-parameters\x03\0l\x01r\x02\x09timestamp\x01\x07span-id\x19\x04\0\x16f\
-inish-span-parameters\x03\0n\x01r\x04\x09timestamp\x01\x07span-id\x19\x03keys\x05\
-value\x17\x04\0\x1dset-span-attribute-parameters\x03\0p\x01r\x02\x09timestamp\x01\
-\x11persistence-level\x0b\x04\0#change-persistence-level-parameters\x03\0r\x01r\x02\
-\x09timestamp\x01\x0etransaction-ids\x04\0#begin-remote-transaction-parameters\x03\
-\0t\x01r\x02\x09timestamp\x01\x0bbegin-index\x09\x04\0\x1dremote-transaction-par\
-ameters\x03\0v\x01r\x01\x09timestamp\x01\x04\0\x09timestamp\x03\0x\x01q%\x06crea\
-te\x01'\0\x19imported-function-invoked\x01)\0\x19exported-function-invoked\x017\0\
-\x1bexported-function-completed\x01:\0\x07suspend\x01\xf9\0\0\x05error\x01<\0\x05\
-no-op\x01\xf9\0\0\x04jump\x01\xc0\0\0\x0binterrupted\x01\xf9\0\0\x06exited\x01\xf9\
-\0\0\x13change-retry-policy\x01\xc2\0\0\x13begin-atomic-region\x01\xf9\0\0\x11en\
-d-atomic-region\x01\xc4\0\0\x12begin-remote-write\x01\xf9\0\0\x10end-remote-writ\
-e\x01\xc6\0\0\x18pending-agent-invocation\x01\xcd\0\0\x0epending-update\x01\xd2\0\
-\0\x11successful-update\x01\xd4\0\0\x0dfailed-update\x01\xd7\0\0\x0bgrow-memory\x01\
-\xd9\0\0\x0fcreate-resource\x01\xdd\0\0\x0ddrop-resource\x01\xdf\0\0\x03log\x01\xe3\
-\0\0\x07restart\x01\xf9\0\0\x0factivate-plugin\x01\xe5\0\0\x11deactivate-plugin\x01\
-\xe7\0\0\x06revert\x01\xe9\0\0\x11cancel-invocation\x01\xeb\0\0\x0astart-span\x01\
-\xed\0\0\x0bfinish-span\x01\xef\0\0\x12set-span-attribute\x01\xf1\0\0\x18change-\
-persistence-level\x01\xf3\0\0\x18begin-remote-transaction\x01\xf5\0\0\x1dpre-com\
-mit-remote-transaction\x01\xf7\0\0\x1fpre-rollback-remote-transaction\x01\xf7\0\0\
-\x1ccommitted-remote-transaction\x01\xf7\0\0\x1erolled-back-remote-transaction\x01\
-\xf7\0\0\x04\0\x0boplog-entry\x03\0z\x04\0\x09get-oplog\x03\x01\x04\0\x0csearch-\
-oplog\x03\x01\x01i|\x01@\x02\x08agent-id\x13\x05start\x09\0\xfe\0\x04\0\x16[cons\
-tructor]get-oplog\x01\x7f\x01h|\x01p\xfb\0\x01k\x81\x01\x01@\x01\x04self\x80\x01\
-\0\x82\x01\x04\0\x1a[method]get-oplog.get-next\x01\x83\x01\x01i}\x01@\x02\x08age\
-nt-id\x13\x04texts\0\x84\x01\x04\0\x19[constructor]search-oplog\x01\x85\x01\x01h\
-}\x01o\x02\x09\xfb\0\x01p\x87\x01\x01k\x88\x01\x01@\x01\x04self\x86\x01\0\x89\x01\
-\x04\0\x1d[method]search-oplog.get-next\x01\x8a\x01\x03\0\x15golem:api/oplog@1.3\
-.0\x05\x19\x01B\x03\x01ps\x01@\0\0\0\x04\0\x15get-invoked-functions\x01\x01\x04\0\
-\x13golem:component/api\x05\x1a\x02\x03\0\x02\x09wit-value\x02\x03\0\x04\x0eagen\
-t-metadata\x02\x03\0\x06\x0boplog-entry\x01B\x18\x02\x03\x02\x01\x02\x04\0\x08da\
-tetime\x03\0\0\x02\x03\x02\x01\x1b\x04\0\x09wit-value\x03\0\x02\x02\x03\x02\x01\x0d\
-\x04\0\x0aaccount-id\x03\0\x04\x02\x03\x02\x01\x0f\x04\0\x0boplog-index\x03\0\x06\
-\x02\x03\x02\x01\x1c\x04\0\x0eagent-metadata\x03\0\x08\x02\x03\x02\x01\x1d\x04\0\
-\x0boplog-entry\x03\0\x0a\x02\x03\x02\x01\x07\x04\0\x0ccomponent-id\x03\0\x0c\x02\
-\x03\x02\x01\x0a\x04\0\x08agent-id\x03\0\x0e\x01r\x01\x0aaccount-id\x05\x04\0\x0c\
-account-info\x03\0\x10\x01o\x02ss\x01p\x12\x01p\x0b\x01j\0\x01s\x01@\x07\x0cacco\
-unt-info\x11\x06config\x13\x0ccomponent-id\x0d\x08agent-id\x0f\x08metadata\x09\x11\
-first-entry-index\x07\x07entries\x14\0\x15\x04\0\x07process\x01\x16\x04\0\x1fgol\
-em:api/oplog-processor@1.3.0\x05\x1e\x04\0\x1fgolem:component/oplog-processor\x04\
-\0\x0b\x15\x01\0\x0foplog-processor\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\
-\x0dwit-component\x070.227.1\x10wit-bindgen-rust\x060.41.0";
+ent\x01d\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
+e\x01k\x03\x01@\x01\x13component-references\0\xe6\0\x04\0\x14resolve-component-i\
+d\x01g\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe8\0\x04\0\x10\
+resolve-agent-id\x01i\x04\0\x17resolve-agent-id-strict\x01i\x01@\0\0\xc2\0\x04\0\
+\x04fork\x01j\x03\0\x14golem:api/host@1.3.0\x05\x0b\x01B7\x02\x03\x02\x01\x02\x04\
+\0\x08datetime\x03\0\0\x04\0\x04span\x03\x01\x04\0\x12invocation-context\x03\x01\
+\x01q\x01\x06string\x01s\0\x04\0\x0fattribute-value\x03\0\x04\x01r\x02\x03keys\x05\
+value\x05\x04\0\x09attribute\x03\0\x06\x01p\x05\x01r\x02\x03keys\x06values\x08\x04\
+\0\x0fattribute-chain\x03\0\x09\x01s\x04\0\x08trace-id\x03\0\x0b\x01s\x04\0\x07s\
+pan-id\x03\0\x0d\x01h\x02\x01@\x01\x04self\x0f\0\x01\x04\0\x17[method]span.start\
+ed-at\x01\x10\x01@\x03\x04self\x0f\x04names\x05value\x05\x01\0\x04\0\x1a[method]\
+span.set-attribute\x01\x11\x01p\x07\x01@\x02\x04self\x0f\x0aattributes\x12\x01\0\
+\x04\0\x1b[method]span.set-attributes\x01\x13\x01@\x01\x04self\x0f\x01\0\x04\0\x13\
+[method]span.finish\x01\x14\x01h\x03\x01@\x01\x04self\x15\0\x0c\x04\0#[method]in\
+vocation-context.trace-id\x01\x16\x01@\x01\x04self\x15\0\x0e\x04\0\"[method]invo\
+cation-context.span-id\x01\x17\x01i\x03\x01k\x18\x01@\x01\x04self\x15\0\x19\x04\0\
+![method]invocation-context.parent\x01\x1a\x01k\x05\x01@\x03\x04self\x15\x03keys\
+\x09inherited\x7f\0\x1b\x04\0([method]invocation-context.get-attribute\x01\x1c\x01\
+@\x02\x04self\x15\x09inherited\x7f\0\x12\x04\0)[method]invocation-context.get-at\
+tributes\x01\x1d\x01@\x02\x04self\x15\x03keys\0\x08\x04\0.[method]invocation-con\
+text.get-attribute-chain\x01\x1e\x01p\x0a\x01@\x01\x04self\x15\0\x1f\x04\0/[meth\
+od]invocation-context.get-attribute-chains\x01\x20\x01o\x02ss\x01p!\x01@\x01\x04\
+self\x15\0\"\x04\00[method]invocation-context.trace-context-headers\x01#\x01i\x02\
+\x01@\x01\x04names\0$\x04\0\x0astart-span\x01%\x01@\0\0\x18\x04\0\x0fcurrent-con\
+text\x01&\x01@\x01\x05allow\x7f\0\x7f\x04\0&allow-forwarding-trace-context-heade\
+rs\x01'\x03\0\x17golem:api/context@1.3.0\x05\x0c\x02\x03\0\x04\x0aaccount-id\x02\
+\x03\0\x04\x11component-version\x02\x03\0\x04\x0boplog-index\x02\x03\0\x04\x11pe\
+rsistence-level\x02\x03\0\x04\x0aproject-id\x02\x03\0\x04\x0cretry-policy\x02\x03\
+\0\x04\x04uuid\x02\x03\0\x04\x08agent-id\x02\x03\0\x05\x09attribute\x02\x03\0\x05\
+\x0fattribute-value\x02\x03\0\x05\x07span-id\x02\x03\0\x05\x08trace-id\x01B\x8f\x01\
+\x02\x03\x02\x01\x02\x04\0\x08datetime\x03\0\0\x02\x03\x02\x01\x09\x04\0\x0evalu\
+e-and-type\x03\0\x02\x02\x03\x02\x01\x0d\x04\0\x0aaccount-id\x03\0\x04\x02\x03\x02\
+\x01\x0e\x04\0\x11component-version\x03\0\x06\x02\x03\x02\x01\x0f\x04\0\x0boplog\
+-index\x03\0\x08\x02\x03\x02\x01\x10\x04\0\x11persistence-level\x03\0\x0a\x02\x03\
+\x02\x01\x11\x04\0\x0aproject-id\x03\0\x0c\x02\x03\x02\x01\x12\x04\0\x0cretry-po\
+licy\x03\0\x0e\x02\x03\x02\x01\x13\x04\0\x04uuid\x03\0\x10\x02\x03\x02\x01\x14\x04\
+\0\x08agent-id\x03\0\x12\x02\x03\x02\x01\x15\x04\0\x09attribute\x03\0\x14\x02\x03\
+\x02\x01\x16\x04\0\x0fattribute-value\x03\0\x16\x02\x03\x02\x01\x17\x04\0\x07spa\
+n-id\x03\0\x18\x02\x03\x02\x01\x18\x04\0\x08trace-id\x03\0\x1a\x01k\x09\x01q\x06\
+\x0aread-local\0\0\x0bwrite-local\0\0\x0bread-remote\0\0\x0cwrite-remote\0\0\x14\
+write-remote-batched\x01\x1c\0\x18write-remote-transaction\x01\x1c\0\x04\0\x15wr\
+apped-function-type\x03\0\x1d\x01o\x02ss\x01p\x1f\x01r\x04\x0finstallation-id\x11\
+\x04names\x07versions\x0aparameters\x20\x04\0\x1fplugin-installation-description\
+\x03\0!\x01ps\x01k\x13\x01p\"\x01r\x0c\x09timestamp\x01\x08agent-id\x13\x11compo\
+nent-version\x07\x04args#\x03env\x20\x0acreated-by\x05\x0aproject-id\x0d\x06pare\
+nt$\x0ecomponent-sizew\x20initial-total-linear-memory-sizew\x16initial-active-pl\
+ugins%\x0bconfig-vars\x20\x04\0\x11create-parameters\x03\0&\x01r\x05\x09timestam\
+p\x01\x0dfunction-names\x07request\x03\x08response\x03\x15wrapped-function-type\x1e\
+\x04\0$imported-function-invoked-parameters\x03\0(\x01k\x19\x01kw\x01p\x15\x01r\x06\
+\x07span-id\x19\x05start\x01\x06parent*\x0elinked-context+\x0aattributes,\x09inh\
+erited\x7f\x04\0\x0flocal-span-data\x03\0-\x01r\x01\x07span-id\x19\x04\0\x12exte\
+rnal-span-data\x03\0/\x01q\x02\x0alocal-span\x01.\0\x0dexternal-span\x010\0\x04\0\
+\x09span-data\x03\01\x01p\x03\x01p2\x01p4\x01r\x07\x09timestamp\x01\x0dfunction-\
+names\x07request3\x0fidempotency-keys\x08trace-id\x1b\x0ctrace-states#\x12invoca\
+tion-context5\x04\0$exported-function-invoked-parameters\x03\06\x01k\x03\x01r\x03\
+\x09timestamp\x01\x08response8\x0dconsumed-fuelx\x04\0&exported-function-complet\
+ed-parameters\x03\09\x01r\x03\x09timestamp\x01\x05errors\x0aretry-from\x09\x04\0\
+\x10error-parameters\x03\0;\x01r\x02\x05start\x09\x03end\x09\x04\0\x0coplog-regi\
+on\x03\0=\x01r\x02\x09timestamp\x01\x04jump>\x04\0\x0fjump-parameters\x03\0?\x01\
+r\x02\x09timestamp\x01\x0anew-policy\x0f\x04\0\x1echange-retry-policy-parameters\
+\x03\0A\x01r\x02\x09timestamp\x01\x0bbegin-index\x09\x04\0\x1cend-atomic-region-\
+parameters\x03\0C\x01r\x02\x09timestamp\x01\x0bbegin-index\x09\x04\0\x1bend-remo\
+te-write-parameters\x03\0E\x01k3\x01r\x06\x0fidempotency-keys\x0dfunction-names\x05\
+input\xc7\0\x08trace-ids\x0ctrace-states#\x12invocation-context5\x04\0'exported-\
+function-invocation-parameters\x03\0H\x01q\x02\x11exported-function\x01\xc9\0\0\x0d\
+manual-update\x01\x07\0\x04\0\x10agent-invocation\x03\0J\x01r\x02\x09timestamp\x01\
+\x0ainvocation\xcb\0\x04\0#pending-agent-invocation-parameters\x03\0L\x01p}\x01q\
+\x02\x0bauto-update\0\0\x0esnapshot-based\x01\xce\0\0\x04\0\x12update-descriptio\
+n\x03\0O\x01r\x03\x09timestamp\x01\x0etarget-version\x07\x12update-description\xd0\
+\0\x04\0\x19pending-update-parameters\x03\0Q\x01r\x04\x09timestamp\x01\x0etarget\
+-version\x07\x12new-component-sizew\x12new-active-plugins%\x04\0\x1csuccessful-u\
+pdate-parameters\x03\0S\x01ks\x01r\x03\x09timestamp\x01\x0etarget-version\x07\x07\
+details\xd5\0\x04\0\x18failed-update-parameters\x03\0V\x01r\x02\x09timestamp\x01\
+\x05deltaw\x04\0\x16grow-memory-parameters\x03\0X\x01w\x04\0\x11agent-resource-i\
+d\x03\0Z\x01r\x04\x09timestamp\x01\x0bresource-id\xdb\0\x04names\x05owners\x04\0\
+\x1acreate-resource-parameters\x03\0\\\x01r\x04\x09timestamp\x01\x0bresource-id\xdb\
+\0\x04names\x05owners\x04\0\x18drop-resource-parameters\x03\0^\x01m\x08\x06stdou\
+t\x06stderr\x05trace\x05debug\x04info\x04warn\x05error\x08critical\x04\0\x09log-\
+level\x03\0`\x01r\x04\x09timestamp\x01\x05level\xe1\0\x07contexts\x07messages\x04\
+\0\x0elog-parameters\x03\0b\x01r\x02\x09timestamp\x01\x06plugin\"\x04\0\x1aactiv\
+ate-plugin-parameters\x03\0d\x01r\x02\x09timestamp\x01\x06plugin\"\x04\0\x1cdeac\
+tivate-plugin-parameters\x03\0f\x01r\x03\x09timestamp\x01\x05start\x09\x03end\x09\
+\x04\0\x11revert-parameters\x03\0h\x01r\x02\x09timestamp\x01\x0fidempotency-keys\
+\x04\0\x1ccancel-invocation-parameters\x03\0j\x01r\x05\x09timestamp\x01\x07span-\
+id\x19\x06parent*\x0elinked-context*\x0aattributes,\x04\0\x15start-span-paramete\
+rs\x03\0l\x01r\x02\x09timestamp\x01\x07span-id\x19\x04\0\x16finish-span-paramete\
+rs\x03\0n\x01r\x04\x09timestamp\x01\x07span-id\x19\x03keys\x05value\x17\x04\0\x1d\
+set-span-attribute-parameters\x03\0p\x01r\x02\x09timestamp\x01\x11persistence-le\
+vel\x0b\x04\0#change-persistence-level-parameters\x03\0r\x01r\x02\x09timestamp\x01\
+\x0etransaction-ids\x04\0#begin-remote-transaction-parameters\x03\0t\x01r\x02\x09\
+timestamp\x01\x0bbegin-index\x09\x04\0\x1dremote-transaction-parameters\x03\0v\x01\
+r\x01\x09timestamp\x01\x04\0\x09timestamp\x03\0x\x01q%\x06create\x01'\0\x19impor\
+ted-function-invoked\x01)\0\x19exported-function-invoked\x017\0\x1bexported-func\
+tion-completed\x01:\0\x07suspend\x01\xf9\0\0\x05error\x01<\0\x05no-op\x01\xf9\0\0\
+\x04jump\x01\xc0\0\0\x0binterrupted\x01\xf9\0\0\x06exited\x01\xf9\0\0\x13change-\
+retry-policy\x01\xc2\0\0\x13begin-atomic-region\x01\xf9\0\0\x11end-atomic-region\
+\x01\xc4\0\0\x12begin-remote-write\x01\xf9\0\0\x10end-remote-write\x01\xc6\0\0\x18\
+pending-agent-invocation\x01\xcd\0\0\x0epending-update\x01\xd2\0\0\x11successful\
+-update\x01\xd4\0\0\x0dfailed-update\x01\xd7\0\0\x0bgrow-memory\x01\xd9\0\0\x0fc\
+reate-resource\x01\xdd\0\0\x0ddrop-resource\x01\xdf\0\0\x03log\x01\xe3\0\0\x07re\
+start\x01\xf9\0\0\x0factivate-plugin\x01\xe5\0\0\x11deactivate-plugin\x01\xe7\0\0\
+\x06revert\x01\xe9\0\0\x11cancel-invocation\x01\xeb\0\0\x0astart-span\x01\xed\0\0\
+\x0bfinish-span\x01\xef\0\0\x12set-span-attribute\x01\xf1\0\0\x18change-persiste\
+nce-level\x01\xf3\0\0\x18begin-remote-transaction\x01\xf5\0\0\x1dpre-commit-remo\
+te-transaction\x01\xf7\0\0\x1fpre-rollback-remote-transaction\x01\xf7\0\0\x1ccom\
+mitted-remote-transaction\x01\xf7\0\0\x1erolled-back-remote-transaction\x01\xf7\0\
+\0\x04\0\x0boplog-entry\x03\0z\x04\0\x09get-oplog\x03\x01\x04\0\x0csearch-oplog\x03\
+\x01\x01i|\x01@\x02\x08agent-id\x13\x05start\x09\0\xfe\0\x04\0\x16[constructor]g\
+et-oplog\x01\x7f\x01h|\x01p\xfb\0\x01k\x81\x01\x01@\x01\x04self\x80\x01\0\x82\x01\
+\x04\0\x1a[method]get-oplog.get-next\x01\x83\x01\x01i}\x01@\x02\x08agent-id\x13\x04\
+texts\0\x84\x01\x04\0\x19[constructor]search-oplog\x01\x85\x01\x01h}\x01o\x02\x09\
+\xfb\0\x01p\x87\x01\x01k\x88\x01\x01@\x01\x04self\x86\x01\0\x89\x01\x04\0\x1d[me\
+thod]search-oplog.get-next\x01\x8a\x01\x03\0\x15golem:api/oplog@1.3.0\x05\x19\x01\
+B\x03\x01ps\x01@\0\0\0\x04\0\x15get-invoked-functions\x01\x01\x04\0\x13golem:com\
+ponent/api\x05\x1a\x02\x03\0\x02\x09wit-value\x02\x03\0\x04\x0eagent-metadata\x02\
+\x03\0\x06\x0boplog-entry\x01B\x18\x02\x03\x02\x01\x02\x04\0\x08datetime\x03\0\0\
+\x02\x03\x02\x01\x1b\x04\0\x09wit-value\x03\0\x02\x02\x03\x02\x01\x0d\x04\0\x0aa\
+ccount-id\x03\0\x04\x02\x03\x02\x01\x0f\x04\0\x0boplog-index\x03\0\x06\x02\x03\x02\
+\x01\x1c\x04\0\x0eagent-metadata\x03\0\x08\x02\x03\x02\x01\x1d\x04\0\x0boplog-en\
+try\x03\0\x0a\x02\x03\x02\x01\x07\x04\0\x0ccomponent-id\x03\0\x0c\x02\x03\x02\x01\
+\x0a\x04\0\x08agent-id\x03\0\x0e\x01r\x01\x0aaccount-id\x05\x04\0\x0caccount-inf\
+o\x03\0\x10\x01o\x02ss\x01p\x12\x01p\x0b\x01j\0\x01s\x01@\x07\x0caccount-info\x11\
+\x06config\x13\x0ccomponent-id\x0d\x08agent-id\x0f\x08metadata\x09\x11first-entr\
+y-index\x07\x07entries\x14\0\x15\x04\0\x07process\x01\x16\x04\0\x1fgolem:api/opl\
+og-processor@1.3.0\x05\x1e\x04\0\x1fgolem:component/oplog-processor\x04\0\x0b\x15\
+\x01\0\x0foplog-processor\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit\
+-component\x070.227.1\x10wit-bindgen-rust\x060.41.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {
diff --git a/test-components/option-service.wasm b/test-components/option-service.wasm
index c51a1dde62..5f266e2df1 100755
Binary files a/test-components/option-service.wasm and b/test-components/option-service.wasm differ
diff --git a/test-components/parent_component.wasm b/test-components/parent_component.wasm
index 9d311d97c6..94e736a8d4 100644
Binary files a/test-components/parent_component.wasm and b/test-components/parent_component.wasm differ
diff --git a/test-components/parent_component_composed.wasm b/test-components/parent_component_composed.wasm
index c95a975650..02b7d666b3 100644
Binary files a/test-components/parent_component_composed.wasm and b/test-components/parent_component_composed.wasm differ
diff --git a/test-components/promise.wasm b/test-components/promise.wasm
index 74ab162e3d..a616f48abc 100644
Binary files a/test-components/promise.wasm and b/test-components/promise.wasm differ
diff --git a/test-components/promise/src/bindings.rs b/test-components/promise/src/bindings.rs
index bacf44a193..d85927fc06 100644
--- a/test-components/promise/src/bindings.rs
+++ b/test-components/promise/src/bindings.rs
@@ -588,14 +588,31 @@ pub mod golem {
                     }
                 }
             }
-            /// Indicates which agent the code is running on after `fork`
-            #[repr(u8)]
-            #[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+            /// Details about the fork result
+            #[repr(C)]
+            #[derive(Clone, Copy)]
+            pub struct ForkDetails {
+                pub forked_phantom_id: Uuid,
+            }
+            impl ::core::fmt::Debug for ForkDetails {
+                fn fmt(
+                    &self,
+                    f: &mut ::core::fmt::Formatter<'_>,
+                ) -> ::core::fmt::Result {
+                    f.debug_struct("ForkDetails")
+                        .field("forked-phantom-id", &self.forked_phantom_id)
+                        .finish()
+                }
+            }
+            /// Indicates which agent the code is running on after `fork`.
+            /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+            /// created agent.
+            #[derive(Clone, Copy)]
             pub enum ForkResult {
                 /// The original agent that called `fork`
-                Original,
+                Original(ForkDetails),
                 /// The new agent
-                Forked,
+                Forked(ForkDetails),
             }
             impl ::core::fmt::Debug for ForkResult {
                 fn fmt(
@@ -603,28 +620,15 @@ pub mod golem {
                     f: &mut ::core::fmt::Formatter<'_>,
                 ) -> ::core::fmt::Result {
                     match self {
-                        ForkResult::Original => {
-                            f.debug_tuple("ForkResult::Original").finish()
+                        ForkResult::Original(e) => {
+                            f.debug_tuple("ForkResult::Original").field(e).finish()
                         }
-                        ForkResult::Forked => {
-                            f.debug_tuple("ForkResult::Forked").finish()
+                        ForkResult::Forked(e) => {
+                            f.debug_tuple("ForkResult::Forked").field(e).finish()
                         }
                     }
                 }
             }
-            impl ForkResult {
-                #[doc(hidden)]
-                pub unsafe fn _lift(val: u8) -> ForkResult {
-                    if !cfg!(debug_assertions) {
-                        return ::core::mem::transmute(val);
-                    }
-                    match val {
-                        0 => ForkResult::Original,
-                        1 => ForkResult::Forked,
-                        _ => panic!("invalid enum discriminant"),
-                    }
-                }
-            }
             #[derive(Debug)]
             #[repr(transparent)]
             pub struct GetPromiseResult {
@@ -2502,26 +2506,59 @@ pub mod golem {
                 }
             }
             #[allow(unused_unsafe, clippy::all)]
-            /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-            /// and this agent continues running as well. The return value is going to be different in this agent and
-            /// the forked agent.
-            pub fn fork(new_name: &str) -> ForkResult {
+            /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+            /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+            /// both sides. The newly created agent continues running from the same point, but the return value is
+            /// going to be different in this agent and the forked agent.
+            pub fn fork() -> ForkResult {
                 unsafe {
-                    let vec0 = new_name;
-                    let ptr0 = vec0.as_ptr().cast::<u8>();
-                    let len0 = vec0.len();
+                    #[repr(align(8))]
+                    struct RetArea([::core::mem::MaybeUninit<u8>; 24]);
+                    let mut ret_area = RetArea([::core::mem::MaybeUninit::uninit(); 24]);
+                    let ptr0 = ret_area.0.as_mut_ptr().cast::<u8>();
                     #[cfg(target_arch = "wasm32")]
                     #[link(wasm_import_module = "golem:api/host@1.3.0")]
                     unsafe extern "C" {
                         #[link_name = "fork"]
-                        fn wit_import1(_: *mut u8, _: usize) -> i32;
+                        fn wit_import1(_: *mut u8);
                     }
                     #[cfg(not(target_arch = "wasm32"))]
-                    unsafe extern "C" fn wit_import1(_: *mut u8, _: usize) -> i32 {
+                    unsafe extern "C" fn wit_import1(_: *mut u8) {
                         unreachable!()
                     }
-                    let ret = unsafe { wit_import1(ptr0.cast_mut(), len0) };
-                    ForkResult::_lift(ret as u8)
+                    unsafe { wit_import1(ptr0) };
+                    let l2 = i32::from(*ptr0.add(0).cast::<u8>());
+                    let v7 = match l2 {
+                        0 => {
+                            let e7 = {
+                                let l3 = *ptr0.add(8).cast::<i64>();
+                                let l4 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l3 as u64,
+                                        low_bits: l4 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Original(e7)
+                        }
+                        n => {
+                            debug_assert_eq!(n, 1, "invalid enum discriminant");
+                            let e7 = {
+                                let l5 = *ptr0.add(8).cast::<i64>();
+                                let l6 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l5 as u64,
+                                        low_bits: l6 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Forked(e7)
+                        }
+                    };
+                    let result8 = v7;
+                    result8
                 }
             }
         }
@@ -6491,8 +6528,8 @@ pub(crate) use __export_promise_impl as export;
 )]
 #[doc(hidden)]
 #[allow(clippy::octal_escapes)]
-pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 5492] = *b"\
-\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xf6)\x01A\x02\x01A\x14\
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 5530] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\x9c*\x01A\x02\x01A\x14\
 \x01B\x0a\x04\0\x08pollable\x03\x01\x01h\0\x01@\x01\x04self\x01\0\x7f\x04\0\x16[\
 method]pollable.ready\x01\x02\x01@\x01\x04self\x01\x01\0\x04\0\x16[method]pollab\
 le.block\x01\x03\x01p\x01\x01py\x01@\x01\x02in\x04\0\x05\x04\0\x04poll\x01\x06\x03\
@@ -6546,7 +6583,7 @@ ethod]cancellation-token.cancel\x01F\x01j\x01\x05\x01s\x01@\x01\x04uuids\0\xc7\0
 \x04\0\x0aparse-uuid\x01H\x01@\x01\x04uuid\x05\0s\x04\0\x0euuid-to-string\x01I\x03\
 \0\x15golem:rpc/types@0.2.2\x05\x05\x02\x03\0\x01\x08duration\x02\x03\0\x03\x0cc\
 omponent-id\x02\x03\0\x03\x04uuid\x02\x03\0\x03\x0evalue-and-type\x02\x03\0\x03\x08\
-agent-id\x01B\x85\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
+agent-id\x01B\x87\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
 \x07\x04\0\x0ccomponent-id\x03\0\x02\x02\x03\x02\x01\x08\x04\0\x04uuid\x03\0\x04\
 \x02\x03\x02\x01\x09\x04\0\x0evalue-and-type\x03\0\x06\x02\x03\x02\x01\x0a\x04\0\
 \x08agent-id\x03\0\x08\x02\x03\x02\x01\x01\x04\0\x08pollable\x03\0\x0a\x01w\x04\0\
@@ -6574,38 +6611,38 @@ rs4\x04\0\x10agent-any-filter\x03\05\x01ps\x01o\x02ss\x01p8\x01r\x07\x08agent-id
 \x09\x04args7\x03env9\x0bconfig-vars9\x06status\"\x11component-versionw\x0bretry\
 -countw\x04\0\x0eagent-metadata\x03\0:\x04\0\x0aget-agents\x03\x01\x01q\x02\x15r\
 evert-to-oplog-index\x01\x0d\0\x17revert-last-invocations\x01w\0\x04\0\x13revert\
--agent-target\x03\0=\x01m\x02\x08original\x06forked\x04\0\x0bfork-result\x03\0?\x04\
-\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\x06fil\
-ter\xc2\0\x07precise\x7f\0\xc3\0\x04\0\x17[constructor]get-agents\x01D\x01h<\x01\
-p;\x01k\xc6\0\x01@\x01\x04self\xc5\0\0\xc7\0\x04\0\x1b[method]get-agents.get-nex\
-t\x01H\x01hA\x01i\x0b\x01@\x01\x04self\xc9\0\0\xca\0\x04\0$[method]get-promise-r\
-esult.subscribe\x01K\x01p}\x01k\xcc\0\x01@\x01\x04self\xc9\0\0\xcd\0\x04\0\x1e[m\
-ethod]get-promise-result.get\x01N\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01O\x01i\
-A\x01@\x01\x0apromise-id\x0f\0\xd0\0\x04\0\x0bget-promise\x01Q\x01@\x02\x0apromi\
-se-id\x0f\x04data\xcc\0\0\x7f\x04\0\x10complete-promise\x01R\x01@\0\0\x0d\x04\0\x0f\
-get-oplog-index\x01S\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-index\x01\
-T\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01U\x04\0\x14mark-begin-ope\
-ration\x01S\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01V\x01@\0\0\
-\x18\x04\0\x10get-retry-policy\x01W\x01@\x01\x10new-retry-policy\x18\x01\0\x04\0\
-\x10set-retry-policy\x01X\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01Y\
-\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-leve\
-l\x01Z\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01[\x01@\x01\x0aidempotent\x7f\
-\x01\0\x04\0\x14set-idempotence-mode\x01\\\x01@\0\0\x05\x04\0\x18generate-idempo\
-tency-key\x01]\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
-\0\x0cupdate-agent\x01^\x01@\0\0;\x04\0\x11get-self-metadata\x01_\x01k;\x01@\x01\
-\x08agent-id\x09\0\xe0\0\x04\0\x12get-agent-metadata\x01a\x01@\x03\x0fsource-age\
+-agent-target\x03\0=\x01r\x01\x11forked-phantom-id\x05\x04\0\x0cfork-details\x03\
+\0?\x01q\x02\x08original\x01\xc0\0\0\x06forked\x01\xc0\0\0\x04\0\x0bfork-result\x03\
+\0A\x04\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\
+\x06filter\xc4\0\x07precise\x7f\0\xc5\0\x04\0\x17[constructor]get-agents\x01F\x01\
+h<\x01p;\x01k\xc8\0\x01@\x01\x04self\xc7\0\0\xc9\0\x04\0\x1b[method]get-agents.g\
+et-next\x01J\x01hC\x01i\x0b\x01@\x01\x04self\xcb\0\0\xcc\0\x04\0$[method]get-pro\
+mise-result.subscribe\x01M\x01p}\x01k\xce\0\x01@\x01\x04self\xcb\0\0\xcf\0\x04\0\
+\x1e[method]get-promise-result.get\x01P\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01\
+Q\x01iC\x01@\x01\x0apromise-id\x0f\0\xd2\0\x04\0\x0bget-promise\x01S\x01@\x02\x0a\
+promise-id\x0f\x04data\xce\0\0\x7f\x04\0\x10complete-promise\x01T\x01@\0\0\x0d\x04\
+\0\x0fget-oplog-index\x01U\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-in\
+dex\x01V\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01W\x04\0\x14mark-be\
+gin-operation\x01U\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01X\x01\
+@\0\0\x18\x04\0\x10get-retry-policy\x01Y\x01@\x01\x10new-retry-policy\x18\x01\0\x04\
+\0\x10set-retry-policy\x01Z\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01\
+[\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-lev\
+el\x01\\\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01]\x01@\x01\x0aidempotent\x7f\
+\x01\0\x04\0\x14set-idempotence-mode\x01^\x01@\0\0\x05\x04\0\x18generate-idempot\
+ency-key\x01_\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
+\0\x0cupdate-agent\x01`\x01@\0\0;\x04\0\x11get-self-metadata\x01a\x01k;\x01@\x01\
+\x08agent-id\x09\0\xe2\0\x04\0\x12get-agent-metadata\x01c\x01@\x03\x0fsource-age\
 nt-id\x09\x0ftarget-agent-id\x09\x11oplog-idx-cut-off\x0d\x01\0\x04\0\x0afork-ag\
-ent\x01b\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
-c\x01k\x03\x01@\x01\x13component-references\0\xe4\0\x04\0\x14resolve-component-i\
-d\x01e\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe6\0\x04\0\x10\
-resolve-agent-id\x01g\x04\0\x17resolve-agent-id-strict\x01g\x01@\x01\x08new-name\
-s\0\xc0\0\x04\0\x04fork\x01h\x03\0\x14golem:api/host@1.3.0\x05\x0b\x02\x03\0\x04\
-\x0apromise-id\x01B\x0a\x02\x03\x02\x01\x0c\x04\0\x0apromise-id\x03\0\0\x01@\0\0\
-\x01\x04\0\x06create\x01\x02\x01p}\x01@\x01\x02id\x01\0\x03\x04\0\x05await\x01\x04\
-\x01k\x03\x01@\x01\x02id\x01\0\x05\x04\0\x04poll\x01\x06\x04\0\x0cgolem:it/api\x05\
-\x0d\x04\0\x10golem:it/promise\x04\0\x0b\x0d\x01\0\x07promise\x03\0\0\0G\x09prod\
-ucers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rust\x06\
-0.41.0";
+ent\x01d\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
+e\x01k\x03\x01@\x01\x13component-references\0\xe6\0\x04\0\x14resolve-component-i\
+d\x01g\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe8\0\x04\0\x10\
+resolve-agent-id\x01i\x04\0\x17resolve-agent-id-strict\x01i\x01@\0\0\xc2\0\x04\0\
+\x04fork\x01j\x03\0\x14golem:api/host@1.3.0\x05\x0b\x02\x03\0\x04\x0apromise-id\x01\
+B\x0a\x02\x03\x02\x01\x0c\x04\0\x0apromise-id\x03\0\0\x01@\0\0\x01\x04\0\x06crea\
+te\x01\x02\x01p}\x01@\x01\x02id\x01\0\x03\x04\0\x05await\x01\x04\x01k\x03\x01@\x01\
+\x02id\x01\0\x05\x04\0\x04poll\x01\x06\x04\0\x0cgolem:it/api\x05\x0d\x04\0\x10go\
+lem:it/promise\x04\0\x0b\x0d\x01\0\x07promise\x03\0\0\0G\x09producers\x01\x0cpro\
+cessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rust\x060.41.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {
diff --git a/test-components/rdbms-service.wasm b/test-components/rdbms-service.wasm
index 684954c434..0d585e71e3 100644
Binary files a/test-components/rdbms-service.wasm and b/test-components/rdbms-service.wasm differ
diff --git a/test-components/read-stdin.wasm b/test-components/read-stdin.wasm
index 1b6b37d985..e88b38da95 100755
Binary files a/test-components/read-stdin.wasm and b/test-components/read-stdin.wasm differ
diff --git a/test-components/rpc/Cargo.lock b/test-components/rpc/Cargo.lock
index 08f397c573..1bcfe6cc67 100644
--- a/test-components/rpc/Cargo.lock
+++ b/test-components/rpc/Cargo.lock
@@ -208,17 +208,6 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
-[[package]]
-name = "ephemeral"
-version = "0.0.1"
-dependencies = [
- "golem-rust",
- "once_cell",
- "rand",
- "uuid",
- "wit-bindgen-rt 0.40.0",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.2"
diff --git a/test-components/rpc/Cargo.toml b/test-components/rpc/Cargo.toml
index 024e1884e4..fd701c222f 100644
--- a/test-components/rpc/Cargo.toml
+++ b/test-components/rpc/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 
-members = ["counters", "caller", "ephemeral"]
+members = ["counters", "caller"]
 
 [profile.release]
 opt-level = "s"
diff --git a/test-components/rpc/caller/Cargo.toml b/test-components/rpc/caller/Cargo.toml
index 6eb47b8ddc..86a3e3ad5e 100644
--- a/test-components/rpc/caller/Cargo.toml
+++ b/test-components/rpc/caller/Cargo.toml
@@ -13,7 +13,6 @@ path = "wit-generated"
 "golem:api" = { path = "wit-generated/deps/golem-1.x" }
 "rpc:counters-exports" = { path = "wit-generated/deps/rpc_counters-exports" }
 "rpc:counters-client" = { path = "wit-generated/deps/rpc_counters-client" }
-"rpc:ephemeral-client" = { path = "wit-generated/deps/rpc_ephemeral-client" }
 "rpc:caller-exports" = { path = "wit-generated/deps/rpc_caller-exports" }
 
 [package.metadata.component.bindings]
diff --git a/test-components/rpc/caller/golem.yaml b/test-components/rpc/caller/golem.yaml
index 70bf7a944f..f66753a844 100644
--- a/test-components/rpc/caller/golem.yaml
+++ b/test-components/rpc/caller/golem.yaml
@@ -12,19 +12,17 @@ components:
         linkedWasm: ../target/golem-components/debug/caller_composed.wasm
         customCommands:
           copy:
-          - command: cp ../target/wasm32-wasip1/debug/caller.wasm ../..
-          - command: cp ../target/golem-components/debug/caller_composed.wasm ../..
+            - command: cp ../target/wasm32-wasip1/debug/caller.wasm ../..
+            - command: cp ../target/golem-components/debug/caller_composed.wasm ../..
       release:
         componentWasm: ../target/wasm32-wasip1/release/caller.wasm
         linkedWasm: ../target/golem-components/release/caller_composed.wasm
         customCommands:
           copy:
-          - command: cp ../target/wasm32-wasip1/release/caller.wasm ../..
-          - command: cp ../target/golem-components/release/caller_composed.wasm ../..
+            - command: cp ../target/wasm32-wasip1/release/caller.wasm ../..
+            - command: cp ../target/golem-components/release/caller_composed.wasm ../..
     defaultProfile: debug
 dependencies:
   caller:
-  - target: counters
-    type: static-wasm-rpc
-  - target: ephemeral
-    type: static-wasm-rpc
+    - target: counters
+      type: static-wasm-rpc
diff --git a/test-components/rpc/caller/src/lib.rs b/test-components/rpc/caller/src/lib.rs
index f22923453d..dc05a69281 100644
--- a/test-components/rpc/caller/src/lib.rs
+++ b/test-components/rpc/caller/src/lib.rs
@@ -3,7 +3,6 @@ mod bindings;
 
 use crate::bindings::exports::rpc::caller_exports::caller_inline_functions::{Guest, TimelineNode};
 use crate::bindings::rpc::counters_client::counters_client::{Api, Counter};
-use crate::bindings::rpc::ephemeral_client::ephemeral_client::Api as EphemeralApi;
 use golem_rust::wasm_rpc::{AgentId, ComponentId};
 use std::env;
 use uuid::Uuid;
@@ -114,30 +113,6 @@ impl Guest for Component {
         api.blocking_bug_wasm_rpc_i32(in_)
     }
 
-    fn ephemeral_test1() -> Vec<(String, String)> {
-        let component_id =
-            env::var("EPHEMERAL_COMPONENT_ID").expect("EPHEMERAL_COMPONENT_ID not set");
-        let component_id: Uuid = Uuid::parse_str(&component_id).unwrap();
-        let component_id: ComponentId = component_id.into();
-        let api1 = EphemeralApi::custom(&AgentId {
-            component_id: component_id.clone(),
-            agent_id: "eph1".to_string(),
-        });
-        let name1: String = api1.blocking_get_worker_name();
-        let key1 = api1.blocking_get_idempotency_key();
-        let name2 = api1.blocking_get_worker_name();
-        let key2 = api1.blocking_get_idempotency_key();
-
-        let api2 = EphemeralApi::custom(&AgentId {
-            component_id: component_id.clone(),
-            agent_id: "eph2".to_string(),
-        });
-        let name3: String = api2.blocking_get_worker_name();
-        let key3: String = api2.blocking_get_idempotency_key();
-
-        vec![(name1, key1), (name2, key2), (name3, key3)]
-    }
-
     fn bug_golem1265(s: String) -> Result<(), String> {
         println!("Reproducer for golem issue #1265");
         let component_id =
diff --git a/test-components/rpc/caller/wit/caller.wit b/test-components/rpc/caller/wit/caller.wit
index 8b77356f4f..46e16596d0 100644
--- a/test-components/rpc/caller/wit/caller.wit
+++ b/test-components/rpc/caller/wit/caller.wit
@@ -11,7 +11,5 @@ world caller {
 
   export bug-wasm-rpc-i32: func(in: timeline-node) -> timeline-node;
 
-  export ephemeral-test1: func() -> list<tuple<string, string>>;
-
   export bug-golem1265: func(s: string) -> result<_, string>;
 }
diff --git a/test-components/rpc/counters/src/lib.rs b/test-components/rpc/counters/src/lib.rs
index 537791314d..7459155fbd 100644
--- a/test-components/rpc/counters/src/lib.rs
+++ b/test-components/rpc/counters/src/lib.rs
@@ -81,9 +81,9 @@ impl GuestCounter for Counter {
     }
 
     fn block_on_promise(&self, promise: PromiseId) {
-        println!("Awaiting promise ${promise:?}");
+        println!("Awaiting promise {promise:?}");
         bindings::golem::api::host::get_promise(&promise).subscribe().block();
-        println!("Promise ${promise:?} completed");
+        println!("Promise {promise:?} completed");
     }
 
     fn get_args(&self) -> Vec<String> {
diff --git a/test-components/rpc/ephemeral/Cargo.toml b/test-components/rpc/ephemeral/Cargo.toml
deleted file mode 100644
index 96f183fb11..0000000000
--- a/test-components/rpc/ephemeral/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "ephemeral"
-version = "0.0.1"
-edition = "2021"
-
-[package.metadata.component.target]
-path = "wit-generated"
-
-[package.metadata.component.target.dependencies]
-"rpc:ephemeral-exports" = { path = "wit-generated/deps/rpc_ephemeral-exports" }
-
-[dependencies]
-golem-rust = { path = "../../../sdks/rust/golem-rust" }
-once_cell = "1.17.1"
-rand = "0.8.5"
-
-[dependencies.uuid]
-version = "1.4.1"
-features = ["v4"]
-
-[dependencies.wit-bindgen-rt]
-version = "0.40.0"
-features = ["bitflags"]
-
-[lib]
-path = "src/lib.rs"
-crate-type = ["cdylib"]
-required-features = []
diff --git a/test-components/rpc/ephemeral/golem.yaml b/test-components/rpc/ephemeral/golem.yaml
deleted file mode 100644
index d24394c92a..0000000000
--- a/test-components/rpc/ephemeral/golem.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Schema for IDEA:
-# $schema: https://schema.golem.cloud/app/golem/1.1.1/golem.schema.json
-# Schema for vscode-yaml
-# yaml-language-server: $schema=https://schema.golem.cloud/app/golem/1.1.1/golem.schema.json
-
-components:
-  ephemeral:
-    profiles:
-      debug:
-        componentType: ephemeral
-      release:
-        componentType: ephemeral
-    template: rust
diff --git a/test-components/rpc/ephemeral/src/lib.rs b/test-components/rpc/ephemeral/src/lib.rs
deleted file mode 100644
index c036707108..0000000000
--- a/test-components/rpc/ephemeral/src/lib.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use crate::bindings::exports::rpc::ephemeral_exports::api::Guest;
-
-#[allow(static_mut_refs)]
-mod bindings;
-
-pub struct Component;
-
-impl Guest for Component {
-    fn get_worker_name() -> String {
-        std::env::var("GOLEM_WORKER_NAME").unwrap()
-    }
-
-    fn get_idempotency_key() -> String {
-        golem_rust::generate_idempotency_key().to_string()
-    }
-}
-
-bindings::export!(Component with_types_in bindings);
diff --git a/test-components/rpc/ephemeral/wit/ephemeral.wit b/test-components/rpc/ephemeral/wit/ephemeral.wit
deleted file mode 100644
index fc59adcf64..0000000000
--- a/test-components/rpc/ephemeral/wit/ephemeral.wit
+++ /dev/null
@@ -1,10 +0,0 @@
-package rpc:ephemeral;
-
-interface api {
-  get-worker-name: func() -> string;
-  get-idempotency-key: func() -> string;
-}
-
-world ephemeral {
-  export api;
-}
diff --git a/test-components/runtime-service.wasm b/test-components/runtime-service.wasm
index 547115a668..a1a78b3a6c 100644
Binary files a/test-components/runtime-service.wasm and b/test-components/runtime-service.wasm differ
diff --git a/test-components/runtime-service/src/bindings.rs b/test-components/runtime-service/src/bindings.rs
index c1c57cc19b..49758740fd 100644
--- a/test-components/runtime-service/src/bindings.rs
+++ b/test-components/runtime-service/src/bindings.rs
@@ -588,14 +588,31 @@ pub mod golem {
                     }
                 }
             }
-            /// Indicates which agent the code is running on after `fork`
-            #[repr(u8)]
-            #[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+            /// Details about the fork result
+            #[repr(C)]
+            #[derive(Clone, Copy)]
+            pub struct ForkDetails {
+                pub forked_phantom_id: Uuid,
+            }
+            impl ::core::fmt::Debug for ForkDetails {
+                fn fmt(
+                    &self,
+                    f: &mut ::core::fmt::Formatter<'_>,
+                ) -> ::core::fmt::Result {
+                    f.debug_struct("ForkDetails")
+                        .field("forked-phantom-id", &self.forked_phantom_id)
+                        .finish()
+                }
+            }
+            /// Indicates which agent the code is running on after `fork`.
+            /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+            /// created agent.
+            #[derive(Clone, Copy)]
             pub enum ForkResult {
                 /// The original agent that called `fork`
-                Original,
+                Original(ForkDetails),
                 /// The new agent
-                Forked,
+                Forked(ForkDetails),
             }
             impl ::core::fmt::Debug for ForkResult {
                 fn fmt(
@@ -603,28 +620,15 @@ pub mod golem {
                     f: &mut ::core::fmt::Formatter<'_>,
                 ) -> ::core::fmt::Result {
                     match self {
-                        ForkResult::Original => {
-                            f.debug_tuple("ForkResult::Original").finish()
+                        ForkResult::Original(e) => {
+                            f.debug_tuple("ForkResult::Original").field(e).finish()
                         }
-                        ForkResult::Forked => {
-                            f.debug_tuple("ForkResult::Forked").finish()
+                        ForkResult::Forked(e) => {
+                            f.debug_tuple("ForkResult::Forked").field(e).finish()
                         }
                     }
                 }
             }
-            impl ForkResult {
-                #[doc(hidden)]
-                pub unsafe fn _lift(val: u8) -> ForkResult {
-                    if !cfg!(debug_assertions) {
-                        return ::core::mem::transmute(val);
-                    }
-                    match val {
-                        0 => ForkResult::Original,
-                        1 => ForkResult::Forked,
-                        _ => panic!("invalid enum discriminant"),
-                    }
-                }
-            }
             #[derive(Debug)]
             #[repr(transparent)]
             pub struct GetPromiseResult {
@@ -2502,26 +2506,59 @@ pub mod golem {
                 }
             }
             #[allow(unused_unsafe, clippy::all)]
-            /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-            /// and this agent continues running as well. The return value is going to be different in this agent and
-            /// the forked agent.
-            pub fn fork(new_name: &str) -> ForkResult {
+            /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+            /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+            /// both sides. The newly created agent continues running from the same point, but the return value is
+            /// going to be different in this agent and the forked agent.
+            pub fn fork() -> ForkResult {
                 unsafe {
-                    let vec0 = new_name;
-                    let ptr0 = vec0.as_ptr().cast::<u8>();
-                    let len0 = vec0.len();
+                    #[repr(align(8))]
+                    struct RetArea([::core::mem::MaybeUninit<u8>; 24]);
+                    let mut ret_area = RetArea([::core::mem::MaybeUninit::uninit(); 24]);
+                    let ptr0 = ret_area.0.as_mut_ptr().cast::<u8>();
                     #[cfg(target_arch = "wasm32")]
                     #[link(wasm_import_module = "golem:api/host@1.3.0")]
                     unsafe extern "C" {
                         #[link_name = "fork"]
-                        fn wit_import1(_: *mut u8, _: usize) -> i32;
+                        fn wit_import1(_: *mut u8);
                     }
                     #[cfg(not(target_arch = "wasm32"))]
-                    unsafe extern "C" fn wit_import1(_: *mut u8, _: usize) -> i32 {
+                    unsafe extern "C" fn wit_import1(_: *mut u8) {
                         unreachable!()
                     }
-                    let ret = unsafe { wit_import1(ptr0.cast_mut(), len0) };
-                    ForkResult::_lift(ret as u8)
+                    unsafe { wit_import1(ptr0) };
+                    let l2 = i32::from(*ptr0.add(0).cast::<u8>());
+                    let v7 = match l2 {
+                        0 => {
+                            let e7 = {
+                                let l3 = *ptr0.add(8).cast::<i64>();
+                                let l4 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l3 as u64,
+                                        low_bits: l4 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Original(e7)
+                        }
+                        n => {
+                            debug_assert_eq!(n, 1, "invalid enum discriminant");
+                            let e7 = {
+                                let l5 = *ptr0.add(8).cast::<i64>();
+                                let l6 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l5 as u64,
+                                        low_bits: l6 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Forked(e7)
+                        }
+                    };
+                    let result8 = v7;
+                    result8
                 }
             }
         }
@@ -15692,12 +15729,12 @@ pub(crate) use __export_runtime_service_impl as export;
 )]
 #[doc(hidden)]
 #[allow(clippy::octal_escapes)]
-pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 12020] = *b"\
-\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xee\\\x01A\x02\x01A)\
-\x01B\x0a\x04\0\x08pollable\x03\x01\x01h\0\x01@\x01\x04self\x01\0\x7f\x04\0\x16[\
-method]pollable.ready\x01\x02\x01@\x01\x04self\x01\x01\0\x04\0\x16[method]pollab\
-le.block\x01\x03\x01p\x01\x01py\x01@\x01\x02in\x04\0\x05\x04\0\x04poll\x01\x06\x03\
-\0\x12wasi:io/poll@0.2.3\x05\0\x02\x03\0\0\x08pollable\x01B\x0f\x02\x03\x02\x01\x01\
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 12058] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\x94]\x01A\x02\x01A)\x01\
+B\x0a\x04\0\x08pollable\x03\x01\x01h\0\x01@\x01\x04self\x01\0\x7f\x04\0\x16[meth\
+od]pollable.ready\x01\x02\x01@\x01\x04self\x01\x01\0\x04\0\x16[method]pollable.b\
+lock\x01\x03\x01p\x01\x01py\x01@\x01\x02in\x04\0\x05\x04\0\x04poll\x01\x06\x03\0\
+\x12wasi:io/poll@0.2.3\x05\0\x02\x03\0\0\x08pollable\x01B\x0f\x02\x03\x02\x01\x01\
 \x04\0\x08pollable\x03\0\0\x01w\x04\0\x07instant\x03\0\x02\x01w\x04\0\x08duratio\
 n\x03\0\x04\x01@\0\0\x03\x04\0\x03now\x01\x06\x01@\0\0\x05\x04\0\x0aresolution\x01\
 \x07\x01i\x01\x01@\x01\x04when\x03\0\x08\x04\0\x11subscribe-instant\x01\x09\x01@\
@@ -15747,7 +15784,7 @@ ethod]cancellation-token.cancel\x01F\x01j\x01\x05\x01s\x01@\x01\x04uuids\0\xc7\0
 \x04\0\x0aparse-uuid\x01H\x01@\x01\x04uuid\x05\0s\x04\0\x0euuid-to-string\x01I\x03\
 \0\x15golem:rpc/types@0.2.2\x05\x05\x02\x03\0\x01\x08duration\x02\x03\0\x03\x0cc\
 omponent-id\x02\x03\0\x03\x04uuid\x02\x03\0\x03\x0evalue-and-type\x02\x03\0\x03\x08\
-agent-id\x01B\x85\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
+agent-id\x01B\x87\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
 \x07\x04\0\x0ccomponent-id\x03\0\x02\x02\x03\x02\x01\x08\x04\0\x04uuid\x03\0\x04\
 \x02\x03\x02\x01\x09\x04\0\x0evalue-and-type\x03\0\x06\x02\x03\x02\x01\x0a\x04\0\
 \x08agent-id\x03\0\x08\x02\x03\x02\x01\x01\x04\0\x08pollable\x03\0\x0a\x01w\x04\0\
@@ -15775,167 +15812,168 @@ rs4\x04\0\x10agent-any-filter\x03\05\x01ps\x01o\x02ss\x01p8\x01r\x07\x08agent-id
 \x09\x04args7\x03env9\x0bconfig-vars9\x06status\"\x11component-versionw\x0bretry\
 -countw\x04\0\x0eagent-metadata\x03\0:\x04\0\x0aget-agents\x03\x01\x01q\x02\x15r\
 evert-to-oplog-index\x01\x0d\0\x17revert-last-invocations\x01w\0\x04\0\x13revert\
--agent-target\x03\0=\x01m\x02\x08original\x06forked\x04\0\x0bfork-result\x03\0?\x04\
-\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\x06fil\
-ter\xc2\0\x07precise\x7f\0\xc3\0\x04\0\x17[constructor]get-agents\x01D\x01h<\x01\
-p;\x01k\xc6\0\x01@\x01\x04self\xc5\0\0\xc7\0\x04\0\x1b[method]get-agents.get-nex\
-t\x01H\x01hA\x01i\x0b\x01@\x01\x04self\xc9\0\0\xca\0\x04\0$[method]get-promise-r\
-esult.subscribe\x01K\x01p}\x01k\xcc\0\x01@\x01\x04self\xc9\0\0\xcd\0\x04\0\x1e[m\
-ethod]get-promise-result.get\x01N\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01O\x01i\
-A\x01@\x01\x0apromise-id\x0f\0\xd0\0\x04\0\x0bget-promise\x01Q\x01@\x02\x0apromi\
-se-id\x0f\x04data\xcc\0\0\x7f\x04\0\x10complete-promise\x01R\x01@\0\0\x0d\x04\0\x0f\
-get-oplog-index\x01S\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-index\x01\
-T\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01U\x04\0\x14mark-begin-ope\
-ration\x01S\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01V\x01@\0\0\
-\x18\x04\0\x10get-retry-policy\x01W\x01@\x01\x10new-retry-policy\x18\x01\0\x04\0\
-\x10set-retry-policy\x01X\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01Y\
-\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-leve\
-l\x01Z\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01[\x01@\x01\x0aidempotent\x7f\
-\x01\0\x04\0\x14set-idempotence-mode\x01\\\x01@\0\0\x05\x04\0\x18generate-idempo\
-tency-key\x01]\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
-\0\x0cupdate-agent\x01^\x01@\0\0;\x04\0\x11get-self-metadata\x01_\x01k;\x01@\x01\
-\x08agent-id\x09\0\xe0\0\x04\0\x12get-agent-metadata\x01a\x01@\x03\x0fsource-age\
+-agent-target\x03\0=\x01r\x01\x11forked-phantom-id\x05\x04\0\x0cfork-details\x03\
+\0?\x01q\x02\x08original\x01\xc0\0\0\x06forked\x01\xc0\0\0\x04\0\x0bfork-result\x03\
+\0A\x04\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\
+\x06filter\xc4\0\x07precise\x7f\0\xc5\0\x04\0\x17[constructor]get-agents\x01F\x01\
+h<\x01p;\x01k\xc8\0\x01@\x01\x04self\xc7\0\0\xc9\0\x04\0\x1b[method]get-agents.g\
+et-next\x01J\x01hC\x01i\x0b\x01@\x01\x04self\xcb\0\0\xcc\0\x04\0$[method]get-pro\
+mise-result.subscribe\x01M\x01p}\x01k\xce\0\x01@\x01\x04self\xcb\0\0\xcf\0\x04\0\
+\x1e[method]get-promise-result.get\x01P\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01\
+Q\x01iC\x01@\x01\x0apromise-id\x0f\0\xd2\0\x04\0\x0bget-promise\x01S\x01@\x02\x0a\
+promise-id\x0f\x04data\xce\0\0\x7f\x04\0\x10complete-promise\x01T\x01@\0\0\x0d\x04\
+\0\x0fget-oplog-index\x01U\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-in\
+dex\x01V\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01W\x04\0\x14mark-be\
+gin-operation\x01U\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01X\x01\
+@\0\0\x18\x04\0\x10get-retry-policy\x01Y\x01@\x01\x10new-retry-policy\x18\x01\0\x04\
+\0\x10set-retry-policy\x01Z\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01\
+[\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-lev\
+el\x01\\\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01]\x01@\x01\x0aidempotent\x7f\
+\x01\0\x04\0\x14set-idempotence-mode\x01^\x01@\0\0\x05\x04\0\x18generate-idempot\
+ency-key\x01_\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
+\0\x0cupdate-agent\x01`\x01@\0\0;\x04\0\x11get-self-metadata\x01a\x01k;\x01@\x01\
+\x08agent-id\x09\0\xe2\0\x04\0\x12get-agent-metadata\x01c\x01@\x03\x0fsource-age\
 nt-id\x09\x0ftarget-agent-id\x09\x11oplog-idx-cut-off\x0d\x01\0\x04\0\x0afork-ag\
-ent\x01b\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
-c\x01k\x03\x01@\x01\x13component-references\0\xe4\0\x04\0\x14resolve-component-i\
-d\x01e\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe6\0\x04\0\x10\
-resolve-agent-id\x01g\x04\0\x17resolve-agent-id-strict\x01g\x01@\x01\x08new-name\
-s\0\xc0\0\x04\0\x04fork\x01h\x03\0\x14golem:api/host@1.3.0\x05\x0b\x01B\x04\x04\0\
-\x05error\x03\x01\x01h\0\x01@\x01\x04self\x01\0s\x04\0\x1d[method]error.to-debug\
--string\x01\x02\x03\0\x13wasi:io/error@0.2.3\x05\x0c\x02\x03\0\x05\x05error\x01B\
-(\x02\x03\x02\x01\x0d\x04\0\x05error\x03\0\0\x02\x03\x02\x01\x01\x04\0\x08pollab\
-le\x03\0\x02\x01i\x01\x01q\x02\x15last-operation-failed\x01\x04\0\x06closed\0\0\x04\
-\0\x0cstream-error\x03\0\x05\x04\0\x0cinput-stream\x03\x01\x04\0\x0doutput-strea\
-m\x03\x01\x01h\x07\x01p}\x01j\x01\x0a\x01\x06\x01@\x02\x04self\x09\x03lenw\0\x0b\
-\x04\0\x19[method]input-stream.read\x01\x0c\x04\0\"[method]input-stream.blocking\
--read\x01\x0c\x01j\x01w\x01\x06\x01@\x02\x04self\x09\x03lenw\0\x0d\x04\0\x19[met\
-hod]input-stream.skip\x01\x0e\x04\0\"[method]input-stream.blocking-skip\x01\x0e\x01\
-i\x03\x01@\x01\x04self\x09\0\x0f\x04\0\x1e[method]input-stream.subscribe\x01\x10\
-\x01h\x08\x01@\x01\x04self\x11\0\x0d\x04\0![method]output-stream.check-write\x01\
-\x12\x01j\0\x01\x06\x01@\x02\x04self\x11\x08contents\x0a\0\x13\x04\0\x1b[method]\
-output-stream.write\x01\x14\x04\0.[method]output-stream.blocking-write-and-flush\
-\x01\x14\x01@\x01\x04self\x11\0\x13\x04\0\x1b[method]output-stream.flush\x01\x15\
-\x04\0$[method]output-stream.blocking-flush\x01\x15\x01@\x01\x04self\x11\0\x0f\x04\
-\0\x1f[method]output-stream.subscribe\x01\x16\x01@\x02\x04self\x11\x03lenw\0\x13\
-\x04\0\"[method]output-stream.write-zeroes\x01\x17\x04\05[method]output-stream.b\
-locking-write-zeroes-and-flush\x01\x17\x01@\x03\x04self\x11\x03src\x09\x03lenw\0\
-\x0d\x04\0\x1c[method]output-stream.splice\x01\x18\x04\0%[method]output-stream.b\
-locking-splice\x01\x18\x03\0\x15wasi:io/streams@0.2.3\x05\x0e\x02\x03\0\x06\x0ci\
-nput-stream\x02\x03\0\x06\x0doutput-stream\x01B\xc1\x01\x02\x03\x02\x01\x06\x04\0\
-\x08duration\x03\0\0\x02\x03\x02\x01\x0f\x04\0\x0cinput-stream\x03\0\x02\x02\x03\
-\x02\x01\x10\x04\0\x0doutput-stream\x03\0\x04\x02\x03\x02\x01\x0d\x04\0\x08io-er\
-ror\x03\0\x06\x02\x03\x02\x01\x01\x04\0\x08pollable\x03\0\x08\x01q\x0a\x03get\0\0\
-\x04head\0\0\x04post\0\0\x03put\0\0\x06delete\0\0\x07connect\0\0\x07options\0\0\x05\
-trace\0\0\x05patch\0\0\x05other\x01s\0\x04\0\x06method\x03\0\x0a\x01q\x03\x04HTT\
-P\0\0\x05HTTPS\0\0\x05other\x01s\0\x04\0\x06scheme\x03\0\x0c\x01ks\x01k{\x01r\x02\
-\x05rcode\x0e\x09info-code\x0f\x04\0\x11DNS-error-payload\x03\0\x10\x01k}\x01r\x02\
-\x08alert-id\x12\x0dalert-message\x0e\x04\0\x1aTLS-alert-received-payload\x03\0\x13\
-\x01ky\x01r\x02\x0afield-name\x0e\x0afield-size\x15\x04\0\x12field-size-payload\x03\
-\0\x16\x01kw\x01k\x17\x01q'\x0bDNS-timeout\0\0\x09DNS-error\x01\x11\0\x15destina\
-tion-not-found\0\0\x17destination-unavailable\0\0\x19destination-IP-prohibited\0\
-\0\x19destination-IP-unroutable\0\0\x12connection-refused\0\0\x15connection-term\
-inated\0\0\x12connection-timeout\0\0\x17connection-read-timeout\0\0\x18connectio\
-n-write-timeout\0\0\x18connection-limit-reached\0\0\x12TLS-protocol-error\0\0\x15\
-TLS-certificate-error\0\0\x12TLS-alert-received\x01\x14\0\x13HTTP-request-denied\
-\0\0\x1cHTTP-request-length-required\0\0\x16HTTP-request-body-size\x01\x18\0\x1b\
-HTTP-request-method-invalid\0\0\x18HTTP-request-URI-invalid\0\0\x19HTTP-request-\
-URI-too-long\0\0\x20HTTP-request-header-section-size\x01\x15\0\x18HTTP-request-h\
-eader-size\x01\x19\0!HTTP-request-trailer-section-size\x01\x15\0\x19HTTP-request\
--trailer-size\x01\x17\0\x18HTTP-response-incomplete\0\0!HTTP-response-header-sec\
-tion-size\x01\x15\0\x19HTTP-response-header-size\x01\x17\0\x17HTTP-response-body\
--size\x01\x18\0\"HTTP-response-trailer-section-size\x01\x15\0\x1aHTTP-response-t\
-railer-size\x01\x17\0\x1dHTTP-response-transfer-coding\x01\x0e\0\x1cHTTP-respons\
-e-content-coding\x01\x0e\0\x15HTTP-response-timeout\0\0\x13HTTP-upgrade-failed\0\
-\0\x13HTTP-protocol-error\0\0\x0dloop-detected\0\0\x13configuration-error\0\0\x0e\
-internal-error\x01\x0e\0\x04\0\x0aerror-code\x03\0\x1a\x01q\x03\x0einvalid-synta\
-x\0\0\x09forbidden\0\0\x09immutable\0\0\x04\0\x0cheader-error\x03\0\x1c\x01s\x04\
-\0\x09field-key\x03\0\x1e\x04\0\x0afield-name\x03\0\x1f\x01p}\x04\0\x0bfield-val\
-ue\x03\0!\x04\0\x06fields\x03\x01\x04\0\x07headers\x03\0#\x04\0\x08trailers\x03\0\
-#\x04\0\x10incoming-request\x03\x01\x04\0\x10outgoing-request\x03\x01\x04\0\x0fr\
-equest-options\x03\x01\x04\0\x11response-outparam\x03\x01\x01{\x04\0\x0bstatus-c\
-ode\x03\0*\x04\0\x11incoming-response\x03\x01\x04\0\x0dincoming-body\x03\x01\x04\
-\0\x0ffuture-trailers\x03\x01\x04\0\x11outgoing-response\x03\x01\x04\0\x0doutgoi\
-ng-body\x03\x01\x04\0\x18future-incoming-response\x03\x01\x01i#\x01@\0\02\x04\0\x13\
-[constructor]fields\x013\x01o\x02\x20\"\x01p4\x01j\x012\x01\x1d\x01@\x01\x07entr\
-ies5\06\x04\0\x18[static]fields.from-list\x017\x01h#\x01p\"\x01@\x02\x04self8\x04\
-name\x20\09\x04\0\x12[method]fields.get\x01:\x01@\x02\x04self8\x04name\x20\0\x7f\
-\x04\0\x12[method]fields.has\x01;\x01j\0\x01\x1d\x01@\x03\x04self8\x04name\x20\x05\
-value9\0<\x04\0\x12[method]fields.set\x01=\x01@\x02\x04self8\x04name\x20\0<\x04\0\
-\x15[method]fields.delete\x01>\x01@\x03\x04self8\x04name\x20\x05value\"\0<\x04\0\
-\x15[method]fields.append\x01?\x01@\x01\x04self8\05\x04\0\x16[method]fields.entr\
-ies\x01@\x01@\x01\x04self8\02\x04\0\x14[method]fields.clone\x01A\x01h&\x01@\x01\x04\
-self\xc2\0\0\x0b\x04\0\x1f[method]incoming-request.method\x01C\x01@\x01\x04self\xc2\
-\0\0\x0e\x04\0([method]incoming-request.path-with-query\x01D\x01k\x0d\x01@\x01\x04\
-self\xc2\0\0\xc5\0\x04\0\x1f[method]incoming-request.scheme\x01F\x04\0\"[method]\
-incoming-request.authority\x01D\x01i$\x01@\x01\x04self\xc2\0\0\xc7\0\x04\0\x20[m\
-ethod]incoming-request.headers\x01H\x01i-\x01j\x01\xc9\0\0\x01@\x01\x04self\xc2\0\
-\0\xca\0\x04\0\x20[method]incoming-request.consume\x01K\x01i'\x01@\x01\x07header\
-s\xc7\0\0\xcc\0\x04\0\x1d[constructor]outgoing-request\x01M\x01h'\x01i0\x01j\x01\
-\xcf\0\0\x01@\x01\x04self\xce\0\0\xd0\0\x04\0\x1d[method]outgoing-request.body\x01\
-Q\x01@\x01\x04self\xce\0\0\x0b\x04\0\x1f[method]outgoing-request.method\x01R\x01\
-j\0\0\x01@\x02\x04self\xce\0\x06method\x0b\0\xd3\0\x04\0#[method]outgoing-reques\
-t.set-method\x01T\x01@\x01\x04self\xce\0\0\x0e\x04\0([method]outgoing-request.pa\
-th-with-query\x01U\x01@\x02\x04self\xce\0\x0fpath-with-query\x0e\0\xd3\0\x04\0,[\
-method]outgoing-request.set-path-with-query\x01V\x01@\x01\x04self\xce\0\0\xc5\0\x04\
-\0\x1f[method]outgoing-request.scheme\x01W\x01@\x02\x04self\xce\0\x06scheme\xc5\0\
-\0\xd3\0\x04\0#[method]outgoing-request.set-scheme\x01X\x04\0\"[method]outgoing-\
-request.authority\x01U\x01@\x02\x04self\xce\0\x09authority\x0e\0\xd3\0\x04\0&[me\
-thod]outgoing-request.set-authority\x01Y\x01@\x01\x04self\xce\0\0\xc7\0\x04\0\x20\
-[method]outgoing-request.headers\x01Z\x01i(\x01@\0\0\xdb\0\x04\0\x1c[constructor\
-]request-options\x01\\\x01h(\x01k\x01\x01@\x01\x04self\xdd\0\0\xde\0\x04\0'[meth\
-od]request-options.connect-timeout\x01_\x01@\x02\x04self\xdd\0\x08duration\xde\0\
-\0\xd3\0\x04\0+[method]request-options.set-connect-timeout\x01`\x04\0*[method]re\
-quest-options.first-byte-timeout\x01_\x04\0.[method]request-options.set-first-by\
-te-timeout\x01`\x04\0-[method]request-options.between-bytes-timeout\x01_\x04\01[\
-method]request-options.set-between-bytes-timeout\x01`\x01i)\x01i/\x01j\x01\xe2\0\
-\x01\x1b\x01@\x02\x05param\xe1\0\x08response\xe3\0\x01\0\x04\0\x1d[static]respon\
-se-outparam.set\x01d\x01h,\x01@\x01\x04self\xe5\0\0+\x04\0\x20[method]incoming-r\
-esponse.status\x01f\x01@\x01\x04self\xe5\0\0\xc7\0\x04\0![method]incoming-respon\
-se.headers\x01g\x01@\x01\x04self\xe5\0\0\xca\0\x04\0![method]incoming-response.c\
-onsume\x01h\x01h-\x01i\x03\x01j\x01\xea\0\0\x01@\x01\x04self\xe9\0\0\xeb\0\x04\0\
-\x1c[method]incoming-body.stream\x01l\x01i.\x01@\x01\x04this\xc9\0\0\xed\0\x04\0\
-\x1c[static]incoming-body.finish\x01n\x01h.\x01i\x09\x01@\x01\x04self\xef\0\0\xf0\
-\0\x04\0![method]future-trailers.subscribe\x01q\x01i%\x01k\xf2\0\x01j\x01\xf3\0\x01\
-\x1b\x01j\x01\xf4\0\0\x01k\xf5\0\x01@\x01\x04self\xef\0\0\xf6\0\x04\0\x1b[method\
-]future-trailers.get\x01w\x01@\x01\x07headers\xc7\0\0\xe2\0\x04\0\x1e[constructo\
-r]outgoing-response\x01x\x01h/\x01@\x01\x04self\xf9\0\0+\x04\0%[method]outgoing-\
-response.status-code\x01z\x01@\x02\x04self\xf9\0\x0bstatus-code+\0\xd3\0\x04\0)[\
-method]outgoing-response.set-status-code\x01{\x01@\x01\x04self\xf9\0\0\xc7\0\x04\
-\0![method]outgoing-response.headers\x01|\x01@\x01\x04self\xf9\0\0\xd0\0\x04\0\x1e\
-[method]outgoing-response.body\x01}\x01h0\x01i\x05\x01j\x01\xff\0\0\x01@\x01\x04\
-self\xfe\0\0\x80\x01\x04\0\x1b[method]outgoing-body.write\x01\x81\x01\x01j\0\x01\
-\x1b\x01@\x02\x04this\xcf\0\x08trailers\xf3\0\0\x82\x01\x04\0\x1c[static]outgoin\
-g-body.finish\x01\x83\x01\x01h1\x01@\x01\x04self\x84\x01\0\xf0\0\x04\0*[method]f\
-uture-incoming-response.subscribe\x01\x85\x01\x01i,\x01j\x01\x86\x01\x01\x1b\x01\
-j\x01\x87\x01\0\x01k\x88\x01\x01@\x01\x04self\x84\x01\0\x89\x01\x04\0$[method]fu\
-ture-incoming-response.get\x01\x8a\x01\x01h\x07\x01k\x1b\x01@\x01\x03err\x8b\x01\
-\0\x8c\x01\x04\0\x0fhttp-error-code\x01\x8d\x01\x03\0\x15wasi:http/types@0.2.3\x05\
-\x11\x02\x03\0\x07\x10outgoing-request\x02\x03\0\x07\x0frequest-options\x02\x03\0\
-\x07\x18future-incoming-response\x02\x03\0\x07\x0aerror-code\x01B\x0f\x02\x03\x02\
-\x01\x12\x04\0\x10outgoing-request\x03\0\0\x02\x03\x02\x01\x13\x04\0\x0frequest-\
-options\x03\0\x02\x02\x03\x02\x01\x14\x04\0\x18future-incoming-response\x03\0\x04\
-\x02\x03\x02\x01\x15\x04\0\x0aerror-code\x03\0\x06\x01i\x01\x01i\x03\x01k\x09\x01\
-i\x05\x01j\x01\x0b\x01\x07\x01@\x02\x07request\x08\x07options\x0a\0\x0c\x04\0\x06\
-handle\x01\x0d\x03\0\x20wasi:http/outgoing-handler@0.2.3\x05\x16\x02\x03\0\x04\x0c\
-component-id\x02\x03\0\x04\x08agent-id\x02\x03\0\x04\x11component-version\x02\x03\
-\0\x04\x0bupdate-mode\x02\x03\0\x04\x10agent-any-filter\x02\x03\0\x04\x0eagent-m\
-etadata\x02\x03\0\x04\x04uuid\x01B'\x02\x03\x02\x01\x17\x04\0\x0ccomponent-id\x03\
-\0\0\x02\x03\x02\x01\x18\x04\0\x08agent-id\x03\0\x02\x02\x03\x02\x01\x19\x04\0\x11\
-component-version\x03\0\x04\x02\x03\x02\x01\x1a\x04\0\x0bupdate-mode\x03\0\x06\x02\
-\x03\x02\x01\x1b\x04\0\x10agent-any-filter\x03\0\x08\x02\x03\x02\x01\x1c\x04\0\x0e\
-agent-metadata\x03\0\x0a\x02\x03\x02\x01\x1d\x04\0\x04uuid\x03\0\x0c\x01@\0\0w\x04\
-\0\x04jump\x01\x0e\x01@\x01\x0bmax-retriesw\x01\0\x04\0\x1cfail-with-custom-max-\
-retries\x01\x0f\x01@\x01\x08replicas}\x01\0\x04\0\x0fexplicit-commit\x01\x10\x01\
-@\0\x01\0\x04\0\x0datomic-region\x01\x11\x01@\x01\x07enabled\x7f\x01\0\x04\0\x10\
-idempotence-flag\x01\x12\x04\0\x0fpersist-nothing\x01\x11\x01k\x09\x01p\x0b\x01@\
-\x03\x0ccomponent-id\x01\x06filter\x13\x07precise\x7f\0\x14\x04\0\x0bget-workers\
-\x01\x15\x01@\0\0\x0b\x04\0\x11get-self-metadata\x01\x16\x01k\x0b\x01@\x01\x08ag\
-ent-id\x03\0\x17\x04\0\x13get-worker-metadata\x01\x18\x01@\x03\x08agent-id\x03\x11\
-component-version\x05\x0bupdate-mode\x07\x01\0\x04\0\x0dupdate-worker\x01\x19\x01\
-o\x02\x0d\x0d\x01@\0\0\x1a\x04\0\x19generate-idempotency-keys\x01\x1b\x04\0\x0cg\
-olem:it/api\x05\x1e\x04\0\x18golem:it/runtime-service\x04\0\x0b\x15\x01\0\x0frun\
-time-service\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x07\
-0.227.1\x10wit-bindgen-rust\x060.41.0";
+ent\x01d\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
+e\x01k\x03\x01@\x01\x13component-references\0\xe6\0\x04\0\x14resolve-component-i\
+d\x01g\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe8\0\x04\0\x10\
+resolve-agent-id\x01i\x04\0\x17resolve-agent-id-strict\x01i\x01@\0\0\xc2\0\x04\0\
+\x04fork\x01j\x03\0\x14golem:api/host@1.3.0\x05\x0b\x01B\x04\x04\0\x05error\x03\x01\
+\x01h\0\x01@\x01\x04self\x01\0s\x04\0\x1d[method]error.to-debug-string\x01\x02\x03\
+\0\x13wasi:io/error@0.2.3\x05\x0c\x02\x03\0\x05\x05error\x01B(\x02\x03\x02\x01\x0d\
+\x04\0\x05error\x03\0\0\x02\x03\x02\x01\x01\x04\0\x08pollable\x03\0\x02\x01i\x01\
+\x01q\x02\x15last-operation-failed\x01\x04\0\x06closed\0\0\x04\0\x0cstream-error\
+\x03\0\x05\x04\0\x0cinput-stream\x03\x01\x04\0\x0doutput-stream\x03\x01\x01h\x07\
+\x01p}\x01j\x01\x0a\x01\x06\x01@\x02\x04self\x09\x03lenw\0\x0b\x04\0\x19[method]\
+input-stream.read\x01\x0c\x04\0\"[method]input-stream.blocking-read\x01\x0c\x01j\
+\x01w\x01\x06\x01@\x02\x04self\x09\x03lenw\0\x0d\x04\0\x19[method]input-stream.s\
+kip\x01\x0e\x04\0\"[method]input-stream.blocking-skip\x01\x0e\x01i\x03\x01@\x01\x04\
+self\x09\0\x0f\x04\0\x1e[method]input-stream.subscribe\x01\x10\x01h\x08\x01@\x01\
+\x04self\x11\0\x0d\x04\0![method]output-stream.check-write\x01\x12\x01j\0\x01\x06\
+\x01@\x02\x04self\x11\x08contents\x0a\0\x13\x04\0\x1b[method]output-stream.write\
+\x01\x14\x04\0.[method]output-stream.blocking-write-and-flush\x01\x14\x01@\x01\x04\
+self\x11\0\x13\x04\0\x1b[method]output-stream.flush\x01\x15\x04\0$[method]output\
+-stream.blocking-flush\x01\x15\x01@\x01\x04self\x11\0\x0f\x04\0\x1f[method]outpu\
+t-stream.subscribe\x01\x16\x01@\x02\x04self\x11\x03lenw\0\x13\x04\0\"[method]out\
+put-stream.write-zeroes\x01\x17\x04\05[method]output-stream.blocking-write-zeroe\
+s-and-flush\x01\x17\x01@\x03\x04self\x11\x03src\x09\x03lenw\0\x0d\x04\0\x1c[meth\
+od]output-stream.splice\x01\x18\x04\0%[method]output-stream.blocking-splice\x01\x18\
+\x03\0\x15wasi:io/streams@0.2.3\x05\x0e\x02\x03\0\x06\x0cinput-stream\x02\x03\0\x06\
+\x0doutput-stream\x01B\xc1\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\
+\x03\x02\x01\x0f\x04\0\x0cinput-stream\x03\0\x02\x02\x03\x02\x01\x10\x04\0\x0dou\
+tput-stream\x03\0\x04\x02\x03\x02\x01\x0d\x04\0\x08io-error\x03\0\x06\x02\x03\x02\
+\x01\x01\x04\0\x08pollable\x03\0\x08\x01q\x0a\x03get\0\0\x04head\0\0\x04post\0\0\
+\x03put\0\0\x06delete\0\0\x07connect\0\0\x07options\0\0\x05trace\0\0\x05patch\0\0\
+\x05other\x01s\0\x04\0\x06method\x03\0\x0a\x01q\x03\x04HTTP\0\0\x05HTTPS\0\0\x05\
+other\x01s\0\x04\0\x06scheme\x03\0\x0c\x01ks\x01k{\x01r\x02\x05rcode\x0e\x09info\
+-code\x0f\x04\0\x11DNS-error-payload\x03\0\x10\x01k}\x01r\x02\x08alert-id\x12\x0d\
+alert-message\x0e\x04\0\x1aTLS-alert-received-payload\x03\0\x13\x01ky\x01r\x02\x0a\
+field-name\x0e\x0afield-size\x15\x04\0\x12field-size-payload\x03\0\x16\x01kw\x01\
+k\x17\x01q'\x0bDNS-timeout\0\0\x09DNS-error\x01\x11\0\x15destination-not-found\0\
+\0\x17destination-unavailable\0\0\x19destination-IP-prohibited\0\0\x19destinatio\
+n-IP-unroutable\0\0\x12connection-refused\0\0\x15connection-terminated\0\0\x12co\
+nnection-timeout\0\0\x17connection-read-timeout\0\0\x18connection-write-timeout\0\
+\0\x18connection-limit-reached\0\0\x12TLS-protocol-error\0\0\x15TLS-certificate-\
+error\0\0\x12TLS-alert-received\x01\x14\0\x13HTTP-request-denied\0\0\x1cHTTP-req\
+uest-length-required\0\0\x16HTTP-request-body-size\x01\x18\0\x1bHTTP-request-met\
+hod-invalid\0\0\x18HTTP-request-URI-invalid\0\0\x19HTTP-request-URI-too-long\0\0\
+\x20HTTP-request-header-section-size\x01\x15\0\x18HTTP-request-header-size\x01\x19\
+\0!HTTP-request-trailer-section-size\x01\x15\0\x19HTTP-request-trailer-size\x01\x17\
+\0\x18HTTP-response-incomplete\0\0!HTTP-response-header-section-size\x01\x15\0\x19\
+HTTP-response-header-size\x01\x17\0\x17HTTP-response-body-size\x01\x18\0\"HTTP-r\
+esponse-trailer-section-size\x01\x15\0\x1aHTTP-response-trailer-size\x01\x17\0\x1d\
+HTTP-response-transfer-coding\x01\x0e\0\x1cHTTP-response-content-coding\x01\x0e\0\
+\x15HTTP-response-timeout\0\0\x13HTTP-upgrade-failed\0\0\x13HTTP-protocol-error\0\
+\0\x0dloop-detected\0\0\x13configuration-error\0\0\x0einternal-error\x01\x0e\0\x04\
+\0\x0aerror-code\x03\0\x1a\x01q\x03\x0einvalid-syntax\0\0\x09forbidden\0\0\x09im\
+mutable\0\0\x04\0\x0cheader-error\x03\0\x1c\x01s\x04\0\x09field-key\x03\0\x1e\x04\
+\0\x0afield-name\x03\0\x1f\x01p}\x04\0\x0bfield-value\x03\0!\x04\0\x06fields\x03\
+\x01\x04\0\x07headers\x03\0#\x04\0\x08trailers\x03\0#\x04\0\x10incoming-request\x03\
+\x01\x04\0\x10outgoing-request\x03\x01\x04\0\x0frequest-options\x03\x01\x04\0\x11\
+response-outparam\x03\x01\x01{\x04\0\x0bstatus-code\x03\0*\x04\0\x11incoming-res\
+ponse\x03\x01\x04\0\x0dincoming-body\x03\x01\x04\0\x0ffuture-trailers\x03\x01\x04\
+\0\x11outgoing-response\x03\x01\x04\0\x0doutgoing-body\x03\x01\x04\0\x18future-i\
+ncoming-response\x03\x01\x01i#\x01@\0\02\x04\0\x13[constructor]fields\x013\x01o\x02\
+\x20\"\x01p4\x01j\x012\x01\x1d\x01@\x01\x07entries5\06\x04\0\x18[static]fields.f\
+rom-list\x017\x01h#\x01p\"\x01@\x02\x04self8\x04name\x20\09\x04\0\x12[method]fie\
+lds.get\x01:\x01@\x02\x04self8\x04name\x20\0\x7f\x04\0\x12[method]fields.has\x01\
+;\x01j\0\x01\x1d\x01@\x03\x04self8\x04name\x20\x05value9\0<\x04\0\x12[method]fie\
+lds.set\x01=\x01@\x02\x04self8\x04name\x20\0<\x04\0\x15[method]fields.delete\x01\
+>\x01@\x03\x04self8\x04name\x20\x05value\"\0<\x04\0\x15[method]fields.append\x01\
+?\x01@\x01\x04self8\05\x04\0\x16[method]fields.entries\x01@\x01@\x01\x04self8\02\
+\x04\0\x14[method]fields.clone\x01A\x01h&\x01@\x01\x04self\xc2\0\0\x0b\x04\0\x1f\
+[method]incoming-request.method\x01C\x01@\x01\x04self\xc2\0\0\x0e\x04\0([method]\
+incoming-request.path-with-query\x01D\x01k\x0d\x01@\x01\x04self\xc2\0\0\xc5\0\x04\
+\0\x1f[method]incoming-request.scheme\x01F\x04\0\"[method]incoming-request.autho\
+rity\x01D\x01i$\x01@\x01\x04self\xc2\0\0\xc7\0\x04\0\x20[method]incoming-request\
+.headers\x01H\x01i-\x01j\x01\xc9\0\0\x01@\x01\x04self\xc2\0\0\xca\0\x04\0\x20[me\
+thod]incoming-request.consume\x01K\x01i'\x01@\x01\x07headers\xc7\0\0\xcc\0\x04\0\
+\x1d[constructor]outgoing-request\x01M\x01h'\x01i0\x01j\x01\xcf\0\0\x01@\x01\x04\
+self\xce\0\0\xd0\0\x04\0\x1d[method]outgoing-request.body\x01Q\x01@\x01\x04self\xce\
+\0\0\x0b\x04\0\x1f[method]outgoing-request.method\x01R\x01j\0\0\x01@\x02\x04self\
+\xce\0\x06method\x0b\0\xd3\0\x04\0#[method]outgoing-request.set-method\x01T\x01@\
+\x01\x04self\xce\0\0\x0e\x04\0([method]outgoing-request.path-with-query\x01U\x01\
+@\x02\x04self\xce\0\x0fpath-with-query\x0e\0\xd3\0\x04\0,[method]outgoing-reques\
+t.set-path-with-query\x01V\x01@\x01\x04self\xce\0\0\xc5\0\x04\0\x1f[method]outgo\
+ing-request.scheme\x01W\x01@\x02\x04self\xce\0\x06scheme\xc5\0\0\xd3\0\x04\0#[me\
+thod]outgoing-request.set-scheme\x01X\x04\0\"[method]outgoing-request.authority\x01\
+U\x01@\x02\x04self\xce\0\x09authority\x0e\0\xd3\0\x04\0&[method]outgoing-request\
+.set-authority\x01Y\x01@\x01\x04self\xce\0\0\xc7\0\x04\0\x20[method]outgoing-req\
+uest.headers\x01Z\x01i(\x01@\0\0\xdb\0\x04\0\x1c[constructor]request-options\x01\
+\\\x01h(\x01k\x01\x01@\x01\x04self\xdd\0\0\xde\0\x04\0'[method]request-options.c\
+onnect-timeout\x01_\x01@\x02\x04self\xdd\0\x08duration\xde\0\0\xd3\0\x04\0+[meth\
+od]request-options.set-connect-timeout\x01`\x04\0*[method]request-options.first-\
+byte-timeout\x01_\x04\0.[method]request-options.set-first-byte-timeout\x01`\x04\0\
+-[method]request-options.between-bytes-timeout\x01_\x04\01[method]request-option\
+s.set-between-bytes-timeout\x01`\x01i)\x01i/\x01j\x01\xe2\0\x01\x1b\x01@\x02\x05\
+param\xe1\0\x08response\xe3\0\x01\0\x04\0\x1d[static]response-outparam.set\x01d\x01\
+h,\x01@\x01\x04self\xe5\0\0+\x04\0\x20[method]incoming-response.status\x01f\x01@\
+\x01\x04self\xe5\0\0\xc7\0\x04\0![method]incoming-response.headers\x01g\x01@\x01\
+\x04self\xe5\0\0\xca\0\x04\0![method]incoming-response.consume\x01h\x01h-\x01i\x03\
+\x01j\x01\xea\0\0\x01@\x01\x04self\xe9\0\0\xeb\0\x04\0\x1c[method]incoming-body.\
+stream\x01l\x01i.\x01@\x01\x04this\xc9\0\0\xed\0\x04\0\x1c[static]incoming-body.\
+finish\x01n\x01h.\x01i\x09\x01@\x01\x04self\xef\0\0\xf0\0\x04\0![method]future-t\
+railers.subscribe\x01q\x01i%\x01k\xf2\0\x01j\x01\xf3\0\x01\x1b\x01j\x01\xf4\0\0\x01\
+k\xf5\0\x01@\x01\x04self\xef\0\0\xf6\0\x04\0\x1b[method]future-trailers.get\x01w\
+\x01@\x01\x07headers\xc7\0\0\xe2\0\x04\0\x1e[constructor]outgoing-response\x01x\x01\
+h/\x01@\x01\x04self\xf9\0\0+\x04\0%[method]outgoing-response.status-code\x01z\x01\
+@\x02\x04self\xf9\0\x0bstatus-code+\0\xd3\0\x04\0)[method]outgoing-response.set-\
+status-code\x01{\x01@\x01\x04self\xf9\0\0\xc7\0\x04\0![method]outgoing-response.\
+headers\x01|\x01@\x01\x04self\xf9\0\0\xd0\0\x04\0\x1e[method]outgoing-response.b\
+ody\x01}\x01h0\x01i\x05\x01j\x01\xff\0\0\x01@\x01\x04self\xfe\0\0\x80\x01\x04\0\x1b\
+[method]outgoing-body.write\x01\x81\x01\x01j\0\x01\x1b\x01@\x02\x04this\xcf\0\x08\
+trailers\xf3\0\0\x82\x01\x04\0\x1c[static]outgoing-body.finish\x01\x83\x01\x01h1\
+\x01@\x01\x04self\x84\x01\0\xf0\0\x04\0*[method]future-incoming-response.subscri\
+be\x01\x85\x01\x01i,\x01j\x01\x86\x01\x01\x1b\x01j\x01\x87\x01\0\x01k\x88\x01\x01\
+@\x01\x04self\x84\x01\0\x89\x01\x04\0$[method]future-incoming-response.get\x01\x8a\
+\x01\x01h\x07\x01k\x1b\x01@\x01\x03err\x8b\x01\0\x8c\x01\x04\0\x0fhttp-error-cod\
+e\x01\x8d\x01\x03\0\x15wasi:http/types@0.2.3\x05\x11\x02\x03\0\x07\x10outgoing-r\
+equest\x02\x03\0\x07\x0frequest-options\x02\x03\0\x07\x18future-incoming-respons\
+e\x02\x03\0\x07\x0aerror-code\x01B\x0f\x02\x03\x02\x01\x12\x04\0\x10outgoing-req\
+uest\x03\0\0\x02\x03\x02\x01\x13\x04\0\x0frequest-options\x03\0\x02\x02\x03\x02\x01\
+\x14\x04\0\x18future-incoming-response\x03\0\x04\x02\x03\x02\x01\x15\x04\0\x0aer\
+ror-code\x03\0\x06\x01i\x01\x01i\x03\x01k\x09\x01i\x05\x01j\x01\x0b\x01\x07\x01@\
+\x02\x07request\x08\x07options\x0a\0\x0c\x04\0\x06handle\x01\x0d\x03\0\x20wasi:h\
+ttp/outgoing-handler@0.2.3\x05\x16\x02\x03\0\x04\x0ccomponent-id\x02\x03\0\x04\x08\
+agent-id\x02\x03\0\x04\x11component-version\x02\x03\0\x04\x0bupdate-mode\x02\x03\
+\0\x04\x10agent-any-filter\x02\x03\0\x04\x0eagent-metadata\x02\x03\0\x04\x04uuid\
+\x01B'\x02\x03\x02\x01\x17\x04\0\x0ccomponent-id\x03\0\0\x02\x03\x02\x01\x18\x04\
+\0\x08agent-id\x03\0\x02\x02\x03\x02\x01\x19\x04\0\x11component-version\x03\0\x04\
+\x02\x03\x02\x01\x1a\x04\0\x0bupdate-mode\x03\0\x06\x02\x03\x02\x01\x1b\x04\0\x10\
+agent-any-filter\x03\0\x08\x02\x03\x02\x01\x1c\x04\0\x0eagent-metadata\x03\0\x0a\
+\x02\x03\x02\x01\x1d\x04\0\x04uuid\x03\0\x0c\x01@\0\0w\x04\0\x04jump\x01\x0e\x01\
+@\x01\x0bmax-retriesw\x01\0\x04\0\x1cfail-with-custom-max-retries\x01\x0f\x01@\x01\
+\x08replicas}\x01\0\x04\0\x0fexplicit-commit\x01\x10\x01@\0\x01\0\x04\0\x0datomi\
+c-region\x01\x11\x01@\x01\x07enabled\x7f\x01\0\x04\0\x10idempotence-flag\x01\x12\
+\x04\0\x0fpersist-nothing\x01\x11\x01k\x09\x01p\x0b\x01@\x03\x0ccomponent-id\x01\
+\x06filter\x13\x07precise\x7f\0\x14\x04\0\x0bget-workers\x01\x15\x01@\0\0\x0b\x04\
+\0\x11get-self-metadata\x01\x16\x01k\x0b\x01@\x01\x08agent-id\x03\0\x17\x04\0\x13\
+get-worker-metadata\x01\x18\x01@\x03\x08agent-id\x03\x11component-version\x05\x0b\
+update-mode\x07\x01\0\x04\0\x0dupdate-worker\x01\x19\x01o\x02\x0d\x0d\x01@\0\0\x1a\
+\x04\0\x19generate-idempotency-keys\x01\x1b\x04\0\x0cgolem:it/api\x05\x1e\x04\0\x18\
+golem:it/runtime-service\x04\0\x0b\x15\x01\0\x0fruntime-service\x03\0\0\0G\x09pr\
+oducers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rust\x06\
+0.41.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {
diff --git a/test-components/shopping-cart-resource.wasm b/test-components/shopping-cart-resource.wasm
index 3395961165..8647a4506b 100755
Binary files a/test-components/shopping-cart-resource.wasm and b/test-components/shopping-cart-resource.wasm differ
diff --git a/test-components/shopping-cart.wasm b/test-components/shopping-cart.wasm
index f6e983bfd0..4496585d77 100644
Binary files a/test-components/shopping-cart.wasm and b/test-components/shopping-cart.wasm differ
diff --git a/test-components/shopping-cart/src/bindings.rs b/test-components/shopping-cart/src/bindings.rs
index 83eb4699d7..e07a01579c 100644
--- a/test-components/shopping-cart/src/bindings.rs
+++ b/test-components/shopping-cart/src/bindings.rs
@@ -588,14 +588,31 @@ pub mod golem {
                     }
                 }
             }
-            /// Indicates which agent the code is running on after `fork`
-            #[repr(u8)]
-            #[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+            /// Details about the fork result
+            #[repr(C)]
+            #[derive(Clone, Copy)]
+            pub struct ForkDetails {
+                pub forked_phantom_id: Uuid,
+            }
+            impl ::core::fmt::Debug for ForkDetails {
+                fn fmt(
+                    &self,
+                    f: &mut ::core::fmt::Formatter<'_>,
+                ) -> ::core::fmt::Result {
+                    f.debug_struct("ForkDetails")
+                        .field("forked-phantom-id", &self.forked_phantom_id)
+                        .finish()
+                }
+            }
+            /// Indicates which agent the code is running on after `fork`.
+            /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+            /// created agent.
+            #[derive(Clone, Copy)]
             pub enum ForkResult {
                 /// The original agent that called `fork`
-                Original,
+                Original(ForkDetails),
                 /// The new agent
-                Forked,
+                Forked(ForkDetails),
             }
             impl ::core::fmt::Debug for ForkResult {
                 fn fmt(
@@ -603,28 +620,15 @@ pub mod golem {
                     f: &mut ::core::fmt::Formatter<'_>,
                 ) -> ::core::fmt::Result {
                     match self {
-                        ForkResult::Original => {
-                            f.debug_tuple("ForkResult::Original").finish()
+                        ForkResult::Original(e) => {
+                            f.debug_tuple("ForkResult::Original").field(e).finish()
                         }
-                        ForkResult::Forked => {
-                            f.debug_tuple("ForkResult::Forked").finish()
+                        ForkResult::Forked(e) => {
+                            f.debug_tuple("ForkResult::Forked").field(e).finish()
                         }
                     }
                 }
             }
-            impl ForkResult {
-                #[doc(hidden)]
-                pub unsafe fn _lift(val: u8) -> ForkResult {
-                    if !cfg!(debug_assertions) {
-                        return ::core::mem::transmute(val);
-                    }
-                    match val {
-                        0 => ForkResult::Original,
-                        1 => ForkResult::Forked,
-                        _ => panic!("invalid enum discriminant"),
-                    }
-                }
-            }
             #[derive(Debug)]
             #[repr(transparent)]
             pub struct GetPromiseResult {
@@ -2502,26 +2506,59 @@ pub mod golem {
                 }
             }
             #[allow(unused_unsafe, clippy::all)]
-            /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-            /// and this agent continues running as well. The return value is going to be different in this agent and
-            /// the forked agent.
-            pub fn fork(new_name: &str) -> ForkResult {
+            /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+            /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+            /// both sides. The newly created agent continues running from the same point, but the return value is
+            /// going to be different in this agent and the forked agent.
+            pub fn fork() -> ForkResult {
                 unsafe {
-                    let vec0 = new_name;
-                    let ptr0 = vec0.as_ptr().cast::<u8>();
-                    let len0 = vec0.len();
+                    #[repr(align(8))]
+                    struct RetArea([::core::mem::MaybeUninit<u8>; 24]);
+                    let mut ret_area = RetArea([::core::mem::MaybeUninit::uninit(); 24]);
+                    let ptr0 = ret_area.0.as_mut_ptr().cast::<u8>();
                     #[cfg(target_arch = "wasm32")]
                     #[link(wasm_import_module = "golem:api/host@1.3.0")]
                     unsafe extern "C" {
                         #[link_name = "fork"]
-                        fn wit_import1(_: *mut u8, _: usize) -> i32;
+                        fn wit_import1(_: *mut u8);
                     }
                     #[cfg(not(target_arch = "wasm32"))]
-                    unsafe extern "C" fn wit_import1(_: *mut u8, _: usize) -> i32 {
+                    unsafe extern "C" fn wit_import1(_: *mut u8) {
                         unreachable!()
                     }
-                    let ret = unsafe { wit_import1(ptr0.cast_mut(), len0) };
-                    ForkResult::_lift(ret as u8)
+                    unsafe { wit_import1(ptr0) };
+                    let l2 = i32::from(*ptr0.add(0).cast::<u8>());
+                    let v7 = match l2 {
+                        0 => {
+                            let e7 = {
+                                let l3 = *ptr0.add(8).cast::<i64>();
+                                let l4 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l3 as u64,
+                                        low_bits: l4 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Original(e7)
+                        }
+                        n => {
+                            debug_assert_eq!(n, 1, "invalid enum discriminant");
+                            let e7 = {
+                                let l5 = *ptr0.add(8).cast::<i64>();
+                                let l6 = *ptr0.add(16).cast::<i64>();
+                                ForkDetails {
+                                    forked_phantom_id: super::super::super::golem::rpc::types::Uuid {
+                                        high_bits: l5 as u64,
+                                        low_bits: l6 as u64,
+                                    },
+                                }
+                            };
+                            ForkResult::Forked(e7)
+                        }
+                    };
+                    let result8 = v7;
+                    result8
                 }
             }
         }
@@ -6632,8 +6669,8 @@ pub(crate) use __export_shopping_cart_impl as export;
 )]
 #[doc(hidden)]
 #[allow(clippy::octal_escapes)]
-pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 5815] = *b"\
-\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xb3,\x01A\x02\x01A\x13\
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 5853] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xd9,\x01A\x02\x01A\x13\
 \x01B\x0a\x04\0\x08pollable\x03\x01\x01h\0\x01@\x01\x04self\x01\0\x7f\x04\0\x16[\
 method]pollable.ready\x01\x02\x01@\x01\x04self\x01\x01\0\x04\0\x16[method]pollab\
 le.block\x01\x03\x01p\x01\x01py\x01@\x01\x02in\x04\0\x05\x04\0\x04poll\x01\x06\x03\
@@ -6687,7 +6724,7 @@ ethod]cancellation-token.cancel\x01F\x01j\x01\x05\x01s\x01@\x01\x04uuids\0\xc7\0
 \x04\0\x0aparse-uuid\x01H\x01@\x01\x04uuid\x05\0s\x04\0\x0euuid-to-string\x01I\x03\
 \0\x15golem:rpc/types@0.2.2\x05\x05\x02\x03\0\x01\x08duration\x02\x03\0\x03\x0cc\
 omponent-id\x02\x03\0\x03\x04uuid\x02\x03\0\x03\x0evalue-and-type\x02\x03\0\x03\x08\
-agent-id\x01B\x85\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
+agent-id\x01B\x87\x01\x02\x03\x02\x01\x06\x04\0\x08duration\x03\0\0\x02\x03\x02\x01\
 \x07\x04\0\x0ccomponent-id\x03\0\x02\x02\x03\x02\x01\x08\x04\0\x04uuid\x03\0\x04\
 \x02\x03\x02\x01\x09\x04\0\x0evalue-and-type\x03\0\x06\x02\x03\x02\x01\x0a\x04\0\
 \x08agent-id\x03\0\x08\x02\x03\x02\x01\x01\x04\0\x08pollable\x03\0\x0a\x01w\x04\0\
@@ -6715,44 +6752,45 @@ rs4\x04\0\x10agent-any-filter\x03\05\x01ps\x01o\x02ss\x01p8\x01r\x07\x08agent-id
 \x09\x04args7\x03env9\x0bconfig-vars9\x06status\"\x11component-versionw\x0bretry\
 -countw\x04\0\x0eagent-metadata\x03\0:\x04\0\x0aget-agents\x03\x01\x01q\x02\x15r\
 evert-to-oplog-index\x01\x0d\0\x17revert-last-invocations\x01w\0\x04\0\x13revert\
--agent-target\x03\0=\x01m\x02\x08original\x06forked\x04\0\x0bfork-result\x03\0?\x04\
-\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\x06fil\
-ter\xc2\0\x07precise\x7f\0\xc3\0\x04\0\x17[constructor]get-agents\x01D\x01h<\x01\
-p;\x01k\xc6\0\x01@\x01\x04self\xc5\0\0\xc7\0\x04\0\x1b[method]get-agents.get-nex\
-t\x01H\x01hA\x01i\x0b\x01@\x01\x04self\xc9\0\0\xca\0\x04\0$[method]get-promise-r\
-esult.subscribe\x01K\x01p}\x01k\xcc\0\x01@\x01\x04self\xc9\0\0\xcd\0\x04\0\x1e[m\
-ethod]get-promise-result.get\x01N\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01O\x01i\
-A\x01@\x01\x0apromise-id\x0f\0\xd0\0\x04\0\x0bget-promise\x01Q\x01@\x02\x0apromi\
-se-id\x0f\x04data\xcc\0\0\x7f\x04\0\x10complete-promise\x01R\x01@\0\0\x0d\x04\0\x0f\
-get-oplog-index\x01S\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-index\x01\
-T\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01U\x04\0\x14mark-begin-ope\
-ration\x01S\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01V\x01@\0\0\
-\x18\x04\0\x10get-retry-policy\x01W\x01@\x01\x10new-retry-policy\x18\x01\0\x04\0\
-\x10set-retry-policy\x01X\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01Y\
-\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-leve\
-l\x01Z\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01[\x01@\x01\x0aidempotent\x7f\
-\x01\0\x04\0\x14set-idempotence-mode\x01\\\x01@\0\0\x05\x04\0\x18generate-idempo\
-tency-key\x01]\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
-\0\x0cupdate-agent\x01^\x01@\0\0;\x04\0\x11get-self-metadata\x01_\x01k;\x01@\x01\
-\x08agent-id\x09\0\xe0\0\x04\0\x12get-agent-metadata\x01a\x01@\x03\x0fsource-age\
+-agent-target\x03\0=\x01r\x01\x11forked-phantom-id\x05\x04\0\x0cfork-details\x03\
+\0?\x01q\x02\x08original\x01\xc0\0\0\x06forked\x01\xc0\0\0\x04\0\x0bfork-result\x03\
+\0A\x04\0\x12get-promise-result\x03\x01\x01k6\x01i<\x01@\x03\x0ccomponent-id\x03\
+\x06filter\xc4\0\x07precise\x7f\0\xc5\0\x04\0\x17[constructor]get-agents\x01F\x01\
+h<\x01p;\x01k\xc8\0\x01@\x01\x04self\xc7\0\0\xc9\0\x04\0\x1b[method]get-agents.g\
+et-next\x01J\x01hC\x01i\x0b\x01@\x01\x04self\xcb\0\0\xcc\0\x04\0$[method]get-pro\
+mise-result.subscribe\x01M\x01p}\x01k\xce\0\x01@\x01\x04self\xcb\0\0\xcf\0\x04\0\
+\x1e[method]get-promise-result.get\x01P\x01@\0\0\x0f\x04\0\x0ecreate-promise\x01\
+Q\x01iC\x01@\x01\x0apromise-id\x0f\0\xd2\0\x04\0\x0bget-promise\x01S\x01@\x02\x0a\
+promise-id\x0f\x04data\xce\0\0\x7f\x04\0\x10complete-promise\x01T\x01@\0\0\x0d\x04\
+\0\x0fget-oplog-index\x01U\x01@\x01\x09oplog-idx\x0d\x01\0\x04\0\x0fset-oplog-in\
+dex\x01V\x01@\x01\x08replicas}\x01\0\x04\0\x0coplog-commit\x01W\x04\0\x14mark-be\
+gin-operation\x01U\x01@\x01\x05begin\x0d\x01\0\x04\0\x12mark-end-operation\x01X\x01\
+@\0\0\x18\x04\0\x10get-retry-policy\x01Y\x01@\x01\x10new-retry-policy\x18\x01\0\x04\
+\0\x10set-retry-policy\x01Z\x01@\0\0\x1a\x04\0\x1bget-oplog-persistence-level\x01\
+[\x01@\x01\x15new-persistence-level\x1a\x01\0\x04\0\x1bset-oplog-persistence-lev\
+el\x01\\\x01@\0\0\x7f\x04\0\x14get-idempotence-mode\x01]\x01@\x01\x0aidempotent\x7f\
+\x01\0\x04\0\x14set-idempotence-mode\x01^\x01@\0\0\x05\x04\0\x18generate-idempot\
+ency-key\x01_\x01@\x03\x08agent-id\x09\x0etarget-version\x11\x04mode\x1c\x01\0\x04\
+\0\x0cupdate-agent\x01`\x01@\0\0;\x04\0\x11get-self-metadata\x01a\x01k;\x01@\x01\
+\x08agent-id\x09\0\xe2\0\x04\0\x12get-agent-metadata\x01c\x01@\x03\x0fsource-age\
 nt-id\x09\x0ftarget-agent-id\x09\x11oplog-idx-cut-off\x0d\x01\0\x04\0\x0afork-ag\
-ent\x01b\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
-c\x01k\x03\x01@\x01\x13component-references\0\xe4\0\x04\0\x14resolve-component-i\
-d\x01e\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe6\0\x04\0\x10\
-resolve-agent-id\x01g\x04\0\x17resolve-agent-id-strict\x01g\x01@\x01\x08new-name\
-s\0\xc0\0\x04\0\x04fork\x01h\x03\0\x14golem:api/host@1.3.0\x05\x0b\x01B\x17\x01r\
-\x04\x0aproduct-ids\x04names\x05pricev\x08quantityy\x04\0\x0cproduct-item\x03\0\0\
-\x01p\x01\x01r\x04\x08order-ids\x05items\x02\x05totalv\x09timestampw\x04\0\x05or\
-der\x03\0\x03\x01r\x01\x08order-ids\x04\0\x12order-confirmation\x03\0\x05\x01q\x02\
-\x05error\x01s\0\x07success\x01\x06\0\x04\0\x0fcheckout-result\x03\0\x07\x01@\x01\
-\x07user-ids\x01\0\x04\0\x0finitialize-cart\x01\x09\x01@\x01\x04item\x01\x01\0\x04\
-\0\x08add-item\x01\x0a\x01@\x01\x0aproduct-ids\x01\0\x04\0\x0bremove-item\x01\x0b\
-\x01@\x02\x0aproduct-ids\x08quantityy\x01\0\x04\0\x14update-item-quantity\x01\x0c\
-\x01@\0\0\x08\x04\0\x08checkout\x01\x0d\x01@\0\0\x02\x04\0\x11get-cart-contents\x01\
-\x0e\x01@\x01\x05count}\x01\0\x04\0\x0cforce-commit\x01\x0f\x04\0\x0cgolem:it/ap\
-i\x05\x0c\x04\0\x16golem:it/shopping-cart\x04\0\x0b\x13\x01\0\x0dshopping-cart\x03\
-\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-\
-bindgen-rust\x060.41.0";
+ent\x01d\x01@\x02\x08agent-id\x09\x0drevert-target>\x01\0\x04\0\x0crevert-agent\x01\
+e\x01k\x03\x01@\x01\x13component-references\0\xe6\0\x04\0\x14resolve-component-i\
+d\x01g\x01k\x09\x01@\x02\x13component-references\x0aagent-names\0\xe8\0\x04\0\x10\
+resolve-agent-id\x01i\x04\0\x17resolve-agent-id-strict\x01i\x01@\0\0\xc2\0\x04\0\
+\x04fork\x01j\x03\0\x14golem:api/host@1.3.0\x05\x0b\x01B\x17\x01r\x04\x0aproduct\
+-ids\x04names\x05pricev\x08quantityy\x04\0\x0cproduct-item\x03\0\0\x01p\x01\x01r\
+\x04\x08order-ids\x05items\x02\x05totalv\x09timestampw\x04\0\x05order\x03\0\x03\x01\
+r\x01\x08order-ids\x04\0\x12order-confirmation\x03\0\x05\x01q\x02\x05error\x01s\0\
+\x07success\x01\x06\0\x04\0\x0fcheckout-result\x03\0\x07\x01@\x01\x07user-ids\x01\
+\0\x04\0\x0finitialize-cart\x01\x09\x01@\x01\x04item\x01\x01\0\x04\0\x08add-item\
+\x01\x0a\x01@\x01\x0aproduct-ids\x01\0\x04\0\x0bremove-item\x01\x0b\x01@\x02\x0a\
+product-ids\x08quantityy\x01\0\x04\0\x14update-item-quantity\x01\x0c\x01@\0\0\x08\
+\x04\0\x08checkout\x01\x0d\x01@\0\0\x02\x04\0\x11get-cart-contents\x01\x0e\x01@\x01\
+\x05count}\x01\0\x04\0\x0cforce-commit\x01\x0f\x04\0\x0cgolem:it/api\x05\x0c\x04\
+\0\x16golem:it/shopping-cart\x04\0\x0b\x13\x01\0\x0dshopping-cart\x03\0\0\0G\x09\
+producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.227.1\x10wit-bindgen-rus\
+t\x060.41.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {
diff --git a/test-components/update-test-v1.wasm b/test-components/update-test-v1.wasm
index cd95d7af78..8855c900c1 100755
Binary files a/test-components/update-test-v1.wasm and b/test-components/update-test-v1.wasm differ
diff --git a/test-components/update-test-v2-11.wasm b/test-components/update-test-v2-11.wasm
index 5ace186934..7b09c403ea 100644
Binary files a/test-components/update-test-v2-11.wasm and b/test-components/update-test-v2-11.wasm differ
diff --git a/test-components/update-test-v3-11.wasm b/test-components/update-test-v3-11.wasm
index 6da96ccdf9..6b4d06f97f 100644
Binary files a/test-components/update-test-v3-11.wasm and b/test-components/update-test-v3-11.wasm differ
diff --git a/test-components/update-test-v4.wasm b/test-components/update-test-v4.wasm
index 9f4d9ce7e5..22ab8af790 100755
Binary files a/test-components/update-test-v4.wasm and b/test-components/update-test-v4.wasm differ
diff --git a/test-components/write-stderr.wasm b/test-components/write-stderr.wasm
index 7646f265e9..1695a330ce 100755
Binary files a/test-components/write-stderr.wasm and b/test-components/write-stderr.wasm differ
diff --git a/test-components/write-stdout.wasm b/test-components/write-stdout.wasm
index c701d5c2a8..bd9389128a 100644
Binary files a/test-components/write-stdout.wasm and b/test-components/write-stdout.wasm differ
diff --git a/wit/deps/golem-1.x/golem-host.wit b/wit/deps/golem-1.x/golem-host.wit
index db737a53c2..af5cd62fd3 100644
--- a/wit/deps/golem-1.x/golem-host.wit
+++ b/wit/deps/golem-1.x/golem-host.wit
@@ -196,12 +196,19 @@ interface host {
         revert-last-invocations(u64)
     }
 
-    /// Indicates which agent the code is running on after `fork`
-    enum fork-result {
+    /// Details about the fork result
+    record fork-details {
+        forked-phantom-id: uuid,
+    }
+
+    /// Indicates which agent the code is running on after `fork`.
+    /// The parameter contains details about the fork result, such as the phantom-ID of the newly
+    /// created agent.
+    variant fork-result {
         /// The original agent that called `fork`
-        original,
+        original(fork-details),
         /// The new agent
-        forked
+        forked(fork-details)
     }
 
     resource get-promise-result {
@@ -305,10 +312,11 @@ interface host {
     /// Returns none when no component for the specified component-reference or no agent with the specified agent-name exists.
     resolve-agent-id-strict: func(component-reference: string, agent-name: string) -> option<agent-id>;
 
-    /// Forks the current agent at the current execution point. The new agent gets the `new-name` agent ID,
-    /// and this agent continues running as well. The return value is going to be different in this agent and
-    /// the forked agent.
-    fork: func(new-name: string) -> fork-result;
+    /// Forks the current agent at the current execution point. The new agent gets the same base agent ID but
+    /// with a new unique phantom ID. The phantom ID of the forked agent is returned in `fork-result` on
+    /// both sides. The newly created agent continues running from the same point, but the return value is
+    /// going to be different in this agent and the forked agent.
+    fork: func() -> fork-result;
 }
 
 /// Interface providing user-defined snapshotting capability. This can be used to perform manual update of agents
diff --git a/wit/deps/golem-agent/host.wit b/wit/deps/golem-agent/host.wit
index f6c2103932..c8070cb027 100644
--- a/wit/deps/golem-agent/host.wit
+++ b/wit/deps/golem-agent/host.wit
@@ -1,7 +1,7 @@
 package golem:agent;
 
 interface host {
-    use golem:rpc/types@0.2.2.{component-id};
+    use golem:rpc/types@0.2.2.{component-id, uuid};
     use common.{agent-error, agent-type, data-value};
 
     /// Associates an agent type with a component that implements it
@@ -17,8 +17,10 @@ interface host {
     get-agent-type: func(agent-type-name: string) -> option<registered-agent-type>;
 
     /// Constructs a string agent-id from the agent type and its constructor parameters
-    make-agent-id: func(agent-type-name: string, input:  data-value) -> result<string, agent-error>;
+    /// and an optional phantom ID
+    make-agent-id: func(agent-type-name: string, input: data-value, phantom-id: option<uuid>) -> result<string, agent-error>;
 
     /// Parses an agent-id (created by `make-agent-id`) into an agent type name and its constructor parameters
-    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value>, agent-error>;
+    /// and an optional phantom ID
+    parse-agent-id: func(agent-id: string) -> result<tuple<string, data-value, option<uuid>>, agent-error>;
 }