Fix flaky CLI job status race under combined worker

Author: echobt

tests/cli/test_cli_marketplace_nodes_jobs.py

@@ -531,7 +531,7 @@ def test_nodes_register_heartbeat_fabric_scan(live_api: dict[str, Any]) -> None:
 
 
 def test_jobs_submit_status_list_cancel(live_api: dict[str, Any], tmp_path: Path) -> None:
-    """VAL-CLI-008: submit returns id; status matches GET; list/filter; cancel terminals."""
+    """VAL-CLI-008: submit returns id; status/API share id + lifecycle status; list/cancel."""
 
     base = live_api["base_url"]
     spec_path = tmp_path / "job.json"
@@ -595,9 +595,56 @@ def test_jobs_submit_status_list_cancel(live_api: dict[str, Any], tmp_path: Path
     status_body = _json_blob(status.output)
     assert status_body.get("id") == job_id or status_body.get("job_id") == job_id
 
+    # Combined worker may advance between CLI poll and API GET; require id match
+    # and a known lifecycle status rather than exact freeze of a single value.
+    known_statuses = {
+        "submitted",
+        "admitted",
+        "placing",
+        "provisioning",
+        "running",
+        "collecting",
+        "scoring",
+        "succeeded",
+        "failed",
+        "cancelled",
+        "timeout",
+    }
+    cli_status = status_body.get("status")
+    assert cli_status in known_statuses, status_body
+
     api = httpx.get(f"{base}/v1/jobs/{job_id}", timeout=5.0)
     assert api.status_code == 200
-    assert api.json().get("status") == status_body.get("status")
+    api_body = api.json()
+    assert api_body.get("id") == job_id or api_body.get("job_id") == job_id
+    api_status = api_body.get("status")
+    assert api_status in known_statuses, api_body
+    # If worker advanced between the two reads, only allow monotonic lifecycle
+    # progression (same status or a later-known stage). Exact equality is not
+    # required under combined worker.
+    if cli_status != api_status:
+        order = [
+            "submitted",
+            "admitted",
+            "placing",
+            "provisioning",
+            "running",
+            "collecting",
+            "scoring",
+            "succeeded",
+            "failed",
+            "cancelled",
+            "timeout",
+        ]
+        # Terminal branches may skip scoring; allow any known→known pair that is
+        # not a regression to a strictly earlier non-terminal index when both
+        # are non-terminal. Terminal statuses are always accepted as "advanced".
+        terminals = {"succeeded", "failed", "cancelled", "timeout"}
+        if api_status not in terminals and cli_status not in terminals:
+            assert order.index(api_status) >= order.index(cli_status), (
+                cli_status,
+                api_status,
+            )
 
     listed = _invoke(
         [