Fixing issues for env variables

[jamesrochabrun]

Summary

Aims to resolve #16

Tested this with current ClientChatDemo project Using Brave search

Details

[gsabran]

Looking good, some comments

[gsabran]

can we keep the initial condition? If the executable is found no need to load the env

[jamesrochabrun]

done!

[gsabran]

keep?

[gsabran]

If we add userEnv to the process here, does it get merged automatically when calling printenv ?

[jamesrochabrun]

I don't think so? environment variables assigned to a process don't automatically merge with the shell's environment when running commands. I updated the code to do so, what do you think?

[gsabran]

nice!

[gsabran]

wouldn't shellProcess.environment = userEnv do the same?

[jamesrochabrun]

Disclaimer: with assistance of Claude

My understanding is that setting shellProcess.environment = userEnv wouldn't have the same effect because:

We're using zsh with -il flags which loads configuration files that might override environment variables
The explicit export commands ensure the variables are definitely set within the shell session where printenv runs
This approach guarantees the user variables appear in the printenv output, regardless of how zsh loads its environment.

[gsabran]

You can't trust those AI

[gsabran]

Looking good! Two nit comments. Can you rebase before merging? I simplified the linting and as there's no pre-merge checks not rebasing would lead to issues on main.

(swiftformat --config rules.swiftformat .)

[gsabran]

shellProcess.environment = userEnv.isEmpty ? ProcessInfo.processInfo.environment : userEnv
shellProcess.arguments = ["-ilc", "printenv"]

[jamesrochabrun]

updated!

[jamesrochabrun]

  private static func loadZshEnvironment(userEnv: [String: String]? = nil) throws -> [String: String] {
    // Load shell environment as base
    let shellProcess = Process()
    shellProcess.executableURL = URL(fileURLWithPath: "/bin/zsh")

    // Set process environment - either use userEnv if it exists and isn't empty, or use system environment
    if let env = userEnv, !env.isEmpty {
      shellProcess.environment = env
    } else {
      shellProcess.environment = ProcessInfo.processInfo.environment
    }

    shellProcess.arguments = ["-ilc", "printenv"]

    let outputPipe = Pipe()
    shellProcess.standardOutput = outputPipe
    shellProcess.standardError = Pipe()

    try shellProcess.run()
    shellProcess.waitUntilExit()

    let data = outputPipe.fileHandleForReading.readDataToEndOfFile()
    guard let outputString = String(data: data, encoding: .utf8) else {
      logger.error("Failed to read environment from shell.")
      return ProcessInfo.processInfo.environment
    }

    // Parse shell environment
    return outputString
      .split(separator: "\n")
      .reduce(into: [String: String]()) { result, line in
        let components = line.split(separator: "=", maxSplits: 1)
        guard components.count == 2 else { return }
        result[String(components[0])] = String(components[1])
      }
  }

[gsabran]

Thanks a lot!