Change currentDirectoryPath to currentDirectoryURL

Author: intitni

Core/Sources/ChatPlugin/TerminalChatPlugin.swift

@@ -34,10 +34,16 @@ public actor TerminalChatPlugin: ChatPlugin {
         }
 
         do {
+            let fileURL = XcodeInspector.shared.realtimeActiveDocumentURL
+            let projectURL = XcodeInspector.shared.realtimeActiveProjectURL
 
-            guard let fileURL = XcodeInspector.shared.realtimeActiveDocumentURL,
-                let projectURL = XcodeInspector.shared.realtimeActiveProjectURL
-            else { return }
+            var environment = [String: String]()
+            if let fileURL {
+                environment["FILE_PATH"] = fileURL.path
+            }
+            if let projectURL {
+                environment["PROJECT_ROOT"] = projectURL.path
+            }
 
             await chatGPTService.memory.mutateHistory { history in
                 history.append(
@@ -56,11 +62,8 @@ public actor TerminalChatPlugin: ChatPlugin {
             let output = terminal.streamCommand(
                 shell,
                 arguments: ["-i", "-l", "-c", content],
-                currentDirectoryPath: projectURL.path,
-                environment: [
-                    "PROJECT_ROOT": projectURL.path,
-                    "FILE_PATH": fileURL.path,
-                ]
+                currentDirectoryURL: projectURL,
+                environment: environment
             )
 
             for try await content in output {

Core/Sources/ChatPlugins/ShortcutChatPlugin/ShortcutChatPlugin.swift

@@ -76,7 +76,7 @@ public actor ShortcutChatPlugin: ChatPlugin {
             _ = try await terminal.runCommand(
                 shell,
                 arguments: ["-i", "-l", "-c", command],
-                currentDirectoryPath: "/",
+                currentDirectoryURL: nil,
                 environment: [:]
             )
 

Core/Sources/ChatPlugins/ShortcutChatPlugin/ShortcutInputChatPlugin.swift

@@ -76,7 +76,7 @@ public actor ShortcutInputChatPlugin: ChatPlugin {
             _ = try await terminal.runCommand(
                 shell,
                 arguments: ["-i", "-l", "-c", command],
-                currentDirectoryPath: "/",
+                currentDirectoryURL: nil,
                 environment: [:]
             )
 

Tool/Sources/GitHubCopilotService/GitHubCopilotInstallationManager.swift

@@ -104,7 +104,7 @@ public struct GitHubCopilotInstallationManager {
                     _ = try await terminal.runCommand(
                         "/usr/bin/unzip",
                         arguments: [targetURL.path],
-                        currentDirectoryPath: urls.executableURL.path,
+                        currentDirectoryURL: urls.executableURL,
                         environment: [:]
                     )
 

Tool/Sources/GitIgnoreCheck/GitIgnoreCheck.swift

@@ -55,7 +55,7 @@ public struct DefaultGitIgnoredChecker: GitIgnoredChecker {
             let result = try await terminal.runCommand(
                 "/bin/bash",
                 arguments: ["-c", "git check-ignore \"\(fileURL.path)\""],
-                currentDirectoryPath: gitFolderURL.path,
+                currentDirectoryURL: gitFolderURL,
                 environment: [:]
             )
             if result.isEmpty { return false }
@@ -77,7 +77,7 @@ public struct DefaultGitIgnoredChecker: GitIgnoredChecker {
             let result = try await terminal.runCommand(
                 "/bin/bash",
                 arguments: ["-c", "git check-ignore \(filePaths)"],
-                currentDirectoryPath: gitFolderURL.path,
+                currentDirectoryURL: gitFolderURL,
                 environment: [:]
             )
             return result

Tool/Sources/Terminal/Terminal.swift

@@ -5,14 +5,14 @@ public protocol TerminalType {
     func streamCommand(
         _ command: String,
         arguments: [String],
-        currentDirectoryPath: String,
+        currentDirectoryURL: URL?,
         environment: [String: String]
     ) -> AsyncThrowingStream<String, Error>
 
     func runCommand(
         _ command: String,
         arguments: [String],
-        currentDirectoryPath: String,
+        currentDirectoryURL: URL?,
         environment: [String: String]
     ) async throws -> String
 
@@ -44,15 +44,15 @@ public final class Terminal: TerminalType, @unchecked Sendable {
     public func streamCommand(
         _ command: String = "/bin/bash",
         arguments: [String],
-        currentDirectoryPath: String = "/",
+        currentDirectoryURL: URL? = nil,
         environment: [String: String]
     ) -> AsyncThrowingStream<String, Error> {
         self.process?.terminate()
         let process = Process()
         self.process = process
 
         process.launchPath = command
-        process.currentDirectoryPath = currentDirectoryPath
+        process.currentDirectoryURL = currentDirectoryURL
         process.arguments = arguments
         process.environment = getEnvironmentVariables()
             .merging(environment, uniquingKeysWith: { $1 })
@@ -128,12 +128,12 @@ public final class Terminal: TerminalType, @unchecked Sendable {
     public func runCommand(
         _ command: String = "/bin/bash",
         arguments: [String],
-        currentDirectoryPath: String = "/",
+        currentDirectoryURL: URL? = nil,
         environment: [String: String]
     ) async throws -> String {
         let process = Process()
         process.launchPath = command
-        process.currentDirectoryPath = currentDirectoryPath
+        process.currentDirectoryURL = currentDirectoryURL
         process.arguments = arguments
         process.environment = getEnvironmentVariables()
             .merging(environment, uniquingKeysWith: { $1 })