Skip to main content

mj_controller/controller/checkpoint/
barrier.rs

1use super::*;
2
3pub(super) async fn connect_checkpoint_relay(
4    session_id: &str,
5    manager: Option<&SessionManagerControl>,
6    reconnect: &targets::CommandSpec,
7    project_memory: Option<crate::session_manager::ProjectMemorySyncTarget>,
8) -> Result<ControllerRelayLease> {
9    if let Some(manager) = manager {
10        let handle = manager
11            .wait_for_session(session_id, Duration::from_secs(5))
12            .await?;
13        let mut lease = handle.lease_connection().await?;
14        lease
15            .connection_mut()
16            .set_project_memory_target(project_memory);
17        Ok(ControllerRelayLease::Managed {
18            handle,
19            lease: Some(lease),
20        })
21    } else {
22        let target = crate::session_manager::RelaySessionTarget {
23            session_id: session_id.to_owned(),
24            spec: reconnect.clone(),
25            worker_recovery: None,
26            project_memory,
27        };
28        Ok(ControllerRelayLease::Standalone(
29            StandaloneSession::connect(&target).await?,
30        ))
31    }
32}
33
34pub(super) async fn adopt_restarted_checkpoint_relay(
35    session_id: &str,
36    manager: Option<&SessionManagerControl>,
37    connection: StandaloneSession,
38) -> Result<ControllerRelayLease> {
39    let Some(manager) = manager else {
40        return Ok(ControllerRelayLease::Standalone(connection));
41    };
42    let handle = manager
43        .wait_for_session(session_id, Duration::from_secs(5))
44        .await?;
45    match handle.lease_connection().await {
46        Ok(mut lease) => {
47            lease.replace_connection(connection);
48            Ok(ControllerRelayLease::Managed {
49                handle,
50                lease: Some(lease),
51            })
52        }
53        Err(error) => {
54            tracing::warn!(
55                session_id,
56                "session actor could not lease after worker restart; using the restarted proxy: {error:#}"
57            );
58            Ok(ControllerRelayLease::Standalone(connection))
59        }
60    }
61}
62
63/// What waiting for a barrier does while the session is working.
64#[derive(Debug, Clone, Copy, PartialEq, Eq)]
65pub(super) enum BarrierBusyPolicy {
66    /// Give up as soon as the session is seen working. A checkpoint that can
67    /// run again later has nothing to gain from holding a barrier behind a
68    /// prompt or a turn the harness started on its own: the wait would only
69    /// end at the deadline, and the deadline means "wedged", which restarts
70    /// the worker and kills the work in flight.
71    DeferWhileRunning,
72    /// Request non-steering cancellation and wait for the turn to settle.
73    /// Close may interrupt work, but only an unresponsive or incompatible
74    /// worker needs restart recovery.
75    InterruptWhileRunning,
76}
77
78impl BarrierBusyPolicy {
79    pub(super) fn of(exclusivity: LatchExclusivity) -> Self {
80        match exclusivity {
81            LatchExclusivity::ReleaseAfterLatch => Self::DeferWhileRunning,
82            LatchExclusivity::HoldThroughClose => Self::InterruptWhileRunning,
83        }
84    }
85}
86
87pub(super) async fn wait_for_checkpoint_barrier(
88    relay: &mut StandaloneSession,
89    session_id: &str,
90    command_id: &str,
91    timeout: Duration,
92    busy: BarrierBusyPolicy,
93    harness: HarnessKind,
94) -> Result<ManagedSessionSnapshot> {
95    let deadline = tokio::time::Instant::now() + timeout;
96    let mut cancel_submitted = false;
97    let mut cancel_deadline = None;
98    let mut cancel_started_at: Option<Instant> = None;
99    loop {
100        let snapshot = relay.sync().await?;
101        if busy == BarrierBusyPolicy::DeferWhileRunning
102            && !snapshot.operational.safe_for_checkpoint(harness)
103        {
104            // The native task level can change after the controller's initial
105            // idle sync and before the queued BeginCheckpoint is processed.
106            // Defer from the barrier wait rather than allowing its timeout to
107            // classify the worker as wedged and restart it.
108            return Err(
109                CheckpointDeferred::background_snapshot(&snapshot.operational, harness).into(),
110            );
111        }
112        if checkpoint_barrier_is_ready(&snapshot, command_id) {
113            if let Some(started_at) = cancel_started_at {
114                tracing::info!(
115                    session_id,
116                    barrier_command_id = command_id,
117                    cancellation_ms = started_at.elapsed().as_millis() as u64,
118                    "active turn cancellation settled before checkpoint barrier"
119                );
120            }
121            return Ok(snapshot);
122        }
123        if busy == BarrierBusyPolicy::InterruptWhileRunning
124            && snapshot.operational.execution == RelayExecutionState::Running
125            && !cancel_submitted
126        {
127            let cancel_command_id = new_command_id("checkpoint-cancel-turn")?;
128            match relay
129                .submit(cancel_command_id, RelayCommand::CancelTurn)
130                .await
131            {
132                Ok(_) => {
133                    cancel_submitted = true;
134                    cancel_started_at = Some(Instant::now());
135                    cancel_deadline = Some(tokio::time::Instant::now() + CHECKPOINT_CANCEL_TIMEOUT);
136                    tracing::info!(
137                        session_id,
138                        barrier_command_id = command_id,
139                        "requested active turn cancellation before checkpoint barrier"
140                    );
141                }
142                Err(error) if checkpoint_cancel_turn_needs_worker_restart(&error) => {
143                    return Err(error.context(
144                        CheckpointBarrierUnreachable::cancel_turn_unavailable(
145                            command_id,
146                            relay.protocol_version(),
147                        ),
148                    ));
149                }
150                Err(error) if worker_connect_needs_restart(&error) => {
151                    return Err(error.context(
152                        CheckpointBarrierUnreachable::cancel_turn_unreachable(command_id),
153                    ));
154                }
155                Err(error) => {
156                    // The turn can finish between the status sync and this
157                    // submit. If the barrier won that race, continue from its
158                    // durable ready state; otherwise preserve the rejection.
159                    if let Ok(snapshot) = relay.sync().await
160                        && checkpoint_barrier_is_ready(&snapshot, command_id)
161                    {
162                        tracing::info!(
163                            session_id,
164                            barrier_command_id = command_id,
165                            "active turn settled while submitting checkpoint cancellation"
166                        );
167                        return Ok(snapshot);
168                    }
169                    return Err(error.context("cancel active ACP turn before checkpoint barrier"));
170                }
171            }
172            continue;
173        }
174        let out_of_time = tokio::time::Instant::now() >= cancel_deadline.unwrap_or(deadline);
175        if let Some(error) = checkpoint_barrier_wait_ended(
176            &snapshot,
177            command_id,
178            busy,
179            out_of_time,
180            cancel_submitted,
181        ) {
182            return Err(error);
183        }
184        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
185    }
186}
187
188/// Why one sync of a barrier that is not ready yet ends the wait, or `None` to
189/// keep waiting.
190///
191/// The deadline means "wedged": it restarts the worker only after a close has
192/// already requested cancellation and the turn still has not settled. A
193/// checkpoint that can try again later defers as soon as it sees work.
194pub(super) fn checkpoint_barrier_wait_ended(
195    snapshot: &ManagedSessionSnapshot,
196    command_id: &str,
197    busy: BarrierBusyPolicy,
198    out_of_time: bool,
199    cancel_submitted: bool,
200) -> Option<anyhow::Error> {
201    if snapshot.operational.execution == RelayExecutionState::Closed {
202        return Some(CheckpointBarrierUnreachable::runtime_stopped().into());
203    }
204    if snapshot.operational.execution == RelayExecutionState::Running {
205        return Some(match busy {
206            BarrierBusyPolicy::DeferWhileRunning => CheckpointDeferred::harness_busy().into(),
207            BarrierBusyPolicy::InterruptWhileRunning if out_of_time && cancel_submitted => {
208                CheckpointBarrierUnreachable::cancel_timed_out(command_id).into()
209            }
210            BarrierBusyPolicy::InterruptWhileRunning => return None,
211        });
212    }
213    out_of_time.then(|| CheckpointBarrierUnreachable::not_admitted(command_id).into())
214}
215
216/// The ACP runtime never admitted a checkpoint barrier: it stopped first, or it
217/// never reached the barrier before the deadline.
218///
219/// [`wait_for_checkpoint_barrier`] is the only producer, and the retry decision
220/// downcasts for this marker rather than reading the message, so rewording a
221/// diagnostic cannot silently disable the restart-and-retry path.
222#[derive(Debug)]
223pub(super) struct CheckpointBarrierUnreachable(pub(super) String);
224
225impl CheckpointBarrierUnreachable {
226    pub(super) fn runtime_stopped() -> Self {
227        Self("ACP runtime stopped before reaching the checkpoint barrier".to_owned())
228    }
229
230    pub(super) fn not_admitted(command_id: &str) -> Self {
231        Self(format!(
232            "ACP relay did not reach checkpoint barrier {command_id}"
233        ))
234    }
235
236    pub(super) fn cancel_timed_out(command_id: &str) -> Self {
237        Self(format!(
238            "active ACP turn did not settle after cancellation before checkpoint barrier {command_id}"
239        ))
240    }
241
242    pub(super) fn cancel_turn_unavailable(command_id: &str, protocol_version: u32) -> Self {
243        Self(format!(
244            "worker protocol {protocol_version} cannot cancel the active ACP turn before checkpoint barrier {command_id} (requires protocol {})",
245            RelayCommand::CancelTurn.minimum_protocol(),
246        ))
247    }
248
249    pub(super) fn cancel_turn_unreachable(command_id: &str) -> Self {
250        Self(format!(
251            "worker transport became unavailable while cancelling the active ACP turn before checkpoint barrier {command_id}"
252        ))
253    }
254}
255
256impl std::fmt::Display for CheckpointBarrierUnreachable {
257    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
258        formatter.write_str(&self.0)
259    }
260}
261
262impl std::error::Error for CheckpointBarrierUnreachable {}
263
264pub(super) fn checkpoint_barrier_needs_worker_restart(error: &anyhow::Error) -> bool {
265    error
266        .downcast_ref::<CheckpointBarrierUnreachable>()
267        .is_some()
268}
269
270/// A worker that cannot decode `CancelTurn` needs to be replaced before the
271/// close can retry the checkpoint with cancellation available. The relay client
272/// refuses the command for an older worker with the same code the worker uses.
273pub(super) fn checkpoint_cancel_turn_needs_worker_restart(error: &anyhow::Error) -> bool {
274    error.chain().any(|cause| {
275        let Some(rejected) = cause.downcast_ref::<RelayRejected>() else {
276            return false;
277        };
278        rejected.0.code == mj_core::relay::RelayErrorCode::IncompatibleProtocol
279    })
280}
281
282/// The session was working, so this checkpoint did not run. Nothing is wrong
283/// with the session, the target, or the last archive.
284///
285/// A busy session is the normal state of a session someone is using, including
286/// one working through a turn the harness started on its own after a
287/// background command. Treating that as a checkpoint failure would restart the
288/// worker, record a failure against the session, and back the next attempt off
289/// for hours. Callers that can try again later defer instead; the same work is
290/// copied at the next idle observation.
291#[derive(Debug)]
292pub struct CheckpointDeferred(String);
293
294impl CheckpointDeferred {
295    pub fn harness_busy() -> Self {
296        Self("the agent is working; try again when it is idle".to_owned())
297    }
298
299    pub(super) fn background_work() -> Self {
300        Self("Kimi background-agent state could not be synchronized; checkpoint requires a synchronized empty task list".into())
301    }
302
303    pub(super) fn background_snapshot(
304        state: &mj_core::relay::RelayOperationalState,
305        harness: HarnessKind,
306    ) -> Self {
307        Self(
308            state
309                .checkpoint_background_blocker(harness)
310                .unwrap_or("background state changed during checkpoint")
311                .into(),
312        )
313    }
314
315    pub(super) fn frontier_moved() -> Self {
316        Self(
317            "the session moved past the checkpoint-ready cursor before the barrier latched, so this checkpoint was deferred"
318                .to_owned(),
319        )
320    }
321
322    pub(super) fn harness_turn_during_capture() -> Self {
323        Self(
324            "the agent started a turn of its own while target state was captured, so this checkpoint was deferred"
325                .to_owned(),
326        )
327    }
328}
329
330impl std::fmt::Display for CheckpointDeferred {
331    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
332        formatter.write_str(&self.0)
333    }
334}
335
336impl std::error::Error for CheckpointDeferred {}
337
338/// Whether a failed checkpoint only means the session was busy.
339///
340/// The marker is carried by the error, not by its text. It may be the root
341/// error or attached with `context`, and callers wrap checkpoint errors in
342/// further context. `anyhow`'s own downcast walks every context layer;
343/// `chain()` does not expose a context value, so it must not be used here.
344pub fn checkpoint_was_deferred(error: &anyhow::Error) -> bool {
345    error.downcast_ref::<CheckpointDeferred>().is_some()
346}