Merge fixes

This commit is contained in:
crschnick
2025-08-04 14:36:12 +00:00
parent 1e932ffab8
commit d4cf28ae51
4 changed files with 9 additions and 1 deletions
@@ -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();
@@ -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;
@@ -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;
@@ -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;