diff --git a/codex-rs/core/src/agent/control.rs b/codex-rs/core/src/agent/control.rs
index a46fb0df01..02f4c111f1 100644
--- a/codex-rs/core/src/agent/control.rs
+++ b/codex-rs/core/src/agent/control.rs
@@ -374,8 +374,8 @@ impl AgentControl {
                         config,
                         self.clone(),
                         session_source,
-                        false,
-                        None,
+                        /*persist_extended_history*/ false,
+                        /*metrics_service_name*/ None,
                         inherited_shell_snapshot,
                         inherited_exec_policy,
                     )
@@ -443,7 +443,7 @@ impl AgentControl {
                 initial_history,
                 self.clone(),
                 session_source,
-                false,
+                /*persist_extended_history*/ false,
                 inherited_shell_snapshot,
                 inherited_exec_policy,
             )
diff --git a/codex-rs/core/src/agent/watchdog.rs b/codex-rs/core/src/agent/watchdog.rs
index d8455e00df..5dc603d7b0 100644
--- a/codex-rs/core/src/agent/watchdog.rs
+++ b/codex-rs/core/src/agent/watchdog.rs
@@ -302,8 +302,13 @@ impl WatchdogManager {
                     "watchdog helper cleanup failed: {err}"
                 );
             }
-            self.update_after_spawn(target_thread_id, generation, now, None)
-                .await;
+            self.update_after_spawn(
+                target_thread_id,
+                generation,
+                now,
+                /*active_helper_id*/ None,
+            )
+            .await;
             return;
         }
 
@@ -347,8 +352,13 @@ impl WatchdogManager {
             }
             Err(err) => {
                 warn!("watchdog spawn failed for target {target_thread_id}: {err}");
-                self.update_after_spawn(target_thread_id, generation, now, None)
-                    .await;
+                self.update_after_spawn(
+                    target_thread_id,
+                    generation,
+                    now,
+                    /*active_helper_id*/ None,
+                )
+                .await;
             }
         }
     }