Support Linux login-shell PATH hydration

juliusmarminge · juliusmarminge · commit ccb8b259acaf · 2026-03-28T11:08:20.000-07:00
- Extend PATH sync to Linux desktop and server startup
- Add tests for Linux handling and non-matching platforms
diff --git a/apps/desktop/src/syncShellEnvironment.test.ts b/apps/desktop/src/syncShellEnvironment.test.ts
@@ -62,14 +62,13 @@ describe("syncShellEnvironment", () => {
     expect(env.SSH_AUTH_SOCK).toBe("/tmp/inherited.sock");
   });
 
-  it("does nothing outside macOS", () => {
+  it("hydrates PATH and missing SSH_AUTH_SOCK from the login shell on linux", () => {
     const env: NodeJS.ProcessEnv = {
       SHELL: "/bin/zsh",
       PATH: "/usr/bin",
-      SSH_AUTH_SOCK: "/tmp/inherited.sock",
     };
     const readEnvironment = vi.fn(() => ({
-      PATH: "/opt/homebrew/bin:/usr/bin",
+      PATH: "/home/linuxbrew/.linuxbrew/bin:/usr/bin",
       SSH_AUTH_SOCK: "/tmp/secretive.sock",
     }));
 
@@ -78,8 +77,29 @@ describe("syncShellEnvironment", () => {
       readEnvironment,
     });
 
+    expect(readEnvironment).toHaveBeenCalledWith("/bin/zsh", ["PATH", "SSH_AUTH_SOCK"]);
+    expect(env.PATH).toBe("/home/linuxbrew/.linuxbrew/bin:/usr/bin");
+    expect(env.SSH_AUTH_SOCK).toBe("/tmp/secretive.sock");
+  });
+
+  it("does nothing outside macOS and linux", () => {
+    const env: NodeJS.ProcessEnv = {
+      SHELL: "C:/Program Files/Git/bin/bash.exe",
+      PATH: "C:\\Windows\\System32",
+      SSH_AUTH_SOCK: "/tmp/inherited.sock",
+    };
+    const readEnvironment = vi.fn(() => ({
+      PATH: "/usr/local/bin:/usr/bin",
+      SSH_AUTH_SOCK: "/tmp/secretive.sock",
+    }));
+
+    syncShellEnvironment(env, {
+      platform: "win32",
+      readEnvironment,
+    });
+
     expect(readEnvironment).not.toHaveBeenCalled();
-    expect(env.PATH).toBe("/usr/bin");
+    expect(env.PATH).toBe("C:\\Windows\\System32");
     expect(env.SSH_AUTH_SOCK).toBe("/tmp/inherited.sock");
   });
 });
diff --git a/apps/desktop/src/syncShellEnvironment.ts b/apps/desktop/src/syncShellEnvironment.ts
@@ -1,4 +1,8 @@
-import { readEnvironmentFromLoginShell, resolveLoginShell, ShellEnvironmentReader } from "@t3tools/shared/shell";
+import {
+  readEnvironmentFromLoginShell,
+  resolveLoginShell,
+  ShellEnvironmentReader,
+} from "@t3tools/shared/shell";
 
 export function syncShellEnvironment(
   env: NodeJS.ProcessEnv = process.env,
diff --git a/apps/server/src/os-jank.test.ts b/apps/server/src/os-jank.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { fixPath } from "./os-jank";
+
+describe("fixPath", () => {
+  it("hydrates PATH on linux using the resolved login shell", () => {
+    const env: NodeJS.ProcessEnv = {
+      SHELL: "/bin/zsh",
+      PATH: "/usr/bin",
+    };
+    const readPath = vi.fn(() => "/opt/homebrew/bin:/usr/bin");
+
+    fixPath({
+      env,
+      platform: "linux",
+      readPath,
+    });
+
+    expect(readPath).toHaveBeenCalledWith("/bin/zsh");
+    expect(env.PATH).toBe("/opt/homebrew/bin:/usr/bin");
+  });
+
+  it("does nothing outside macOS and linux even when SHELL is set", () => {
+    const env: NodeJS.ProcessEnv = {
+      SHELL: "C:/Program Files/Git/bin/bash.exe",
+      PATH: "C:\\Windows\\System32",
+    };
+    const readPath = vi.fn(() => "/usr/local/bin:/usr/bin");
+
+    fixPath({
+      env,
+      platform: "win32",
+      readPath,
+    });
+
+    expect(readPath).not.toHaveBeenCalled();
+    expect(env.PATH).toBe("C:\\Windows\\System32");
+  });
+});
diff --git a/apps/server/src/os-jank.ts b/apps/server/src/os-jank.ts
@@ -2,13 +2,24 @@ import * as OS from "node:os";
 import { Effect, Path } from "effect";
 import { readPathFromLoginShell, resolveLoginShell } from "@t3tools/shared/shell";
 
-export function fixPath(): void {
+export function fixPath(
+  options: {
+    env?: NodeJS.ProcessEnv;
+    platform?: NodeJS.Platform;
+    readPath?: typeof readPathFromLoginShell;
+  } = {},
+): void {
+  const platform = options.platform ?? process.platform;
+  if (platform !== "darwin" && platform !== "linux") return;
+
+  const env = options.env ?? process.env;
+
   try {
-    const shell = resolveLoginShell(process.platform, process.env.SHELL);
+    const shell = resolveLoginShell(platform, env.SHELL);
     if (!shell) return;
-    const result = readPathFromLoginShell(shell);
+    const result = (options.readPath ?? readPathFromLoginShell)(shell);
     if (result) {
-      process.env.PATH = result;
+      env.PATH = result;
     }
   } catch {
     // Silently ignore — keep default PATH
