Improve action new-tab

.gitignore

@@ -4,3 +4,5 @@ target/
 .vim
 .DS_Store
 /assets/man/zellij.1
+.idea/
+docker-compose.override.yml

default-plugins/status-bar/src/one_line_ui.rs

@@ -1202,7 +1202,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<KeyWithModifier
         };
 
         vec![
-        (s("New"), s("New"), single_action_key(&km, &[A::NewTab(None, vec![], None, None, None, true), TO_NORMAL])),
+        (s("New"), s("New"), single_action_key(&km, &[A::NewTab(None, None, None, vec![], None, None, None, true), TO_NORMAL])),
         (s("Change focus"), s("Move"), focus_keys),
         (s("Close"), s("Close"), single_action_key(&km, &[A::CloseTab, TO_NORMAL])),
         (s("Rename"), s("Rename"),
@@ -1284,7 +1284,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<KeyWithModifier
         (s("Split down"), s("Down"), action_key(&km, &[A::NewPane(Some(Dir::Down), None, false), TO_NORMAL])),
         (s("Split right"), s("Right"), action_key(&km, &[A::NewPane(Some(Dir::Right), None, false), TO_NORMAL])),
         (s("Fullscreen"), s("Fullscreen"), action_key(&km, &[A::ToggleFocusFullscreen, TO_NORMAL])),
-        (s("New tab"), s("New"), action_key(&km, &[A::NewTab(None, vec![], None, None, None, true), TO_NORMAL])),
+        (s("New tab"), s("New"), action_key(&km, &[A::NewTab(None, None, None, vec![], None, None, None, true), TO_NORMAL])),
         (s("Rename tab"), s("Rename"),
             action_key(&km, &[A::SwitchToMode(IM::RenameTab), A::TabNameInput(vec![0])])),
         (s("Previous Tab"), s("Previous"), action_key(&km, &[A::GoToPreviousTab, TO_NORMAL])),

default-plugins/status-bar/src/second_line.rs

@@ -179,7 +179,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<KeyWithModifier
         };
 
         vec![
-        (s("New"), s("New"), action_key(&km, &[A::NewTab(None, vec![], None, None, None, true), TO_NORMAL])),
+        (s("New"), s("New"), action_key(&km, &[A::NewTab(None, None, None, vec![], None, None, None, true), TO_NORMAL])),
         (s("Change focus"), s("Move"), focus_keys),
         (s("Close"), s("Close"), action_key(&km, &[A::CloseTab, TO_NORMAL])),
         (s("Rename"), s("Rename"),
@@ -259,7 +259,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<KeyWithModifier
         (s("Split down"), s("Down"), action_key(&km, &[A::NewPane(Some(Dir::Down), None, false), TO_NORMAL])),
         (s("Split right"), s("Right"), action_key(&km, &[A::NewPane(Some(Dir::Right), None, false), TO_NORMAL])),
         (s("Fullscreen"), s("Fullscreen"), action_key(&km, &[A::ToggleFocusFullscreen, TO_NORMAL])),
-        (s("New tab"), s("New"), action_key(&km, &[A::NewTab(None, vec![], None, None, None, true), TO_NORMAL])),
+        (s("New tab"), s("New"), action_key(&km, &[A::NewTab(None, None, None, vec![], None, None, None, true), TO_NORMAL])),
         (s("Rename tab"), s("Rename"),
             action_key(&km, &[A::SwitchToMode(IM::RenameTab), A::TabNameInput(vec![0])])),
         (s("Previous Tab"), s("Previous"), action_key(&km, &[A::GoToPreviousTab, TO_NORMAL])),

docker-compose.yml

@@ -9,7 +9,7 @@ services:
       PUID: 1000
       PGID: 1000
       TZ: Europe/Vienna
-      PASSWORD_ACCESS: true
+      PASSWORD_ACCESS: "true"
       USER_PASSWORD: test
       USER_NAME: test
     volumes:

src/main.rs

@@ -208,6 +208,9 @@ fn main() {
                 layout_dir: options.as_ref().and_then(|o| o.layout_dir.clone()),
                 name: None,
                 cwd: options.as_ref().and_then(|o| o.default_cwd.clone()),
+                run: None,
+                args: None,
+                edit: None,
             };
             commands::send_action_to_session(new_layout_cli_action, Some(session_name), config);
         } else {

zellij-server/src/plugins/zellij_exports.rs

@@ -1029,6 +1029,8 @@ fn apply_layout(env: &PluginEnv, layout: Layout) {
         let swap_tiled_layouts = Some(layout.swap_tiled_layouts.clone());
         let swap_floating_layouts = Some(layout.swap_floating_layouts.clone());
         let action = Action::NewTab(
+            None,
+            None,
             layout.template.as_ref().map(|t| t.0.clone()),
             layout.template.map(|t| t.1).unwrap_or_default(),
             swap_tiled_layouts,
@@ -1046,6 +1048,8 @@ fn apply_layout(env: &PluginEnv, layout: Layout) {
             let swap_tiled_layouts = Some(layout.swap_tiled_layouts.clone());
             let swap_floating_layouts = Some(layout.swap_floating_layouts.clone());
             let action = Action::NewTab(
+                None,
+                None,
                 Some(tiled_pane_layout),
                 floating_pane_layout,
                 swap_tiled_layouts,
@@ -1063,7 +1067,7 @@ fn apply_layout(env: &PluginEnv, layout: Layout) {
 }
 
 fn new_tab(env: &PluginEnv) {
-    let action = Action::NewTab(None, vec![], None, None, None, true);
+    let action = Action::NewTab(None, None, None, vec![], None, None, None, true);
     let error_msg = || format!("Failed to open new tab");
     apply_action!(action, error_msg, env);
 }

zellij-server/src/route.rs

@@ -496,21 +496,23 @@ pub(crate) fn route_action(
                 .with_context(err_context)?;
         },
         Action::NewTab(
+            cwd,
+            run,
             tab_layout,
             floating_panes_layout,
             swap_tiled_layouts,
             swap_floating_layouts,
             tab_name,
             should_change_focus_to_new_tab,
         ) => {
-            let shell = default_shell.clone();
+            let shell = run.or_else(|| default_shell.clone());
             let swap_tiled_layouts =
                 swap_tiled_layouts.unwrap_or_else(|| default_layout.swap_tiled_layouts.clone());
             let swap_floating_layouts = swap_floating_layouts
                 .unwrap_or_else(|| default_layout.swap_floating_layouts.clone());
             senders
                 .send_to_screen(ScreenInstruction::NewTab(
-                    None,
+                    cwd,
                     shell,
                     tab_layout,
                     floating_panes_layout,

zellij-server/src/unit/screen_tests.rs

@@ -2656,6 +2656,9 @@ pub fn send_cli_new_tab_action_default_params() {
         layout: None,
         layout_dir: None,
         cwd: None,
+        run: None,
+        args: None,
+        edit: None,
     };
     send_cli_action_to_server(&session_metadata, new_tab_action, client_id);
     std::thread::sleep(std::time::Duration::from_millis(100));
@@ -2696,6 +2699,9 @@ pub fn send_cli_new_tab_action_with_name_and_layout() {
         ))),
         layout_dir: None,
         cwd: None,
+        run: None,
+        args: None,
+        edit: None,
     };
     send_cli_action_to_server(&session_metadata, new_tab_action, client_id);
     std::thread::sleep(std::time::Duration::from_millis(100));

zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_name_and_layout.snap

@@ -4,7 +4,9 @@ assertion_line: 2711
 expression: "format!(\"{:#?}\", new_tab_instruction)"
 ---
 NewTab(
-    None,
+    Some(
+        ".",
+    ),
     None,
     Some(
         TiledPaneLayout {

zellij-utils/src/cli.rs

@@ -625,8 +625,20 @@ pub enum CliAction {
         name: Option<String>,
 
         /// Change the working directory of the new tab
-        #[clap(short, long, value_parser, requires("layout"))]
+        #[clap(short, long, value_parser)]
         cwd: Option<PathBuf>,
+
+        /// Run command in the new tab
+        #[clap(short, long, value_parser, conflicts_with("edit"))]
+        run: Option<PathBuf>,
+
+        /// Command line arguments when running a command
+        #[clap(short, long, value_parser, requires("run"))]
+        args: Option<Vec<String>>,
+
+        /// Edit file in the new tab
+        #[clap(short, long, value_parser)]
+        edit: Option<PathBuf>,
     },
     /// Move the focused tab in the specified direction. [right|left]
     MoveTab {

zellij-utils/src/consts.rs

@@ -122,7 +122,7 @@ mod not_wasm {
         // Zellij asset map
         pub static ref ASSET_MAP: HashMap<PathBuf, Vec<u8>> = {
             let mut assets = std::collections::HashMap::new();
-            add_plugin!(assets, "compact-bar.wasm");
+                add_plugin!(assets, "compact-bar.wasm");
             add_plugin!(assets, "status-bar.wasm");
             add_plugin!(assets, "tab-bar.wasm");
             add_plugin!(assets, "strider.wasm");

zellij-utils/src/input/actions.rs

@@ -1,6 +1,6 @@
 //! Definition of the actions that can be bound to keys.
 
-use super::command::{OpenFilePayload, RunCommandAction};
+use super::command::{OpenFilePayload, RunCommandAction, TerminalAction};
 use super::layout::{
     FloatingPaneLayout, Layout, PluginAlias, RunPlugin, RunPluginLocation, RunPluginOrAlias,
     SwapFloatingLayout, SwapTiledLayout, TiledPaneLayout,
@@ -18,6 +18,7 @@ use uuid::Uuid;
 
 use std::path::PathBuf;
 use std::str::FromStr;
+use crate::input::command::RunCommand;
 
 use crate::position::Position;
 
@@ -190,13 +191,15 @@ pub enum Action {
     UndoRenamePane,
     /// Create a new tab, optionally with a specified tab layout.
     NewTab(
+        Option<PathBuf>, // cwd
+        Option<TerminalAction>, // initial command or file to edit
         Option<TiledPaneLayout>,
         Vec<FloatingPaneLayout>,
         Option<Vec<SwapTiledLayout>>,
         Option<Vec<SwapFloatingLayout>>,
-        Option<String>,
+        Option<String>, // tab name
         bool, // should_change_focus_to_new_tab
-    ), // the String is the tab name
+    ),
     /// Do nothing.
     NoOp,
     /// Go to the next tab.
@@ -523,11 +526,25 @@ impl Action {
                 layout,
                 layout_dir,
                 cwd,
+                run,
+                args,
+                edit,
             } => {
                 let current_dir = get_current_dir();
                 let cwd = cwd
                     .map(|cwd| current_dir.join(cwd))
                     .or_else(|| Some(current_dir));
+
+
+                let action = run.map(|command| TerminalAction::RunCommand(RunCommand {
+                    command,
+                    args: args.unwrap_or_else(|| vec![]),
+                    cwd: cwd.clone(),
+                    hold_on_close: false,
+                    hold_on_start: false,
+                    originating_plugin: None,
+                })).or_else(|| edit.map(|path| TerminalAction::OpenFile(OpenFilePayload::new(path, None, cwd.clone()))));
+
                 if let Some(layout_path) = layout {
                     let layout_dir = layout_dir
                         .or_else(|| config.and_then(|c| c.options.layout_dir))
@@ -553,7 +570,7 @@ impl Action {
                         Layout::stringified_from_path_or_default(Some(&layout_path), layout_dir)
                             .map_err(|e| format!("Failed to load layout: {}", e))?
                     };
-                    let mut layout = Layout::from_str(&raw_layout, path_to_raw_layout, swap_layouts.as_ref().map(|(f, p)| (f.as_str(), p.as_str())), cwd).map_err(|e| {
+                    let mut layout = Layout::from_str(&raw_layout, path_to_raw_layout, swap_layouts.as_ref().map(|(f, p)| (f.as_str(), p.as_str())), cwd.clone()).map_err(|e| {
                         let stringified_error = match e {
                             ConfigError::KdlError(kdl_error) => {
                                 let error = kdl_error.add_src(layout_path.as_path().as_os_str().to_string_lossy().to_string(), String::from(raw_layout));
@@ -608,6 +625,8 @@ impl Action {
                                     }
                                 });
                             new_tab_actions.push(Action::NewTab(
+                                cwd.clone(),
+                                action.clone(),
                                 Some(layout),
                                 floating_panes_layout,
                                 swap_tiled_layouts.clone(),
@@ -623,6 +642,8 @@ impl Action {
                         let (layout, floating_panes_layout) = layout.new_tab();
                         let should_change_focus_to_new_tab = true;
                         Ok(vec![Action::NewTab(
+                            cwd,
+                            action,
                             Some(layout),
                             floating_panes_layout,
                             swap_tiled_layouts,
@@ -634,6 +655,8 @@ impl Action {
                 } else {
                     let should_change_focus_to_new_tab = true;
                     Ok(vec![Action::NewTab(
+                        cwd,
+                        action,
                         None,
                         vec![],
                         None,

zellij-utils/src/input/command.rs

@@ -3,7 +3,7 @@ use crate::data::{Direction, OriginatingPlugin};
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub enum TerminalAction {
     OpenFile(OpenFilePayload),
     RunCommand(RunCommand),

zellij-utils/src/kdl/mod.rs

@@ -691,7 +691,7 @@ impl Action {
                 Some(node)
             },
             Action::UndoRenamePane => Some(KdlNode::new("UndoRenamePane")),
-            Action::NewTab(_, _, _, _, name, should_change_focus_to_new_tab) => {
+            Action::NewTab(_, _, _, _, _, _, name, should_change_focus_to_new_tab) => {
                 log::warn!("Converting new tab action without arguments, original action saved to .bak.kdl file");
                 let mut node = KdlNode::new("NewTab");
                 if let Some(name) = name {
@@ -1387,7 +1387,7 @@ impl TryFrom<(&KdlNode, &Options)> for Action {
             "NewTab" => {
                 let command_metadata = action_children.iter().next();
                 if command_metadata.is_none() {
-                    return Ok(Action::NewTab(None, vec![], None, None, None, true));
+                    return Ok(Action::NewTab(None, None, None, vec![], None, None, None, true));
                 }
 
                 let current_dir = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("."));
@@ -1423,7 +1423,7 @@ impl TryFrom<(&KdlNode, &Options)> for Action {
                     &raw_layout,
                     path_to_raw_layout,
                     swap_layouts.as_ref().map(|(f, p)| (f.as_str(), p.as_str())),
-                    cwd,
+                    cwd.clone(),
                 )
                 .map_err(|e| {
                     ConfigError::new_kdl_error(
@@ -1449,6 +1449,8 @@ impl TryFrom<(&KdlNode, &Options)> for Action {
                     let should_change_focus_to_new_tab = layout.focus.unwrap_or(true);
 
                     Ok(Action::NewTab(
+                        cwd,
+                        None,
                         Some(layout),
                         floating_panes_layout,
                         swap_tiled_layouts,
@@ -1461,6 +1463,8 @@ impl TryFrom<(&KdlNode, &Options)> for Action {
                     let should_change_focus_to_new_tab = layout.focus.unwrap_or(true);
 
                     Ok(Action::NewTab(
+                        cwd,
+                        None,
                         Some(layout),
                         floating_panes_layout,
                         swap_tiled_layouts,

zellij-utils/src/plugin_api/action.rs

@@ -313,7 +313,7 @@ impl TryFrom<ProtobufAction> for Action {
                     Some(_) => Err("NewTab should not have a payload"),
                     None => {
                         // we do not serialize the layouts of this action
-                        Ok(Action::NewTab(None, vec![], None, None, None, true))
+                        Ok(Action::NewTab(None, None, None, vec![], None, None, None, true))
                     },
                 }
             },

zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap

@@ -1759,6 +1759,8 @@ Config {
                 key_modifiers: {},
             }: [
                 NewTab(
+                    None,
+                    None,
                     None,
                     [],
                     None,
@@ -5240,6 +5242,8 @@ Config {
                 key_modifiers: {},
             }: [
                 NewTab(
+                    None,
+                    None,
                     None,
                     [],
                     None,

zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_env_vars_override_config_env_vars.snap

@@ -1759,6 +1759,8 @@ Config {
                 key_modifiers: {},
             }: [
                 NewTab(
+                    None,
+                    None,
                     None,
                     [],
                     None,
@@ -5240,6 +5242,8 @@ Config {
                 key_modifiers: {},
             }: [
                 NewTab(
+                    None,
+                    None,
                     None,
                     [],
                     None,

zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap

@@ -1759,6 +1759,8 @@ Config {
                 key_modifiers: {},
             }: [
                 NewTab(
+                    None,
+                    None,
                     None,
                     [],
                     None,
@@ -5240,6 +5242,8 @@ Config {
                 key_modifiers: {},
             }: [
                 NewTab(
+                    None,
+                    None,
                     None,
                     [],
                     None,