From ed3669c39f8b5dd3aa63bce835ef3c8c85e34638 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 13 Sep 2026 16:04:11 +0000
Subject: [PATCH] Fix terminal launch codepages

---
 app/src/main/java/io/xpipe/app/process/ShellDialect.java    | 2 +-
 .../main/java/io/xpipe/app/terminal/TerminalLauncher.java   | 2 ++
 .../io/xpipe/app/terminal/TerminalPaneConfiguration.java    | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/process/ShellDialect.java b/app/src/main/java/io/xpipe/app/process/ShellDialect.java
index 91c7f89db..d29687cf0 100644
--- a/app/src/main/java/io/xpipe/app/process/ShellDialect.java
+++ b/app/src/main/java/io/xpipe/app/process/ShellDialect.java
@@ -28,7 +28,7 @@ public interface ShellDialect {
         return null;
     }
 
-    String terminalLauncherScript(UUID request, String name, boolean alwaysPromptRestart);
+    String terminalLauncherScript(ShellControl sc, UUID request, String name, boolean alwaysPromptRestart);
 
     String getExecutableName();
 
diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
index 294aea745..1288f60ec 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
@@ -1,5 +1,6 @@
 package io.xpipe.app.terminal;
 
+import io.xpipe.app.beacon.AppBeaconServer;
 import io.xpipe.app.core.AppInstallation;
 import io.xpipe.app.core.AppNames;
 import io.xpipe.app.issue.ErrorEventFactory;
@@ -401,6 +402,7 @@ public class TerminalLauncher {
         var registerLine = CommandBuilder.of()
                 .addFile(sc.getLocalSystemAccess().translateFromLocalSystemPath(FilePath.of(exec)))
                 .add("terminal-register", "--request", request.toString())
+                .add("--port", AppBeaconServer.get().getPort() + "")
                 .buildSimple();
         var powershell = ShellDialects.isPowershell(sc);
         var bellLine = "printf \"\\a\"";
diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalPaneConfiguration.java b/app/src/main/java/io/xpipe/app/terminal/TerminalPaneConfiguration.java
index 6b31114bf..a6c7d9f71 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalPaneConfiguration.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalPaneConfiguration.java
@@ -70,7 +70,7 @@ public class TerminalPaneConfiguration {
             var sc = LocalShell.getShell();
             var register = TerminalLauncher.getTerminalRegisterCommand(request, sc);
             var launcherScript = (debugMode ? sc.getShellDialect().getSetEnvironmentVariableCommand("XPIPE_DEBUG", "true") + "\n" : "") +
-                    register + "\n" + sc.getShellDialect().terminalLauncherScript(request, title, alwaysPromptRestart);
+                    register + "\n" + sc.getShellDialect().terminalLauncherScript(sc, request, title, alwaysPromptRestart);
             var config = new TerminalPaneConfiguration(request, title, paneIndex, launcherScript, sc.getShellDialect());
             return config;
         }
@@ -88,7 +88,7 @@ public class TerminalPaneConfiguration {
             var launcherScript = ScriptHelper.createExecScript(
                     ShellDialects.POWERSHELL,
                     sc,
-                    ShellDialects.POWERSHELL.terminalLauncherScript(request, title, alwaysPromptRestart));
+                    ShellDialects.POWERSHELL.terminalLauncherScript(sc, request, title, alwaysPromptRestart));
             var content = """
                           %s
                           %s
@@ -121,7 +121,7 @@ public class TerminalPaneConfiguration {
                     LocalShell.getShell(),
                     LocalShell.getShell()
                             .getShellDialect()
-                            .terminalLauncherScript(request, title, alwaysPromptRestart));
+                            .terminalLauncherScript(sc, request, title, alwaysPromptRestart));
             var command = sc == LocalShell.getShell()
                     ? launcherScript
                     : LocalShell.getShell()