fix(install): inject execPath for nvm detection in service env builder

GodsBoy · GodsBoy · commit 31dee69df200 · 2026-03-17T17:35:46.000+02:00
diff --git a/src/daemon/service-env.test.ts b/src/daemon/service-env.test.ts
@@ -421,16 +421,18 @@ describe("buildNodeServiceEnvironment", () => {
 });
 
 describe("shared Node TLS env defaults", () => {
+  // Pass an explicit non-nvm execPath so tests are deterministic regardless of
+  // whether the test runner itself runs under nvm.
   const builders = [
     {
       name: "gateway service env",
       build: (env: Record<string, string | undefined>, platform?: NodeJS.Platform) =>
-        buildServiceEnvironment({ env, port: 18789, platform }),
+        buildServiceEnvironment({ env, port: 18789, platform, execPath: "/usr/bin/node" }),
     },
     {
       name: "node service env",
       build: (env: Record<string, string | undefined>, platform?: NodeJS.Platform) =>
-        buildNodeServiceEnvironment({ env, platform }),
+        buildNodeServiceEnvironment({ env, platform, execPath: "/usr/bin/node" }),
     },
   ] as const;
 
@@ -499,16 +501,25 @@ describe("resolveLinuxSystemCaBundle", () => {
 });
 
 describe("shared Node TLS env — Linux nvm detection", () => {
+  const nvmExecPath = "/home/user/.nvm/versions/node/v22.22.0/bin/node";
+  const nonNvmExecPath = "/usr/bin/node";
+
   const builders = [
     {
       name: "gateway service env",
-      build: (env: Record<string, string | undefined>, platform?: NodeJS.Platform) =>
-        buildServiceEnvironment({ env, port: 18789, platform }),
+      build: (
+        env: Record<string, string | undefined>,
+        platform?: NodeJS.Platform,
+        execPath?: string,
+      ) => buildServiceEnvironment({ env, port: 18789, platform, execPath }),
     },
     {
       name: "node service env",
-      build: (env: Record<string, string | undefined>, platform?: NodeJS.Platform) =>
-        buildNodeServiceEnvironment({ env, platform }),
+      build: (
+        env: Record<string, string | undefined>,
+        platform?: NodeJS.Platform,
+        execPath?: string,
+      ) => buildNodeServiceEnvironment({ env, platform, execPath }),
     },
   ] as const;
 
@@ -518,15 +529,27 @@ describe("shared Node TLS env — Linux nvm detection", () => {
   it.each(builders)(
     "$name defaults NODE_EXTRA_CA_CERTS on Linux when NVM_DIR is set",
     ({ build }) => {
-      const env = build({ HOME: "/home/user", NVM_DIR: "/home/user/.nvm" }, "linux");
+      const env = build(
+        { HOME: "/home/user", NVM_DIR: "/home/user/.nvm" },
+        "linux",
+        nonNvmExecPath,
+      );
+      expect(env.NODE_EXTRA_CA_CERTS).toBe(expectedCaBundle);
+    },
+  );
+
+  it.each(builders)(
+    "$name defaults NODE_EXTRA_CA_CERTS on Linux when execPath is under nvm",
+    ({ build }) => {
+      const env = build({ HOME: "/home/user" }, "linux", nvmExecPath);
       expect(env.NODE_EXTRA_CA_CERTS).toBe(expectedCaBundle);
     },
   );
 
   it.each(builders)(
     "$name does not default NODE_EXTRA_CA_CERTS on Linux without nvm",
     ({ build }) => {
-      const env = build({ HOME: "/home/user" }, "linux");
+      const env = build({ HOME: "/home/user" }, "linux", nonNvmExecPath);
       expect(env.NODE_EXTRA_CA_CERTS).toBeUndefined();
     },
   );
@@ -541,6 +564,7 @@ describe("shared Node TLS env — Linux nvm detection", () => {
           NODE_EXTRA_CA_CERTS: "/custom/ca-bundle.crt",
         },
         "linux",
+        nvmExecPath,
       );
       expect(env.NODE_EXTRA_CA_CERTS).toBe("/custom/ca-bundle.crt");
     },
diff --git a/src/daemon/service-env.ts b/src/daemon/service-env.ts
@@ -290,10 +290,12 @@ export function buildServiceEnvironment(params: {
   port: number;
   launchdLabel?: string;
   platform?: NodeJS.Platform;
+  /** Override process.execPath for nvm detection (testing). */
+  execPath?: string;
 }): Record<string, string | undefined> {
   const { env, port, launchdLabel } = params;
   const platform = params.platform ?? process.platform;
-  const sharedEnv = resolveSharedServiceEnvironmentFields(env, platform);
+  const sharedEnv = resolveSharedServiceEnvironmentFields(env, platform, params.execPath);
   const profile = env.OPENCLAW_PROFILE;
   const resolvedLaunchdLabel =
     launchdLabel || (platform === "darwin" ? resolveGatewayLaunchAgentLabel(profile) : undefined);
@@ -314,10 +316,12 @@ export function buildServiceEnvironment(params: {
 export function buildNodeServiceEnvironment(params: {
   env: Record<string, string | undefined>;
   platform?: NodeJS.Platform;
+  /** Override process.execPath for nvm detection (testing). */
+  execPath?: string;
 }): Record<string, string | undefined> {
   const { env } = params;
   const platform = params.platform ?? process.platform;
-  const sharedEnv = resolveSharedServiceEnvironmentFields(env, platform);
+  const sharedEnv = resolveSharedServiceEnvironmentFields(env, platform, params.execPath);
   const gatewayToken =
     env.OPENCLAW_GATEWAY_TOKEN?.trim() || env.CLAWDBOT_GATEWAY_TOKEN?.trim() || undefined;
   return {
@@ -356,6 +360,7 @@ function buildCommonServiceEnvironment(
 function resolveSharedServiceEnvironmentFields(
   env: Record<string, string | undefined>,
   platform: NodeJS.Platform,
+  execPath?: string,
 ): SharedServiceEnvironmentFields {
   const stateDir = env.OPENCLAW_STATE_DIR;
   const configPath = env.OPENCLAW_CONFIG_PATH;
@@ -371,7 +376,7 @@ function resolveSharedServiceEnvironmentFields(
     env.NODE_EXTRA_CA_CERTS ??
     (platform === "darwin"
       ? "/etc/ssl/cert.pem"
-      : platform === "linux" && isNvmNode(env)
+      : platform === "linux" && isNvmNode(env, execPath ?? process.execPath)
         ? resolveLinuxSystemCaBundle()
         : undefined);
   const nodeUseSystemCa = env.NODE_USE_SYSTEM_CA ?? (platform === "darwin" ? "1" : undefined);
