From d4cf28ae516ba645c4a8c11d8eee494fe0baf3ad Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 4 Aug 2025 14:36:12 +0000
Subject: [PATCH] Merge fixes

---
 app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java    | 7 ++++++-
 .../app/comp/base/ContextualFileReferenceChoiceComp.java   | 1 +
 app/src/main/java/io/xpipe/app/prefs/AppPrefs.java         | 1 +
 .../io/xpipe/ext/base/identity/SshIdentityStrategy.java    | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java b/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java
index 89dc71d3d..fc95e8e15 100644
--- a/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java
+++ b/app/src/main/java/io/xpipe/app/beacon/mcp/McpTools.java
@@ -14,6 +14,7 @@ import io.xpipe.app.process.TerminalInitScriptConfig;
 import io.xpipe.app.process.WorkingDirectoryFunction;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStorageQuery;
+import io.xpipe.app.terminal.TerminalLaunch;
 import io.xpipe.app.terminal.TerminalLauncher;
 import io.xpipe.app.util.CommandDialog;
 import io.xpipe.app.util.CommandSupport;
@@ -256,7 +257,11 @@ public final class McpTools {
             var shellStore = req.getShellStoreRef(system);
             var shellSession = AppBeaconServer.get().getCache().getOrStart(shellStore);
 
-            TerminalLauncher.open(shellStore.get(), shellStore.get().getName(), FilePath.of(directory.orElse(null)), shellSession.getControl());
+            TerminalLaunch.builder()
+                    .entry(shellStore.get())
+                    .directory(FilePath.of(directory.orElse(null)))
+                    .command(shellSession.getControl())
+                    .launch();
 
             return McpSchema.CallToolResult.builder().addTextContent("Terminal is launching").build();
         })).build();
diff --git a/app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceChoiceComp.java b/app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceChoiceComp.java
index a65b9e65c..a98ee3fd9 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceChoiceComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceChoiceComp.java
@@ -22,6 +22,7 @@ import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
 import javafx.scene.control.ListCell;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
index 026d45d30..1f0a99906 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
@@ -14,6 +14,7 @@ import io.xpipe.app.terminal.ExternalTerminalType;
 import io.xpipe.app.terminal.TerminalMultiplexer;
 import io.xpipe.app.terminal.TerminalPrompt;
 import io.xpipe.app.update.AppDistributionType;
+import io.xpipe.app.util.DocumentationLink;
 import io.xpipe.app.util.LocalShell;
 import io.xpipe.app.util.OptionsBuilder;
 import io.xpipe.app.util.PlatformThread;
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java
index ab29cc98e..c1dd5ea39 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java
@@ -9,6 +9,7 @@ import io.xpipe.app.process.ShellControl;
 import io.xpipe.app.process.ShellDialects;
 import io.xpipe.app.storage.ContextualFileReference;
 import io.xpipe.app.storage.DataStorage;
+import io.xpipe.app.util.LicenseProvider;
 import io.xpipe.app.util.LocalShell;
 import io.xpipe.app.util.SecretRetrievalStrategy;
 import io.xpipe.app.util.Validators;