i/build features/vim-modelines fixes/ensure-worktree