add-interactive: refactor mode hunk handling