fix(mac): run pnpm from project root and set PNPM_HOME for relay
This commit is contained in:
@@ -198,7 +198,8 @@ final class RelayProcessManager: ObservableObject {
|
|||||||
return [clawdisPath, "relay"]
|
return [clawdisPath, "relay"]
|
||||||
}
|
}
|
||||||
if let pnpm = self.findExecutable(named: "pnpm") {
|
if let pnpm = self.findExecutable(named: "pnpm") {
|
||||||
return [pnpm, "clawdis", "relay"]
|
// Run pnpm from the project root so package.json is present.
|
||||||
|
return [pnpm, "clawdis", "relay", "--dir", self.defaultProjectRoot().path]
|
||||||
}
|
}
|
||||||
if let node = self.findExecutable(named: "node") {
|
if let node = self.findExecutable(named: "node") {
|
||||||
let warelay = self.defaultProjectRoot().appendingPathComponent("bin/warelay.js").path
|
let warelay = self.defaultProjectRoot().appendingPathComponent("bin/warelay.js").path
|
||||||
@@ -211,7 +212,12 @@ final class RelayProcessManager: ObservableObject {
|
|||||||
|
|
||||||
private func makeEnvironment() -> Environment {
|
private func makeEnvironment() -> Environment {
|
||||||
let merged = self.preferredPaths().joined(separator: ":")
|
let merged = self.preferredPaths().joined(separator: ":")
|
||||||
return .inherit.updating(["PATH": merged])
|
return .inherit.updating([
|
||||||
|
"PATH": merged,
|
||||||
|
"PNPM_HOME": FileManager.default.homeDirectoryForCurrentUser
|
||||||
|
.appendingPathComponent("Library/pnpm").path,
|
||||||
|
"CLAWDIS_PROJECT_ROOT": self.defaultProjectRoot().path,
|
||||||
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
private func preferredPaths() -> [String] {
|
private func preferredPaths() -> [String] {
|
||||||
|
|||||||
Reference in New Issue
Block a user