Fix Up Commands

Author: thecoolwinter

CodeEdit/Features/Tasks/TaskManager.swift

@@ -93,7 +93,7 @@ class TaskManager: ObservableObject {
         }
     }
 
-    func terminateSelectedTask() {
+    func terminateActiveTask() {
         guard let taskID = selectedTaskID else {
             return
         }

CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift

@@ -24,7 +24,7 @@ struct StopTaskToolbarButton: View {
         HStack {
             if let currentSelectedStatus, currentSelectedStatus == .running {
                     Button {
-                        taskManager.terminateSelectedTask()
+                        taskManager.terminateActiveTask()
                     } label: {
                         Label("Stop", systemImage: "stop.fill")
                             .labelStyle(.iconOnly)

CodeEdit/Features/WindowCommands/TasksCommands.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import Combine
 
 struct TasksCommands: Commands {
     @UpdatingWindowController var windowController: CodeEditWindowController?
@@ -14,29 +15,41 @@ struct TasksCommands: Commands {
         windowController?.workspace?.taskManager
     }
 
-    var selectedTask: CETask? {
-        taskManager?.availableTasks.first(where: { $0.id == taskManager?.selectedTaskID })
-    }
+    @State private var activeTaskStatus: CETaskStatus = .notRunning
+    @State private var taskManagerListener: AnyCancellable?
+    @State private var statusListener: AnyCancellable?
 
     var body: some Commands {
         CommandMenu("Tasks") {
-            let selectedTaskName: String? = if let selectedTask {
+            let selectedTaskName: String = if let selectedTask = taskManager?.selectedTask {
                 "\"" + selectedTask.name + "\""
             } else {
-                nil
+                "(No Selected Task)"
             }
 
-            Button("Run \(selectedTaskName ?? "(No Selected Task)")") {
+            Button("Run \(selectedTaskName)", systemImage: "play.fill") {
                 taskManager?.executeActiveTask()
+                showOutput()
             }
-            .keyboardShortcut("r", modifiers: .command)
+            .keyboardShortcut("R")
             .disabled(taskManager?.selectedTaskID == nil)
 
-            Button("Stop \(selectedTaskName ?? "(No Selected Task)")") {
-                taskManager?.terminateSelectedTask()
+            Button("Stop \(selectedTaskName)", systemImage: "stop.fill") {
+                taskManager?.terminateActiveTask()
+            }
+            .keyboardShortcut(".")
+            .onChange(of: windowController) { _ in
+                taskManagerListener = taskManager?.objectWillChange.sink {
+                    updateStatusListener()
+                }
+            }
+            .disabled(activeTaskStatus != .running)
+
+            Button("Show \(selectedTaskName) Output") {
+                showOutput()
             }
-            .keyboardShortcut(".", modifiers: .command)
-            .disabled(taskManager?.activeTasks.isEmpty == true)
+            // Disable when there's no output yet
+            .disabled(taskManager?.activeTasks[taskManager?.selectedTaskID ?? UUID()] == nil)
 
             Divider()
 
@@ -48,19 +61,54 @@ struct TasksCommands: Commands {
                         }
                     }
                 }
+
+                if taskManager?.availableTasks.isEmpty ?? true {
+                    Button("Create Tasks") {
+                        openSettings()
+                    }
+                }
             } label: {
                 Text("Choose Task...")
             }
             .disabled(taskManager?.availableTasks.isEmpty == true)
 
             Button("Manage Tasks...") {
-                NSApp.sendAction(
-                    #selector(CodeEditWindowController.openWorkspaceSettings(_:)),
-                    to: windowController,
-                    from: nil
-                )
+                openSettings()
             }
             .disabled(windowController == nil)
         }
     }
+
+    /// Update the ``statusListener`` to listen to a potentially new active task.
+    private func updateStatusListener() {
+        statusListener?.cancel()
+        guard let taskManager else { return }
+
+        activeTaskStatus = taskManager.activeTasks[taskManager.selectedTaskID ?? UUID()]?.status ?? .notRunning
+        guard let id = taskManager.selectedTaskID else { return }
+
+        statusListener = taskManager.activeTasks[id]?.$status.sink { newValue in
+            activeTaskStatus = newValue
+        }
+    }
+
+    private func showOutput() {
+        guard let utilityAreaModel = windowController?.workspace?.utilityAreaModel else {
+            return
+        }
+        if utilityAreaModel.isCollapsed {
+            // Open the utility area
+            utilityAreaModel.isCollapsed.toggle()
+        }
+        utilityAreaModel.selectedTab = .debugConsole // Switch to the correct tab
+        taskManager?.taskShowingOutput = taskManager?.selectedTaskID // Switch to the selected task
+    }
+
+    private func openSettings() {
+        NSApp.sendAction(
+            #selector(CodeEditWindowController.openWorkspaceSettings(_:)),
+            to: windowController,
+            from: nil
+        )
+    }
 }

CodeEditTests/Features/Tasks/TaskManagerTests.swift

@@ -59,7 +59,7 @@ final class TaskManagerTests: XCTestCase {
         let testExpectation1 = XCTestExpectation()
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             XCTAssertEqual(self.taskManager.taskStatus(taskID: task.id), .running)
-            self.taskManager.terminateSelectedTask()
+            self.taskManager.terminateActiveTask()
             testExpectation1.fulfill()
         }