Remove use of FileManager

Author: thecoolwinter

CodeEdit/Features/Tasks/Models/CEActiveTask.swift

@@ -43,7 +43,7 @@ class CEActiveTask: ObservableObject, Identifiable, Hashable {
         }.store(in: &cancellables)
     }
 
-    func run(workspaceURL: URL) {
+    func run(workspaceURL: URL?) {
         self.workspaceURL = workspaceURL
         self.activeTaskID = UUID() // generate a new ID for this run
 

CodeEdit/Features/Tasks/TaskManager.swift

@@ -16,10 +16,10 @@ class TaskManager: ObservableObject {
 
     @ObservedObject var workspaceSettings: CEWorkspaceSettingsData
 
-    private var workspaceURL: URL
+    private var workspaceURL: URL?
     private var settingsListener: AnyCancellable?
 
-    init(workspaceSettings: CEWorkspaceSettingsData, workspaceURL: URL) {
+    init(workspaceSettings: CEWorkspaceSettingsData, workspaceURL: URL?) {
         self.workspaceURL = workspaceURL
         self.workspaceSettings = workspaceSettings
 

CodeEdit/Features/TerminalEmulator/Views/CEActiveTaskTerminalView.swift

@@ -67,15 +67,14 @@ class CEActiveTaskTerminalView: CELocalShellTerminalView {
     }
 
     override func startProcess(
-        workspaceURL url: URL,
+        workspaceURL url: URL?,
         shell: Shell? = nil,
         environment: [String] = [],
         interactive: Bool = true
     ) {
         // Start the shell
         do {
             let terminalSettings = Settings.shared.preferences.terminal
-            FileManager.default.changeCurrentDirectoryPath(url.path)
 
             var terminalEnvironment: [String] = Terminal.getEnvironmentVariables()
             terminalEnvironment.append("TERM_PROGRAM=CodeEditApp_Terminal")
@@ -92,17 +91,21 @@ class CEActiveTaskTerminalView: CELocalShellTerminalView {
             )
 
             terminalEnvironment.append(contentsOf: environment)
+            terminalEnvironment.append("CE_SHELL_INTEGRATION_DISABLE_PROMPT=1")
+            terminalEnvironment.append(
+                contentsOf: activeTask.task.environmentVariables.map({ $0.key + "=" + $0.value })
+            )
 
             process.startProcess(
                 executable: shellPath,
                 args: shellArgs,
-                environment: terminalEnvironment + ["CE_SHELL_INTEGRATION_DISABLE_PROMPT=1"],
-                execName: shell.rawValue
+                environment: terminalEnvironment,
+                execName: shell.rawValue,
+                currentDirectory: URL(filePath: activeTask.task.workingDirectory, relativeTo: url).absolutePath
             )
 
             // Feed the command and run it
-            let data = Array(activeTask.task.command.utf8)
-            process.send(data: data[0..<data.count])
+            process.send(text: activeTask.task.command)
             process.send(data: EscapeSequences.cmdRet[0..<1])
         } catch {
             newline()
@@ -172,6 +175,13 @@ class CEActiveTaskTerminalView: CELocalShellTerminalView {
         return children
     }
 
+    func getBufferAsString() -> String {
+        terminal.getText(
+            start: .init(col: 0, row: 0),
+            end: .init(col: terminal.cols, row: terminal.rows + terminal.buffer.yDisp)
+        )
+    }
+
     override func dataReceived(slice: ArraySlice<UInt8>) {
         if enableOutput {
             super.dataReceived(slice: slice)

CodeEdit/Features/TerminalEmulator/Views/CELocalShellTerminalView.swift

@@ -16,7 +16,9 @@ import Foundation
 /// frame of `0`. This enables terminals to keep running in the background, and allows them to be removed and added
 /// back into the hierarchy for use in the utility area.
 ///
-/// If there is a bug here: **there probably isn't**. Look instead in ``TerminalEmulatorView``.
+/// # 07/15/25
+/// This has now been updated so that it differs from `LocalProcessTerminalView` in enough important ways that it
+/// should not be removed in the future even if SwiftTerm has a change in behavior.
 
 protocol CELocalShellTerminalViewDelegate: AnyObject {
     /// This method is invoked to notify that the terminal has been resized to the specified number of columns and rows
@@ -73,18 +75,12 @@ class CELocalShellTerminalView: CETerminalView, TerminalViewDelegate, LocalProce
     ///     - workspaceURL: The URL of the workspace to start at.
     ///     - shell: The shell to use, leave as `nil` to
     public func startProcess(
-        workspaceURL url: URL,
+        workspaceURL url: URL?,
         shell: Shell? = nil,
         environment: [String] = [],
         interactive: Bool = true
     ) {
         let terminalSettings = Settings.shared.preferences.terminal
-        // changes working directory to project root
-        // TODO: Get rid of FileManager shared instance to prevent problems
-        // using shared instance of FileManager might lead to problems when using
-        // multiple workspaces. This works for now but most probably will need
-        // to be changed later on
-        FileManager.default.changeCurrentDirectoryPath(url.path)
 
         var terminalEnvironment: [String] = Terminal.getEnvironmentVariables()
         terminalEnvironment.append("TERM_PROGRAM=CodeEditApp_Terminal")
@@ -114,7 +110,8 @@ class CELocalShellTerminalView: CETerminalView, TerminalViewDelegate, LocalProce
                 executable: shellPath,
                 args: shellArgs,
                 environment: terminalEnvironment,
-                execName: shell.rawValue
+                execName: shell.rawValue,
+                currentDirectory: url?.absolutePath
             )
         } catch {
             terminal.feed(text: "Failed to start a terminal session: \(error.localizedDescription)")

CodeEdit/Utils/Extensions/LocalProcess/LocalProcess+sendText.swift

@@ -0,0 +1,15 @@
+//
+//  LocalProcess+sendText.swift
+//  CodeEdit
+//
+//  Created by Khan Winter on 7/15/25.
+//
+
+import SwiftTerm
+
+extension LocalProcess {
+    func send(text: String) {
+        let array = Array(text.utf8)
+        self.send(data: array[0..<array.count])
+    }
+}