refactor: share daemon install plan runtime scaffolding

src/commands/daemon-install-helpers.ts

@@ -3,26 +3,22 @@ import { collectConfigServiceEnvVars } from "../config/env-vars.js";
 import type { OpenClawConfig } from "../config/types.js";
 import { resolveGatewayLaunchAgentLabel } from "../daemon/constants.js";
 import { resolveGatewayProgramArguments } from "../daemon/program-args.js";
-import { resolvePreferredNodePath } from "../daemon/runtime-paths.js";
 import { buildServiceEnvironment } from "../daemon/service-env.js";
 import {
-  emitNodeRuntimeWarning,
+  emitDaemonInstallRuntimeWarning,
-  type DaemonInstallWarnFn,
+  resolveDaemonInstallRuntimeInputs,
-} from "./daemon-install-runtime-warning.js";
+} from "./daemon-install-plan.shared.js";
+import type { DaemonInstallWarnFn } from "./daemon-install-runtime-warning.js";
 import type { GatewayDaemonRuntime } from "./daemon-runtime.js";
 
+export { resolveGatewayDevMode } from "./daemon-install-plan.shared.js";
+
 export type GatewayInstallPlan = {
   programArguments: string[];
   workingDirectory?: string;
   environment: Record<string, string | undefined>;
 };
 
-export function resolveGatewayDevMode(argv: string[] = process.argv): boolean {
-  const entry = argv[1];
-  const normalizedEntry = entry?.replaceAll("\\", "/");
-  return Boolean(normalizedEntry?.includes("/src/") && normalizedEntry.endsWith(".ts"));
-}
-
 export async function buildGatewayInstallPlan(params: {
   env: Record<string, string | undefined>;
   port: number;
@@ -34,23 +30,22 @@ export async function buildGatewayInstallPlan(params: {
   /** Full config to extract env vars from (env vars + inline env keys). */
   config?: OpenClawConfig;
 }): Promise<GatewayInstallPlan> {
-  const devMode = params.devMode ?? resolveGatewayDevMode();
+  const { devMode, nodePath } = await resolveDaemonInstallRuntimeInputs({
-  const nodePath =
+    env: params.env,
-    params.nodePath ??
+    runtime: params.runtime,
-    (await resolvePreferredNodePath({
+    devMode: params.devMode,
-      env: params.env,
+    nodePath: params.nodePath,
-      runtime: params.runtime,
+  });
-    }));
   const { programArguments, workingDirectory } = await resolveGatewayProgramArguments({
     port: params.port,
     dev: devMode,
     runtime: params.runtime,
     nodePath,
   });
-  await emitNodeRuntimeWarning({
+  await emitDaemonInstallRuntimeWarning({
     env: params.env,
     runtime: params.runtime,
-    nodeProgram: programArguments[0],
+    programArguments,
     warn: params.warn,
     title: "Gateway runtime",
   });

src/commands/daemon-install-plan.shared.test.ts

@@ -0,0 +1,31 @@
+import { describe, expect, it } from "vitest";
+import {
+  resolveDaemonInstallRuntimeInputs,
+  resolveGatewayDevMode,
+} from "./daemon-install-plan.shared.js";
+
+describe("resolveGatewayDevMode", () => {
+  it("detects src ts entrypoints", () => {
+    expect(resolveGatewayDevMode(["node", "/Users/me/openclaw/src/cli/index.ts"])).toBe(true);
+    expect(resolveGatewayDevMode(["node", "C:\\Users\\me\\openclaw\\src\\cli\\index.ts"])).toBe(
+      true,
+    );
+    expect(resolveGatewayDevMode(["node", "/Users/me/openclaw/dist/cli/index.js"])).toBe(false);
+  });
+});
+
+describe("resolveDaemonInstallRuntimeInputs", () => {
+  it("keeps explicit devMode and nodePath overrides", async () => {
+    await expect(
+      resolveDaemonInstallRuntimeInputs({
+        env: {},
+        runtime: "node",
+        devMode: false,
+        nodePath: "/custom/node",
+      }),
+    ).resolves.toEqual({
+      devMode: false,
+      nodePath: "/custom/node",
+    });
+  });
+});

src/commands/daemon-install-plan.shared.ts

@@ -0,0 +1,44 @@
+import { resolvePreferredNodePath } from "../daemon/runtime-paths.js";
+import {
+  emitNodeRuntimeWarning,
+  type DaemonInstallWarnFn,
+} from "./daemon-install-runtime-warning.js";
+import type { GatewayDaemonRuntime } from "./daemon-runtime.js";
+
+export function resolveGatewayDevMode(argv: string[] = process.argv): boolean {
+  const entry = argv[1];
+  const normalizedEntry = entry?.replaceAll("\\", "/");
+  return Boolean(normalizedEntry?.includes("/src/") && normalizedEntry.endsWith(".ts"));
+}
+
+export async function resolveDaemonInstallRuntimeInputs(params: {
+  env: Record<string, string | undefined>;
+  runtime: GatewayDaemonRuntime;
+  devMode?: boolean;
+  nodePath?: string;
+}): Promise<{ devMode: boolean; nodePath?: string }> {
+  const devMode = params.devMode ?? resolveGatewayDevMode();
+  const nodePath =
+    params.nodePath ??
+    (await resolvePreferredNodePath({
+      env: params.env,
+      runtime: params.runtime,
+    }));
+  return { devMode, nodePath };
+}
+
+export async function emitDaemonInstallRuntimeWarning(params: {
+  env: Record<string, string | undefined>;
+  runtime: GatewayDaemonRuntime;
+  programArguments: string[];
+  warn?: DaemonInstallWarnFn;
+  title: string;
+}): Promise<void> {
+  await emitNodeRuntimeWarning({
+    env: params.env,
+    runtime: params.runtime,
+    nodeProgram: params.programArguments[0],
+    warn: params.warn,
+    title: params.title,
+  });
+}

src/commands/node-daemon-install-helpers.ts

@@ -1,12 +1,11 @@
 import { formatNodeServiceDescription } from "../daemon/constants.js";
 import { resolveNodeProgramArguments } from "../daemon/program-args.js";
-import { resolvePreferredNodePath } from "../daemon/runtime-paths.js";
 import { buildNodeServiceEnvironment } from "../daemon/service-env.js";
-import { resolveGatewayDevMode } from "./daemon-install-helpers.js";
 import {
-  emitNodeRuntimeWarning,
+  emitDaemonInstallRuntimeWarning,
-  type DaemonInstallWarnFn,
+  resolveDaemonInstallRuntimeInputs,
-} from "./daemon-install-runtime-warning.js";
+} from "./daemon-install-plan.shared.js";
+import type { DaemonInstallWarnFn } from "./daemon-install-runtime-warning.js";
 import type { NodeDaemonRuntime } from "./node-daemon-runtime.js";
 
 export type NodeInstallPlan = {
@@ -29,13 +28,12 @@ export async function buildNodeInstallPlan(params: {
   nodePath?: string;
   warn?: DaemonInstallWarnFn;
 }): Promise<NodeInstallPlan> {
-  const devMode = params.devMode ?? resolveGatewayDevMode();
+  const { devMode, nodePath } = await resolveDaemonInstallRuntimeInputs({
-  const nodePath =
+    env: params.env,
-    params.nodePath ??
+    runtime: params.runtime,
-    (await resolvePreferredNodePath({
+    devMode: params.devMode,
-      env: params.env,
+    nodePath: params.nodePath,
-      runtime: params.runtime,
+  });
-    }));
   const { programArguments, workingDirectory } = await resolveNodeProgramArguments({
     host: params.host,
     port: params.port,
@@ -48,10 +46,10 @@ export async function buildNodeInstallPlan(params: {
     nodePath,
   });
 
-  await emitNodeRuntimeWarning({
+  await emitDaemonInstallRuntimeWarning({
     env: params.env,
     runtime: params.runtime,
-    nodeProgram: programArguments[0],
+    programArguments,
     warn: params.warn,
     title: "Node daemon runtime",
   });