From ef6b6109785e667d00fb91bc34b52f65430ced7e Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Thu, 21 Aug 2025 10:40:41 +0000
Subject: [PATCH] Small fixes

---
 app/src/main/java/io/xpipe/app/process/ShellView.java       | 6 ++++++
 .../java/io/xpipe/app/pwman/BitwardenPasswordManager.java   | 1 +
 .../ext/base/identity/ssh/OtherExternalAgentStrategy.java   | 6 +++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/process/ShellView.java b/app/src/main/java/io/xpipe/app/process/ShellView.java
index fe57cb219..28d49411e 100644
--- a/app/src/main/java/io/xpipe/app/process/ShellView.java
+++ b/app/src/main/java/io/xpipe/app/process/ShellView.java
@@ -163,6 +163,12 @@ public class ShellView {
         cmd.executeAndCheck();
     }
 
+    public void unsetEnvironmentVariable(String name) throws Exception {
+         shellControl
+                .command(shellControl.getShellDialect().unsetEnvironmentVariableCommand(name))
+                .executeAndCheck();
+    }
+
     public String getEnvironmentVariable(String name) throws Exception {
         return shellControl
                 .command(shellControl.getShellDialect().getPrintEnvironmentVariableCommand(name))
diff --git a/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java
index 711b77000..ec3812a94 100644
--- a/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java
+++ b/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java
@@ -22,6 +22,7 @@ public class BitwardenPasswordManager implements PasswordManager {
         if (SHELL == null) {
             SHELL = ProcessControlProvider.get().createLocalProcessControl(true);
             SHELL.start();
+            SHELL.view().unsetEnvironmentVariable("BW_SESSION");
             SHELL.view()
                     .setEnvironmentVariable(
                             "BITWARDENCLI_APPDATA_DIR", AppCache.getBasePath().toString());
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/OtherExternalAgentStrategy.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/OtherExternalAgentStrategy.java
index 155c8e56d..652328f1a 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/OtherExternalAgentStrategy.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/ssh/OtherExternalAgentStrategy.java
@@ -41,7 +41,11 @@ public class OtherExternalAgentStrategy implements SshIdentityStrategy {
     String publicKey;
 
     @Override
-    public void prepareParent(ShellControl parent) {}
+    public void prepareParent(ShellControl parent) throws Exception {
+        if (parent.isLocal()) {
+            SshIdentityStateManager.prepareLocalExternalAgent();
+        }
+    }
 
     @Override
     public void buildCommand(CommandBuilder builder) {}