Even more cleanup & fixes

Author: thecoolwinter

CodeEdit/Features/LSP/Registry/InstallationMethod.swift

@@ -53,14 +53,14 @@ enum InstallationMethod: Equatable {
 
     func packageManager(installPath: URL) -> PackageManagerProtocol? {
         switch packageManagerType {
-            //        case .npm:
-            //            return NPMPackageManager(installationDirectory: installPath)
+        case .npm:
+            return NPMPackageManager(installationDirectory: installPath)
             //        case .cargo:
             //            return CargoPackageManager(installationDirectory: installPath)
             //        case .pip:
             //            return PipPackageManager(installationDirectory: installPath)
-            //        case .golang:
-            //            return GolangPackageManager(installationDirectory: installPath)
+        case .golang:
+            return GolangPackageManager(installationDirectory: installPath)
         case .github, .sourceBuild:
             return GithubPackageManager(installationDirectory: installPath)
         case .nuget, .opam, .gem, .composer:

CodeEdit/Features/LSP/Registry/PackageManagerError.swift

@@ -5,10 +5,42 @@
 //  Created by Abe Malla on 5/12/25.
 //
 
-enum PackageManagerError: Error {
+import Foundation
+
+enum PackageManagerError: Error, LocalizedError {
     case unknown
     case packageManagerNotInstalled
     case initializationFailed(String)
     case installationFailed(String)
     case invalidConfiguration
+
+    var errorDescription: String? {
+        switch self {
+        case .unknown:
+            "Unknown error occurred"
+        case .packageManagerNotInstalled:
+            "The required package manager is not installed."
+        case .initializationFailed:
+            "Installation directory initialization failed."
+        case .installationFailed:
+            "Package installation failed."
+        case .invalidConfiguration:
+            "The package registry contained an invalid installation configuration."
+        }
+    }
+
+    var failureReason: String? {
+        switch self {
+        case .unknown:
+            nil
+        case .packageManagerNotInstalled:
+            nil
+        case .initializationFailed(let string):
+            string
+        case .installationFailed(let string):
+            string
+        case .invalidConfiguration:
+            nil
+        }
+    }
 }

CodeEdit/Features/LSP/Registry/PackageManagers/Install/PackageManagerInstallOperation.swift

@@ -10,9 +10,17 @@ import Combine
 
 @MainActor
 final class PackageManagerInstallOperation: ObservableObject, Identifiable {
-    struct OutputItem: Identifiable {
-        var id: UUID = UUID()
-        var contents: String
+    struct OutputItem: Identifiable, Equatable {
+        let id: UUID = UUID()
+        let isStepDivider: Bool
+        let outputIdx: Int?
+        let contents: String
+
+        init(outputIdx: Int? = nil, isStepDivider: Bool = false, contents: String) {
+            self.isStepDivider = isStepDivider
+            self.outputIdx = outputIdx
+            self.contents = contents
+        }
     }
 
     nonisolated var id: String { package.name }
@@ -35,6 +43,7 @@ final class PackageManagerInstallOperation: ObservableObject, Identifiable {
     private let shellClient: ShellClient = .live()
     private var operationTask: Task<Void, Error>?
     private var confirmationContinuation: CheckedContinuation<Void, Never>?
+    private var outputIdx = 0
 
     init(package: RegistryItem, steps: [PackageManagerInstallStep]) {
         self.package = package
@@ -87,11 +96,19 @@ final class PackageManagerInstallOperation: ObservableObject, Identifiable {
         progress.addChild(model.progress, withPendingUnitCount: 1)
 
         try Task.checkCancellation()
+        accumulatedOutput.append(OutputItem(isStepDivider: true, contents: "Step \(currentStepIdx + 1): \(task.name)"))
+
         await withTaskGroup(of: Void.self) { group in
             group.addTask {
-                for await line in model.outputStream {
+                for await outputItem in model.outputStream {
                     await MainActor.run {
-                        self.accumulatedOutput.append(OutputItem(contents: line))
+                        switch outputItem {
+                        case .status(let string):
+                            self.outputIdx += 1
+                            self.accumulatedOutput.append(OutputItem(outputIdx: self.outputIdx, contents: string))
+                        case .output(let string):
+                            self.accumulatedOutput.append(OutputItem(contents: string))
+                        }
                     }
                 }
             }
@@ -113,6 +130,7 @@ final class PackageManagerInstallOperation: ObservableObject, Identifiable {
 
         try Task.checkCancellation()
         if let error {
+            progress.cancel()
             throw error
         }
         try await runNext()

CodeEdit/Features/LSP/Registry/PackageManagers/Install/PackageManagerProgressModel.swift

@@ -10,20 +10,25 @@ import Combine
 
 @MainActor
 final class PackageManagerProgressModel: ObservableObject {
-    let outputStream: AsyncStream<String>
+    enum OutputItem {
+        case status(String)
+        case output(String)
+    }
+
+    let outputStream: AsyncStream<OutputItem>
     @Published var progress: Progress
 
     private let shellClient: ShellClient
-    private let outputContinuation: AsyncStream<String>.Continuation
+    private let outputContinuation: AsyncStream<OutputItem>.Continuation
 
     init(shellClient: ShellClient) {
         self.shellClient = shellClient
         self.progress = Progress(totalUnitCount: 1)
-        (outputStream, outputContinuation) = AsyncStream<String>.makeStream()
+        (outputStream, outputContinuation) = AsyncStream<OutputItem>.makeStream()
     }
 
     func status(_ string: String) {
-        outputContinuation.yield(string)
+        outputContinuation.yield(.status(string))
     }
 
     /// Creates the directory for the language server to be installed in
@@ -43,17 +48,19 @@ final class PackageManagerProgressModel: ObservableObject {
     }
 
     /// Executes commands in the specified directory
+    @discardableResult
     func executeInDirectory(in packagePath: String, _ args: [String]) async throws -> [String] {
         return try await runCommand("cd \"\(packagePath)\" && \(args.joined(separator: " "))")
     }
 
     /// Runs a shell command and returns output
+    @discardableResult
     func runCommand(_ command: String) async throws -> [String] {
         var output: [String] = []
-        status("Executing: \(command)")
+        status("\(command)")
         for try await line in shellClient.runAsync(command) {
             output.append(line)
-            outputContinuation.yield(line)
+            outputContinuation.yield(.output(line))
         }
         return output
     }

CodeEdit/Features/LSP/Registry/PackageManagers/Sources/NPMPackageManager.swift

@@ -27,8 +27,8 @@ final class NPMPackageManager: PackageManagerProtocol {
         let packagePath = installationDirectory.appending(path: source.entryName)
         return [
             initialize(in: packagePath),
-            runNpmInstall(source, in: installationDirectory),
-            verifyInstallation(source, installDir: installationDirectory)
+            runNpmInstall(source, installDir: packagePath),
+            verifyInstallation(source, installDir: packagePath)
         ]
 
     }
@@ -91,7 +91,7 @@ final class NPMPackageManager: PackageManagerProtocol {
 
     // MARK: - NPM Install
 
-    func runNpmInstall(_ source: PackageSource, in packagePath: URL) -> PackageManagerInstallStep {
+    func runNpmInstall(_ source: PackageSource, installDir installationDirectory: URL) -> PackageManagerInstallStep {
         let qualifiedSourceName = "\(source.pkgName)@\(source.version)"
         let otherPackages = source.options["extraPackages"]?
             .split(separator: ",")
@@ -127,9 +127,12 @@ final class NPMPackageManager: PackageManagerProtocol {
                     installArgs.append(extraPackage)
                 }
 
-                _ = try await model.executeInDirectory(in: packagePath.path, installArgs)
+                _ = try await model.executeInDirectory(
+                    in: installationDirectory.path(percentEncoded: false),
+                    installArgs
+                )
             } catch {
-                let nodeModulesPath = packagePath.appending(path: "node_modules").path
+                let nodeModulesPath = installationDirectory.appending(path: "node_modules").path(percentEncoded: false)
                 try? FileManager.default.removeItem(atPath: nodeModulesPath)
                 throw error
             }
@@ -141,17 +144,15 @@ final class NPMPackageManager: PackageManagerProtocol {
     /// Verify the installation was successful
     private func verifyInstallation(
         _ source: PackageSource,
-        installDir installationDirectory: URL
+        installDir packagePath: URL
     ) -> PackageManagerInstallStep {
-        let folderName = source.entryName
         let package = source.pkgName
         let version = source.version
 
         return PackageManagerInstallStep(
             name: "Verify Installation",
             confirmation: .none
         ) { _ in
-            let packagePath = installationDirectory.appending(path: folderName)
             let packageJsonPath = packagePath.appending(path: "package.json").path
 
             // Verify package.json contains the installed package