feat: unify worker lifecycle restore semantics

2026-09-03 13:23:31 +09:00
parent 6b1b8a8846
commit 85e1ea320a
21 changed files with 681 additions and 393 deletions
@@ -3772,7 +3772,6 @@ fn embedded_worker_status_label(status: EmbeddedWorkerStatus) -> &'static str {
        EmbeddedWorkerStatus::Running => "running",
        EmbeddedWorkerStatus::Paused => "paused",
        EmbeddedWorkerStatus::Stopped => "stopped",
-        EmbeddedWorkerStatus::Cancelled => "cancelled",
    }
 }

@@ -5678,7 +5677,7 @@ mod tests {
                json!({
                    "workers": [
                        worker_json_with_status("remote:primary", &worker_ids[0], "stopped"),
-                        worker_json_with_status("remote:primary", &worker_ids[1], "cancelled"),
+                        worker_json_with_status("remote:primary", &worker_ids[1], "running"),
                        worker_json_with_status("remote:primary", &worker_ids[2], "paused"),
                        worker_json_with_status("remote:primary", &worker_ids[3], "idle")
                    ]
@@ -5717,11 +5716,11 @@ mod tests {
        let workers = registry.list_workers(10);
        assert_eq!(workers.items.len(), 4);
        assert!(!workers.items[0].capabilities.can_stop);
-        assert!(!workers.items[1].capabilities.can_stop);
+        assert!(workers.items[1].capabilities.can_stop);
        assert!(workers.items[2].capabilities.can_stop);
        assert!(workers.items[3].capabilities.can_stop);
        assert_eq!(workers.items[0].state, "stopped");
-        assert_eq!(workers.items[1].state, "cancelled");
+        assert_eq!(workers.items[1].state, "running");
        assert_eq!(workers.items[2].state, "paused");
        assert_eq!(workers.items[3].state, "idle");

@@ -13199,22 +13199,13 @@ fn compensate_failed_worker_spawn(
    let cancellation = api
        .runtime
        .cancel_worker(&worker.worker, lifecycle_request.clone());
-    let cancellation_accepted = cancellation
+    let stop = api.runtime.stop_worker(&worker.worker, lifecycle_request);
+    let stop_accepted = stop
        .as_ref()
        .is_ok_and(|result| result.state == WorkerOperationState::Accepted);
-    let stop = (!cancellation_accepted)
-        .then(|| api.runtime.stop_worker(&worker.worker, lifecycle_request));
-    let stop_accepted = stop.as_ref().is_some_and(|result| {
-        result
-            .as_ref()
-            .is_ok_and(|result| result.state == WorkerOperationState::Accepted)
-    });
-    let termination_detail = (!cancellation_accepted && !stop_accepted).then(|| {
+    let termination_detail = (!stop_accepted).then(|| {
        let cancellation = lifecycle_failure_detail("cancel", &cancellation);
-        let stop = stop
-            .as_ref()
-            .map(|result| lifecycle_failure_detail("stop", result))
-            .unwrap_or_else(|| "stop was not attempted".to_string());
+        let stop = lifecycle_failure_detail("stop", &stop);
        format!("{cancellation}; {stop}")
    });

@@ -20287,7 +20278,7 @@ mod tests {
                .iter()
                .any(|assignment| assignment.role == "coder")
        );
-        assert_eq!(api.runtime.worker(&worker).unwrap().state, "cancelled");
+        assert_eq!(api.runtime.worker(&worker).unwrap().state, "idle");

        let Json(replayed) = scoped_cancel_ticket_implementation(State(api), path(), request())
            .await