Skip to content

The open-source app everyone uses to manage agents at work

fix(server): use realpathSync for .env path dedup to handle symlinks

Matt Van Hornff4f32634168
diff --git a/server/src/config.ts b/server/src/config.ts
index 0d25172c69..6943af7ada 100644
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -1,5 +1,5 @@
import { readConfigFile } from "./config-file.js";
-import { existsSync } from "node:fs";
+import { existsSync, realpathSync } from "node:fs";
import { resolve } from "node:path";
import { config as loadDotenv } from "dotenv";
import { resolvePaperclipEnvPath } from "./paths.js";
@@ -29,7 +29,10 @@ if (existsSync(PAPERCLIP_ENV_FILE_PATH)) {
}
const CWD_ENV_PATH = resolve(process.cwd(), ".env");
-if (CWD_ENV_PATH !== PAPERCLIP_ENV_FILE_PATH && existsSync(CWD_ENV_PATH)) {
+const isSameFile = existsSync(CWD_ENV_PATH) && existsSync(PAPERCLIP_ENV_FILE_PATH)
+ ? realpathSync(CWD_ENV_PATH) === realpathSync(PAPERCLIP_ENV_FILE_PATH)
+ : CWD_ENV_PATH === PAPERCLIP_ENV_FILE_PATH;
+if (!isSameFile && existsSync(CWD_ENV_PATH)) {
loadDotenv({ path: CWD_ENV_PATH, override: false, quiet: true });
}