Merge pull request #41 from AgoraIO-Community/feat/design-update

fix(macos): launch node with login-shell PATH so codex finds node

Author: plutoless

macos/Sources/NewbroExecutor/AppModel.swift

@@ -21,12 +21,17 @@ final class AppModel: ObservableObject {
     // so they never freeze the main actor / menu.
     private let controlQueue = DispatchQueue(label: "newbro.ui.control")
 
+    /// Login-shell PATH so node subprocesses (and the `node`-based `codex`
+    /// they exec) resolve under the app's otherwise-minimal launchd env.
+    private let childEnv = RuntimeLocator.childEnvironment()
+
     init() {
         let loc = locator
+        let env = RuntimeLocator.childEnvironment()
         self.loginItem = LoginItem(appPath: Bundle.main.bundlePath)
         self.supervisor = ProfileSupervisor(
             processFactory: .init(make: { argv, onLine, onExit in
-                NodeProcess(argv: argv, onLine: onLine, onExit: onExit)
+                NodeProcess(argv: argv, environment: env, onLine: onLine, onExit: onExit)
             }),
             argvBuilder: { profile in
                 loc.nodeArgv(for: profile) ?? []
@@ -102,6 +107,7 @@ final class AppModel: ObservableObject {
         let argv = locator.installCommandArgv()
         updateInstallProcess = NodeProcess(
             argv: argv,
+            environment: childEnv,
             onLine: { _ in },
             onExit: { [weak self] code in
                 Task { @MainActor in
@@ -213,6 +219,7 @@ final class AppModel: ObservableObject {
         // Retain the process; otherwise it is deallocated before it runs.
         installProcess = NodeProcess(
             argv: argv,
+            environment: childEnv,
             onLine: { [weak self] line in
                 Task { @MainActor in self?.installLog += line + "\n" }
             },

macos/Sources/NewbroExecutorCore/NodeProcess.swift

@@ -8,16 +8,19 @@ public protocol NodeProcessProtocol: AnyObject {
 
 public final class NodeProcess: NodeProcessProtocol {
     private let argv: [String]
+    private let environment: [String: String]?
     private let onLine: (String) -> Void
     private let onExit: (Int32) -> Void
     private var process: Process?
     private let queue = DispatchQueue(label: "newbro.node-process")
     private var buffer = Data()
 
     public init(argv: [String],
+                environment: [String: String]? = nil,
                 onLine: @escaping (String) -> Void,
                 onExit: @escaping (Int32) -> Void) {
         self.argv = argv
+        self.environment = environment
         self.onLine = onLine
         self.onExit = onExit
     }
@@ -29,6 +32,7 @@ public final class NodeProcess: NodeProcessProtocol {
         let proc = Process()
         proc.executableURL = URL(fileURLWithPath: argv[0])
         proc.arguments = Array(argv.dropFirst())
+        if let environment { proc.environment = environment }
         let pipe = Pipe()
         proc.standardOutput = pipe
         proc.standardError = pipe

macos/Sources/NewbroExecutorCore/RuntimeLocator.swift

@@ -76,4 +76,36 @@ public struct RuntimeLocator {
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         return output.isEmpty ? nil : output
     }
+
+    /// The login shell's PATH. A menu-bar/login-item app inherits a minimal
+    /// launchd PATH, so node subprocesses (and tools they exec, like the
+    /// `node`-based `codex` binary) must run with the user's real PATH.
+    public static func loginShellPath() -> String? {
+        let proc = Process()
+        proc.executableURL = URL(fileURLWithPath: "/bin/zsh")
+        proc.arguments = ["-lc", "printf %s \"$PATH\""]
+        let pipe = Pipe()
+        proc.standardOutput = pipe
+        proc.standardError = FileHandle.nullDevice
+        do {
+            try proc.run()
+        } catch {
+            return nil
+        }
+        let data = pipe.fileHandleForReading.readDataToEndOfFile()
+        proc.waitUntilExit()
+        let output = String(data: data, encoding: .utf8)?
+            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        return output.isEmpty ? nil : output
+    }
+
+    /// The current process environment with PATH replaced by the login-shell
+    /// PATH (when available), suitable for launching node subprocesses.
+    public static func childEnvironment() -> [String: String] {
+        var env = ProcessInfo.processInfo.environment
+        if let shellPath = loginShellPath(), !shellPath.isEmpty {
+            env["PATH"] = shellPath
+        }
+        return env
+    }
 }

macos/Tests/NewbroExecutorCoreTests/NodeProcessTests.swift

@@ -76,6 +76,22 @@ final class NodeProcessTests: XCTestCase {
         XCTAssertFalse(proc.isRunning)
     }
 
+    func testHonorsCustomEnvironment() {
+        // The menu-bar app launches with a minimal PATH; it must be able to
+        // override the child's environment (so e.g. `node`/`codex` resolve).
+        let lines = Box<[String]>([])
+        let exited = expectation(description: "exited")
+        let proc = NodeProcess(
+            argv: ["/bin/sh", "-c", "printf 'PATHIS=%s\\n' \"$PATH\""],
+            environment: ["PATH": "/custom/bin:/usr/bin"],
+            onLine: { line in lines.mutate { $0.append(line) } },
+            onExit: { _ in exited.fulfill() }
+        )
+        proc.start()
+        wait(for: [exited], timeout: 10)
+        XCTAssertTrue(lines.value.contains("PATHIS=/custom/bin:/usr/bin"))
+    }
+
     func testStopTerminatesLongRunner() {
         let started = expectation(description: "started")
         started.assertForOverFulfill = false