fix: add reactivation to pixi shell

src/activation.rs

@@ -22,7 +22,7 @@ const PROJECT_PREFIX: &str = "PIXI_PROJECT_";
 impl Project {
     /// Returns environment variables and their values that should be injected when running a command.
     pub fn get_metadata_env(&self) -> HashMap<String, String> {
-        HashMap::from_iter([
+        let mut map = HashMap::from_iter([
             (
                 format!("{PROJECT_PREFIX}ROOT"),
                 self.root().to_string_lossy().into_owned(),
@@ -40,7 +40,16 @@ impl Project {
                         version.to_string()
                     }),
             ),
-        ])
+        ]);
+
+        if let Ok(exe_path) = std::env::current_exe() {
+            map.insert(
+                "PIXI_EXE".to_string(),
+                exe_path.to_string_lossy().to_string(),
+            );
+        }
+
+        map
     }
 }
 

src/cli/shell.rs

@@ -226,8 +226,8 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         match interactive_shell {
             ShellEnum::NuShell(_) => prompt::get_nu_prompt(prompt_name.as_str()),
             ShellEnum::PowerShell(_) => prompt::get_powershell_prompt(prompt_name.as_str()),
-            ShellEnum::Bash(_) => prompt::get_bash_prompt(prompt_name.as_str()),
-            ShellEnum::Zsh(_) => prompt::get_zsh_prompt(prompt_name.as_str()),
+            ShellEnum::Bash(_) => prompt::get_bash_hook(prompt_name.as_str()),
+            ShellEnum::Zsh(_) => prompt::get_zsh_hook(prompt_name.as_str()),
             ShellEnum::Fish(_) => prompt::get_fish_prompt(prompt_name.as_str()),
             ShellEnum::Xonsh(_) => prompt::get_xonsh_prompt(),
             ShellEnum::CmdExe(_) => prompt::get_cmd_prompt(prompt_name.as_str()),

src/prompt.rs

@@ -1,11 +1,19 @@
 /// Set default pixi prompt for the bash shell
-pub fn get_bash_prompt(env_name: &str) -> String {
-    format!("export PS1=\"({}) $PS1\"", env_name)
+pub fn get_bash_hook(env_name: &str) -> String {
+    format!(
+        "export PS1=\"({}) $PS1\"\n{}",
+        env_name,
+        include_str!("shell_snippets/pixi-bash.sh")
+    )
 }
 
 /// Set default pixi prompt for the zsh shell
-pub fn get_zsh_prompt(env_name: &str) -> String {
-    format!("export PS1=\"({}) $PS1\"", env_name)
+pub fn get_zsh_hook(env_name: &str) -> String {
+    format!(
+        "export PS1=\"({}) $PS1\"\n{}",
+        env_name,
+        include_str!("shell_snippets/pixi-zsh.sh")
+    )
 }
 
 /// Set default pixi prompt for the fish shell

src/shell_snippets/pixi-bash.sh

@@ -0,0 +1,13 @@
+pixi() {
+    local first_arg="$1"
+    local cmd="$PIXI_EXE $*"
+
+    eval "$cmd"
+
+    case "$first_arg" in
+        add|remove|install)
+            eval "$($PIXI_EXE shell-hook)"
+            hash -r
+            ;;
+    esac
+}

src/shell_snippets/pixi-zsh.sh

@@ -0,0 +1,13 @@
+pixi() {
+    local first_arg="$1"
+    local cmd="$PIXI_EXE $*"
+
+    eval "$cmd"
+
+    case "$first_arg" in
+        add|remove|install)
+            eval "$($PIXI_EXE shell-hook)"
+            rehash # Clear the command hash table in zsh
+            ;;
+    esac
+}