From 46d49a4aed2522f2e91282e54e68b2a4ffd92d68 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 25 Aug 2025 09:38:49 +0000
Subject: [PATCH] Fix wt spaces in path

---
 .../app/terminal/WindowsTerminalType.java     | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
index 8f84f3cb9..da37cbac3 100644
--- a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
@@ -47,9 +47,11 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
 
         cmd.add("--title").addQuoted(fixedName);
         cmd.add("--profile").addQuoted("{021eff0f-b38a-45f9-895d-41467e9d510f}");
+
+        var spaces = configuration.getScriptFile().toString().contains(" ");
         cmd.add(configuration
                 .getScriptDialect()
-                .getOpenScriptCommand(configuration.getScriptFile().getFileName()));
+                .getOpenScriptCommand(spaces ? configuration.getScriptFile().getFileName() : configuration.getScriptFile().toString()));
         return cmd;
     }
 
@@ -131,11 +133,16 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
             try (var sc = LocalShell.getShell().start()) {
                 var inPath = sc.view().findProgram("wt");
                 var exec = inPath.orElse(FilePath.of(getPath()));
-                var wd = sc.view().pwd();
-                sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
-                        .withWorkingDirectory(configuration.getScriptFile().getParent())
-                        .execute();
-                sc.view().cd(wd);
+                var spaces = configuration.getScriptFile().toString().contains(" ");
+
+                if (spaces) {
+                    var wd = sc.view().pwd();
+                    sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).withWorkingDirectory(
+                            configuration.getScriptFile().getParent()).execute();
+                    sc.view().cd(wd);
+                } else {
+                    sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).execute();
+                }
             }
         }
 
@@ -181,10 +188,16 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
             try (var sc = LocalShell.getShell().start()) {
                 var exec = getPath();
                 var wd = sc.view().pwd();
-                sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
-                        .withWorkingDirectory(configuration.getScriptFile().getParent())
-                        .execute();
-                sc.view().cd(wd);
+                var spaces = configuration.getScriptFile().toString().contains(" ");
+
+                if (spaces) {
+                    sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
+                            .withWorkingDirectory(configuration.getScriptFile().getParent())
+                            .execute();
+                    sc.view().cd(wd);
+                } else {
+                    sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).execute();
+                }
             }
         }
 
@@ -231,10 +244,15 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
             try (var sc = LocalShell.getShell().start()) {
                 var exec = getPath();
                 var wd = sc.view().pwd();
-                sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
-                        .withWorkingDirectory(configuration.getScriptFile().getParent())
-                        .execute();
-                sc.view().cd(wd);
+                var spaces = configuration.getScriptFile().toString().contains(" ");
+
+                if (spaces) {
+                    sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).withWorkingDirectory(
+                            configuration.getScriptFile().getParent()).execute();
+                    sc.view().cd(wd);
+                } else {
+                    sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).execute();
+                }
             }
         }