Move window in stack

I have some skhd bindings to move a window within a stack.
Technically this can be done e.g. with
yabai -m window --swap stack.prev
BUT this will change focus to the other window, losing focus from the current one.

A fix/workaround is to do like this:
yabai -m window --swap stack.prev; yabai -m window --focus stack.prev

However this results in some visual flicker effect since the other window is focused for a brief moment.

Other things I tried:

...

yabai -m window --swap stack.prev --focus stack.prev
This does not work

Specify to focus the initial window in the same command:

yabai -m window --swap stack.prev --focus $(yabai -m query --windows id --window | jq -r .id)
This has a shorter flicker but still has it.

Q:

Is there some alternative I'm missing?
Otherwise, would it make sense for the --swap command to keep focus on the currently selected window? Or at least make the behavior on which window to focus after the swap an option?

Start by reproducing the yabai -m window --swap stack.prev behavior and tracing the window --swap command handling. Compare focus behavior for the direct command and the shell workaround, then determine the intended post-swap focus semantics. Done means the chosen behavior is implemented or exposed as an option without the reported focus flicker, with coverage for stacked-window swaps.