..

Author: sxyazi

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

@@ -3,28 +3,34 @@ use std::{borrow::Cow, fmt::Display};
 use anyhow::bail;
 use yazi_config::{open::Opener, popup::InputCfg};
 use yazi_proxy::{AppProxy, InputProxy, TasksProxy};
-use yazi_shared::event::{CmdCow, Data};
+use yazi_shared::{event::{CmdCow, Data}, url::Url};
 
 use crate::tab::Tab;
 
 pub struct Opt {
-	run:         Cow<'static, str>,
+	run: Cow<'static, str>,
+	cwd: Option<Url>,
+
 	block:       bool,
 	orphan:      bool,
 	interactive: bool,
-	cursor:      Option<usize>,
+
+	cursor: Option<usize>,
 }
 
 impl TryFrom<CmdCow> for Opt {
 	type Error = anyhow::Error;
 
 	fn try_from(mut c: CmdCow) -> Result<Self, Self::Error> {
 		let me = Self {
-			run:         c.take_first_str().unwrap_or_default(),
+			run: c.take_first_str().unwrap_or_default(),
+			cwd: c.take_url("cwd"),
+
 			block:       c.bool("block"),
 			orphan:      c.bool("orphan"),
 			interactive: c.bool("interactive"),
-			cursor:      c.get("cursor").and_then(Data::as_usize),
+
+			cursor: c.get("cursor").and_then(Data::as_usize),
 		};
 
 		if me.cursor.is_some_and(|c| c > me.run.chars().count()) {
@@ -46,7 +52,7 @@ impl Tab {
 			Err(e) => return AppProxy::notify_warn("`shell` command", e),
 		};
 
-		let cwd = self.cwd().clone();
+		let cwd = opt.cwd.take().unwrap_or_else(|| self.cwd().clone());
 		let selected = self.hovered_and_selected(true).cloned().collect();
 		tokio::spawn(async move {
 			if opt.interactive {

yazi-plugin/preset/plugins/zoxide.lua

@@ -67,6 +67,7 @@ local function setup(_, opts)
 			"cd",
 			function()
 				ya.manager_emit("shell", {
+					cwd = fs.cwd(),
 					orphan = true,
 					"zoxide add " .. ya.quote(tostring(cx.active.current.cwd)),
 				})

yazi-plugin/src/fs/fs.rs

@@ -8,6 +8,7 @@ use crate::{Error, bindings::{Cast, Cha}, file::File, url::{Url, UrlRef}};
 pub fn compose(lua: &Lua) -> mlua::Result<Table> {
 	let index = lua.create_function(|lua, (ts, key): (Table, mlua::String)| {
 		let value = match key.as_bytes().as_ref() {
+			b"cwd" => cwd(lua)?,
 			b"cha" => cha(lua)?,
 			b"write" => write(lua)?,
 			b"remove" => remove(lua)?,
@@ -27,6 +28,13 @@ pub fn compose(lua: &Lua) -> mlua::Result<Table> {
 	Ok(fs)
 }
 
+fn cwd(lua: &Lua) -> mlua::Result<Function> {
+	lua.create_function(|lua, ()| match std::env::current_dir() {
+		Ok(p) => (Url::cast(lua, p)?, Value::Nil).into_lua_multi(lua),
+		Err(e) => (Value::Nil, Error::Io(e)).into_lua_multi(lua),
+	})
+}
+
 fn cha(lua: &Lua) -> mlua::Result<Function> {
 	lua.create_async_function(|lua, (url, follow): (UrlRef, Option<bool>)| async move {
 		let meta = if follow.unwrap_or(false) {

yazi-plugin/src/lua.rs

@@ -24,6 +24,7 @@ fn stage_1(lua: &'static Lua) -> Result<()> {
 	let globals = lua.globals();
 	globals.raw_set("ui", crate::elements::compose(lua)?)?;
 	globals.raw_set("ya", crate::utils::compose(lua, false)?)?;
+	globals.raw_set("fs", crate::fs::compose(lua)?)?;
 	globals.raw_set("ps", crate::pubsub::compose(lua)?)?;
 
 	crate::Error::install(lua)?;