..

yazi-core/src/completion/commands/arrow.rs

@@ -2,10 +2,14 @@ use yazi_config::keymap::Exec;
 
 use crate::completion::Completion;
 
-pub struct Opt(isize);
+pub struct Opt {
+	step: isize,
+}
 
 impl From<&Exec> for Opt {
-	fn from(e: &Exec) -> Self { Self(e.args.first().and_then(|s| s.parse().ok()).unwrap_or(0)) }
+	fn from(e: &Exec) -> Self {
+		Self { step: e.args.first().and_then(|s| s.parse().ok()).unwrap_or(0) }
+	}
 }
 
 impl Completion {
@@ -38,7 +42,7 @@ impl Completion {
 	}
 
 	pub fn arrow(&mut self, opt: impl Into<Opt>) -> bool {
-		let step = opt.into().0;
+		let opt = opt.into() as Opt;
-		if step > 0 { self.next(step as usize) } else { self.prev(step.unsigned_abs()) }
+		if opt.step > 0 { self.next(opt.step as usize) } else { self.prev(opt.step.unsigned_abs()) }
 	}
 }

yazi-core/src/completion/commands/close.rs

@@ -2,16 +2,18 @@ use yazi_config::keymap::{Exec, KeymapLayer};
 
 use crate::{completion::Completion, emit};
 
-pub struct Opt(bool);
+pub struct Opt {
+	submit: bool,
+}
 
 impl From<&Exec> for Opt {
-	fn from(e: &Exec) -> Self { Self(e.named.contains_key("submit")) }
+	fn from(e: &Exec) -> Self { Self { submit: e.named.contains_key("submit") } }
 }
 
 impl Completion {
 	pub fn close(&mut self, opt: impl Into<Opt>) -> bool {
-		let submit = opt.into().0;
+		let opt = opt.into() as Opt;
-		if submit {
+		if opt.submit {
 			emit!(Call(
 				Exec::call("complete", vec![self.selected().into()]).with("ticket", self.ticket).vec(),
 				KeymapLayer::Input

yazi-core/src/completion/commands/show.rs

@@ -24,7 +24,7 @@ impl<'a> From<&'a Exec> for Opt<'a> {
 
 impl Completion {
 	pub fn show<'a>(&mut self, opt: impl Into<Opt<'a>>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		if self.ticket != opt.ticket {
 			return false;
 		}

yazi-core/src/completion/commands/trigger.rs

@@ -29,7 +29,7 @@ impl Completion {
 	}
 
 	pub fn trigger<'a>(&mut self, opt: impl Into<Opt<'a>>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		if opt.ticket < self.ticket {
 			return false;
 		}

yazi-core/src/input/commands/complete.rs

@@ -18,7 +18,7 @@ impl<'a> From<&'a Exec> for Opt<'a> {
 
 impl Input {
 	pub fn complete<'a>(&mut self, opt: impl Into<Opt<'a>>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		if self.ticket != opt.ticket {
 			return false;
 		}

yazi-core/src/manager/commands/create.rs

@@ -16,7 +16,7 @@ impl From<&Exec> for Opt {
 
 impl Manager {
 	pub fn create(&self, opt: impl Into<Opt>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		let cwd = self.cwd().to_owned();
 		tokio::spawn(async move {
 			let mut result = emit!(Input(InputOpt::top("Create:")));

yazi-core/src/manager/commands/link.rs

@@ -15,7 +15,7 @@ impl From<&Exec> for Opt {
 
 impl Manager {
 	pub fn link(&mut self, opt: impl Into<Opt>, tasks: &Tasks) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		let (cut, ref src) = self.yanked;
 		!cut && tasks.file_link(src, self.cwd(), opt.relative, opt.force)
 	}

yazi-core/src/manager/commands/open.rs

@@ -46,7 +46,7 @@ impl Manager {
 			return false;
 		}
 
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		tokio::spawn(async move {
 			let todo: Vec<_> = files.iter().filter(|(_, m)| m.is_none()).map(|(u, _)| u).collect();
 			if let Ok(mut mimes) = external::file(&todo).await {

yazi-core/src/manager/commands/paste.rs

@@ -15,7 +15,7 @@ impl Manager {
 		let dest = self.cwd();
 		let (cut, ref src) = self.yanked;
 
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		if cut { tasks.file_cut(src, dest, opt.force) } else { tasks.file_copy(src, dest, opt.force) }
 	}
 }

yazi-core/src/manager/commands/quit.rs

@@ -15,7 +15,7 @@ impl From<&Exec> for Opt {
 
 impl Manager {
 	pub fn quit(&self, opt: impl Into<Opt>, tasks: &Tasks) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 
 		let tasks = tasks.len();
 		if tasks == 0 {

yazi-core/src/manager/commands/remove.rs

@@ -18,7 +18,7 @@ impl From<&Exec> for Opt {
 
 impl Manager {
 	pub fn remove(&mut self, opt: impl Into<Opt>, tasks: &Tasks) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		let targets = self.selected().into_iter().map(|f| f.url()).collect();
 		tasks.file_remove(targets, opt.force, opt.permanently)
 	}

yazi-core/src/manager/commands/rename.rs

@@ -40,7 +40,7 @@ impl Manager {
 			return false;
 		};
 
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		tokio::spawn(async move {
 			let mut result = emit!(Input(
 				InputOpt::hovered("Rename:").with_value(hovered.file_name().unwrap().to_string_lossy())

yazi-core/src/manager/commands/tab_close.rs

@@ -18,7 +18,7 @@ impl From<usize> for Opt {
 
 impl Tabs {
 	pub fn close(&mut self, opt: impl Into<Opt>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 
 		let len = self.items.len();
 		if len < 2 || opt.idx >= len {

yazi-core/src/manager/commands/tab_create.rs

@@ -27,7 +27,7 @@ impl Tabs {
 			return false;
 		}
 
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		let url = if opt.current { self.active().current.cwd.to_owned() } else { opt.url.unwrap() };
 
 		let mut tab = Tab::from(url);

yazi-core/src/manager/commands/tab_swap.rs

@@ -3,18 +3,18 @@ use yazi_config::keymap::Exec;
 use crate::manager::Tabs;
 
 pub struct Opt {
-	idx: isize,
+	step: isize,
 }
 
 impl From<&Exec> for Opt {
 	fn from(e: &Exec) -> Self {
-		Self { idx: e.args.first().and_then(|s| s.parse().ok()).unwrap_or(0) }
+		Self { step: e.args.first().and_then(|s| s.parse().ok()).unwrap_or(0) }
 	}
 }
 
 impl Tabs {
 	pub fn swap(&mut self, opt: impl Into<Opt>) -> bool {
-		let idx = self.absolute(opt.into().idx);
+		let idx = self.absolute(opt.into().step);
 		if idx == self.idx {
 			return false;
 		}

yazi-core/src/manager/commands/tab_switch.rs

@@ -3,26 +3,26 @@ use yazi_config::keymap::Exec;
 use crate::manager::Tabs;
 
 pub struct Opt {
-	idx: isize,
+	step:     isize,
-	rel: bool,
+	relative: bool,
 }
 
 impl From<&Exec> for Opt {
 	fn from(e: &Exec) -> Self {
 		Self {
-			idx: e.args.first().and_then(|s| s.parse().ok()).unwrap_or(0),
+			step:     e.args.first().and_then(|s| s.parse().ok()).unwrap_or(0),
-			rel: e.named.contains_key("relative"),
+			relative: e.named.contains_key("relative"),
 		}
 	}
 }
 
 impl Tabs {
 	pub fn switch(&mut self, opt: impl Into<Opt>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
-		let idx = if opt.rel {
+		let idx = if opt.relative {
-			(self.idx as isize + opt.idx).rem_euclid(self.items.len() as isize) as usize
+			(self.idx as isize + opt.step).rem_euclid(self.items.len() as isize) as usize
 		} else {
-			opt.idx as usize
+			opt.step as usize
 		};
 
 		if idx == self.idx || idx >= self.items.len() {

yazi-core/src/manager/commands/yank.rs

@@ -12,7 +12,7 @@ impl From<&Exec> for Opt {
 
 impl Manager {
 	pub fn yank(&mut self, opt: impl Into<Opt>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 
 		self.yanked.0 = opt.cut;
 		self.yanked.1 = self.selected().into_iter().map(|f| f.url()).collect();

yazi-core/src/tab/commands/arrow.rs

@@ -2,11 +2,13 @@ use yazi_config::keymap::Exec;
 
 use crate::{emit, tab::Tab, Step};
 
-pub struct Opt(Step);
+pub struct Opt {
+	step: Step,
+}
 
 impl From<&Exec> for Opt {
 	fn from(e: &Exec) -> Self {
-		Self(e.args.first().and_then(|s| s.parse().ok()).unwrap_or_default())
+		Self { step: e.args.first().and_then(|s| s.parse().ok()).unwrap_or_default() }
 	}
 }
 
@@ -14,13 +16,17 @@ impl<T> From<T> for Opt
 where
 	T: Into<Step>,
 {
-	fn from(t: T) -> Self { Self(t.into()) }
+	fn from(t: T) -> Self { Self { step: t.into() } }
 }
 
 impl Tab {
 	pub fn arrow(&mut self, opt: impl Into<Opt>) -> bool {
-		let step = opt.into().0;
+		let opt = opt.into() as Opt;
-		let ok = if step.is_positive() { self.current.next(step) } else { self.current.prev(step) };
+		let ok = if opt.step.is_positive() {
+			self.current.next(opt.step)
+		} else {
+			self.current.prev(opt.step)
+		};
 		if !ok {
 			return false;
 		}

yazi-core/src/tab/commands/copy.rs

@@ -14,7 +14,7 @@ impl<'a> From<&'a Exec> for Opt<'a> {
 
 impl Tab {
 	pub fn copy<'a>(&self, opt: impl Into<Opt<'a>>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 
 		let mut s = OsString::new();
 		let mut it = self.selected().into_iter().peekable();

yazi-core/src/tab/commands/find.rs

@@ -37,7 +37,7 @@ impl From<&Exec> for ArrowOpt {
 
 impl Tab {
 	pub fn find<'a>(&mut self, opt: impl Into<Opt<'a>>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		tokio::spawn(async move {
 			let rx = emit!(Input(
 				InputOpt::top(if opt.prev { "Find previous:" } else { "Find next:" }).with_realtime()
@@ -61,7 +61,7 @@ impl Tab {
 	}
 
 	pub fn find_do<'a>(&mut self, opt: impl Into<Opt<'a>>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		let Some(query) = opt.query else {
 			return false;
 		};

yazi-core/src/tab/commands/jump.rs

@@ -28,7 +28,7 @@ impl From<&Exec> for Opt {
 
 impl Tab {
 	pub fn jump(&self, opt: impl Into<Opt>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		if opt.type_ == OptType::None {
 			return false;
 		}

yazi-core/src/tab/commands/search.rs

@@ -32,7 +32,7 @@ impl From<&Exec> for Opt {
 
 impl Tab {
 	pub fn search(&mut self, opt: impl Into<Opt>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		if opt.type_ == OptType::None {
 			return self.search_stop();
 		}

yazi-core/src/tab/commands/select.rs

@@ -2,31 +2,34 @@ use yazi_config::keymap::Exec;
 
 use crate::tab::Tab;
 
-pub struct Opt(Option<bool>);
+pub struct Opt {
-
+	state: Option<bool>,
-impl From<Option<bool>> for Opt {
-	fn from(b: Option<bool>) -> Self { Self(b) }
 }
 
 impl From<&Exec> for Opt {
 	fn from(e: &Exec) -> Self {
-		Self(match e.named.get("state").map(|s| s.as_bytes()) {
+		Self {
-			Some(b"true") => Some(true),
+			state: match e.named.get("state").map(|s| s.as_bytes()) {
-			Some(b"false") => Some(false),
+				Some(b"true") => Some(true),
-			_ => None,
+				Some(b"false") => Some(false),
-		})
+				_ => None,
+			},
+		}
 	}
 }
+impl From<Option<bool>> for Opt {
+	fn from(state: Option<bool>) -> Self { Self { state } }
+}
 
 impl Tab {
 	pub fn select(&mut self, opt: impl Into<Opt>) -> bool {
 		if let Some(u) = self.current.hovered().map(|h| h.url()) {
-			return self.current.files.select(&u, opt.into().0);
+			return self.current.files.select(&u, opt.into().state);
 		}
 		false
 	}
 
 	pub fn select_all(&mut self, opt: impl Into<Opt>) -> bool {
-		self.current.files.select_all(opt.into().0)
+		self.current.files.select_all(opt.into().state)
 	}
 }

yazi-core/src/tab/commands/shell.rs

@@ -26,7 +26,7 @@ impl Tab {
 			.map(|f| (f.url.as_os_str().to_owned(), Default::default()))
 			.collect();
 
-		let mut opt = opt.into();
+		let mut opt = opt.into() as Opt;
 		tokio::spawn(async move {
 			if !opt.confirm || opt.cmd.is_empty() {
 				let mut result = emit!(Input(

yazi-core/src/tab/commands/visual_mode.rs

@@ -14,7 +14,7 @@ impl From<&Exec> for Opt {
 
 impl Tab {
 	pub fn visual_mode(&mut self, opt: impl Into<Opt>) -> bool {
-		let opt = opt.into();
+		let opt = opt.into() as Opt;
 		let idx = self.current.cursor;
 
 		if opt.unset {