* fix(linux): add user bin directories to systemd service PATH Fixes #1503 On Linux, the systemd service PATH was hardcoded to only include system directories (/usr/local/bin, /usr/bin, /bin), causing binaries installed via npm global with custom prefix or node version managers to not be found. This adds common Linux user bin directories to the PATH: - ~/.local/bin (XDG standard, pip, etc.) - ~/.npm-global/bin (npm custom prefix) - ~/bin (user's personal bin) - Node version manager paths (nvm, fnm, volta, asdf) - ~/.local/share/pnpm (pnpm global) - ~/.bun/bin (Bun) User directories are added before system directories so user-installed binaries take precedence. 🤖 AI-assisted (Claude Opus 4.5 via Clawdbot) 📋 Testing: Existing unit tests pass (7/7) * test: add comprehensive tests for Linux user bin directory resolution - Add dedicated tests for resolveLinuxUserBinDirs() function - Test path ordering (extraDirs > user dirs > system dirs) - Test buildMinimalServicePath() with HOME set/unset - Test platform-specific behavior (Linux vs macOS vs Windows) Test count: 7 → 20 (+13 tests) * test: add comprehensive tests for Linux user bin directory handling - Test Linux user directories included when HOME is set - Test Linux user directories excluded when HOME is missing - Test path ordering (extraDirs > user dirs > system dirs) - Test platform-specific behavior (Linux vs macOS vs Windows) - Test buildMinimalServicePath() with HOME in env Covers getMinimalServicePathParts() and buildMinimalServicePath() for all Linux user bin directory edge cases. Test count: 7 → 16 (+9 tests)
227 lines
7.5 KiB
TypeScript
227 lines
7.5 KiB
TypeScript
import path from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
import {
|
|
buildMinimalServicePath,
|
|
buildNodeServiceEnvironment,
|
|
buildServiceEnvironment,
|
|
getMinimalServicePathParts,
|
|
} from "./service-env.js";
|
|
|
|
describe("getMinimalServicePathParts - Linux user directories", () => {
|
|
it("includes user bin directories when HOME is set on Linux", () => {
|
|
const result = getMinimalServicePathParts({
|
|
platform: "linux",
|
|
home: "/home/testuser",
|
|
});
|
|
|
|
// Should include all common user bin directories
|
|
expect(result).toContain("/home/testuser/.local/bin");
|
|
expect(result).toContain("/home/testuser/.npm-global/bin");
|
|
expect(result).toContain("/home/testuser/bin");
|
|
expect(result).toContain("/home/testuser/.nvm/current/bin");
|
|
expect(result).toContain("/home/testuser/.fnm/current/bin");
|
|
expect(result).toContain("/home/testuser/.volta/bin");
|
|
expect(result).toContain("/home/testuser/.asdf/shims");
|
|
expect(result).toContain("/home/testuser/.local/share/pnpm");
|
|
expect(result).toContain("/home/testuser/.bun/bin");
|
|
});
|
|
|
|
it("excludes user bin directories when HOME is undefined on Linux", () => {
|
|
const result = getMinimalServicePathParts({
|
|
platform: "linux",
|
|
home: undefined,
|
|
});
|
|
|
|
// Should only include system directories
|
|
expect(result).toEqual(["/usr/local/bin", "/usr/bin", "/bin"]);
|
|
|
|
// Should not include any user-specific paths
|
|
expect(result.some((p) => p.includes(".local"))).toBe(false);
|
|
expect(result.some((p) => p.includes(".npm-global"))).toBe(false);
|
|
expect(result.some((p) => p.includes(".nvm"))).toBe(false);
|
|
});
|
|
|
|
it("places user directories before system directories on Linux", () => {
|
|
const result = getMinimalServicePathParts({
|
|
platform: "linux",
|
|
home: "/home/testuser",
|
|
});
|
|
|
|
const userDirIndex = result.indexOf("/home/testuser/.local/bin");
|
|
const systemDirIndex = result.indexOf("/usr/bin");
|
|
|
|
expect(userDirIndex).toBeGreaterThan(-1);
|
|
expect(systemDirIndex).toBeGreaterThan(-1);
|
|
expect(userDirIndex).toBeLessThan(systemDirIndex);
|
|
});
|
|
|
|
it("places extraDirs before user directories on Linux", () => {
|
|
const result = getMinimalServicePathParts({
|
|
platform: "linux",
|
|
home: "/home/testuser",
|
|
extraDirs: ["/custom/bin"],
|
|
});
|
|
|
|
const extraDirIndex = result.indexOf("/custom/bin");
|
|
const userDirIndex = result.indexOf("/home/testuser/.local/bin");
|
|
|
|
expect(extraDirIndex).toBeGreaterThan(-1);
|
|
expect(userDirIndex).toBeGreaterThan(-1);
|
|
expect(extraDirIndex).toBeLessThan(userDirIndex);
|
|
});
|
|
|
|
it("does not include Linux user directories on macOS", () => {
|
|
const result = getMinimalServicePathParts({
|
|
platform: "darwin",
|
|
home: "/Users/testuser",
|
|
});
|
|
|
|
// Should not include Linux-specific user dirs even with HOME set
|
|
expect(result.some((p) => p.includes(".npm-global"))).toBe(false);
|
|
expect(result.some((p) => p.includes(".nvm"))).toBe(false);
|
|
|
|
// Should only include macOS system directories
|
|
expect(result).toContain("/opt/homebrew/bin");
|
|
expect(result).toContain("/usr/local/bin");
|
|
});
|
|
|
|
it("does not include Linux user directories on Windows", () => {
|
|
const result = getMinimalServicePathParts({
|
|
platform: "win32",
|
|
home: "C:\\Users\\testuser",
|
|
});
|
|
|
|
// Windows returns empty array (uses existing PATH)
|
|
expect(result).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe("buildMinimalServicePath", () => {
|
|
it("includes Homebrew + system dirs on macOS", () => {
|
|
const result = buildMinimalServicePath({
|
|
platform: "darwin",
|
|
});
|
|
const parts = result.split(path.delimiter);
|
|
expect(parts).toContain("/opt/homebrew/bin");
|
|
expect(parts).toContain("/usr/local/bin");
|
|
expect(parts).toContain("/usr/bin");
|
|
expect(parts).toContain("/bin");
|
|
});
|
|
|
|
it("returns PATH as-is on Windows", () => {
|
|
const result = buildMinimalServicePath({
|
|
env: { PATH: "C:\\\\Windows\\\\System32" },
|
|
platform: "win32",
|
|
});
|
|
expect(result).toBe("C:\\\\Windows\\\\System32");
|
|
});
|
|
|
|
it("includes Linux user directories when HOME is set in env", () => {
|
|
const result = buildMinimalServicePath({
|
|
platform: "linux",
|
|
env: { HOME: "/home/alice" },
|
|
});
|
|
const parts = result.split(path.delimiter);
|
|
|
|
// Verify user directories are included
|
|
expect(parts).toContain("/home/alice/.local/bin");
|
|
expect(parts).toContain("/home/alice/.npm-global/bin");
|
|
expect(parts).toContain("/home/alice/.nvm/current/bin");
|
|
|
|
// Verify system directories are also included
|
|
expect(parts).toContain("/usr/local/bin");
|
|
expect(parts).toContain("/usr/bin");
|
|
expect(parts).toContain("/bin");
|
|
});
|
|
|
|
it("excludes Linux user directories when HOME is not in env", () => {
|
|
const result = buildMinimalServicePath({
|
|
platform: "linux",
|
|
env: {},
|
|
});
|
|
const parts = result.split(path.delimiter);
|
|
|
|
// Should only have system directories
|
|
expect(parts).toEqual(["/usr/local/bin", "/usr/bin", "/bin"]);
|
|
|
|
// No user-specific paths
|
|
expect(parts.some((p) => p.includes("home"))).toBe(false);
|
|
});
|
|
|
|
it("ensures user directories come before system directories on Linux", () => {
|
|
const result = buildMinimalServicePath({
|
|
platform: "linux",
|
|
env: { HOME: "/home/bob" },
|
|
});
|
|
const parts = result.split(path.delimiter);
|
|
|
|
const firstUserDirIdx = parts.indexOf("/home/bob/.local/bin");
|
|
const firstSystemDirIdx = parts.indexOf("/usr/local/bin");
|
|
|
|
expect(firstUserDirIdx).toBeLessThan(firstSystemDirIdx);
|
|
});
|
|
|
|
it("includes extra directories when provided", () => {
|
|
const result = buildMinimalServicePath({
|
|
platform: "linux",
|
|
extraDirs: ["/custom/tools"],
|
|
});
|
|
expect(result.split(path.delimiter)).toContain("/custom/tools");
|
|
});
|
|
|
|
it("deduplicates directories", () => {
|
|
const result = buildMinimalServicePath({
|
|
platform: "linux",
|
|
extraDirs: ["/usr/bin"],
|
|
});
|
|
const parts = result.split(path.delimiter);
|
|
const unique = [...new Set(parts)];
|
|
expect(parts.length).toBe(unique.length);
|
|
});
|
|
});
|
|
|
|
describe("buildServiceEnvironment", () => {
|
|
it("sets minimal PATH and gateway vars", () => {
|
|
const env = buildServiceEnvironment({
|
|
env: { HOME: "/home/user" },
|
|
port: 18789,
|
|
token: "secret",
|
|
});
|
|
expect(env.HOME).toBe("/home/user");
|
|
if (process.platform === "win32") {
|
|
expect(env.PATH).toBe("");
|
|
} else {
|
|
expect(env.PATH).toContain("/usr/bin");
|
|
}
|
|
expect(env.CLAWDBOT_GATEWAY_PORT).toBe("18789");
|
|
expect(env.CLAWDBOT_GATEWAY_TOKEN).toBe("secret");
|
|
expect(env.CLAWDBOT_SERVICE_MARKER).toBe("clawdbot");
|
|
expect(env.CLAWDBOT_SERVICE_KIND).toBe("gateway");
|
|
expect(typeof env.CLAWDBOT_SERVICE_VERSION).toBe("string");
|
|
expect(env.CLAWDBOT_SYSTEMD_UNIT).toBe("clawdbot-gateway.service");
|
|
if (process.platform === "darwin") {
|
|
expect(env.CLAWDBOT_LAUNCHD_LABEL).toBe("com.clawdbot.gateway");
|
|
}
|
|
});
|
|
|
|
it("uses profile-specific unit and label", () => {
|
|
const env = buildServiceEnvironment({
|
|
env: { HOME: "/home/user", CLAWDBOT_PROFILE: "work" },
|
|
port: 18789,
|
|
});
|
|
expect(env.CLAWDBOT_SYSTEMD_UNIT).toBe("clawdbot-gateway-work.service");
|
|
if (process.platform === "darwin") {
|
|
expect(env.CLAWDBOT_LAUNCHD_LABEL).toBe("com.clawdbot.work");
|
|
}
|
|
});
|
|
});
|
|
|
|
describe("buildNodeServiceEnvironment", () => {
|
|
it("passes through HOME for node services", () => {
|
|
const env = buildNodeServiceEnvironment({
|
|
env: { HOME: "/home/user" },
|
|
});
|
|
expect(env.HOME).toBe("/home/user");
|
|
});
|
|
});
|