refactor: distinguish between awaiting Promise and waiting for subtask, simplify route rebuilding tasks#7203