fix(mac): read launchd port from service env

BunsDev · BunsDev · commit 135f082b16b9 · 2026-05-14T03:54:17.000-05:00
diff --git a/src/daemon/launchd.test.ts b/src/daemon/launchd.test.ts
@@ -691,6 +691,22 @@ describe("launchd install", () => {
     expect(output).toContain("Stopped LaunchAgent");
   });
 
+  it("resolves the stop postcondition port from the stored LaunchAgent environment", async () => {
+    const env = createDefaultLaunchdEnv();
+    await installLaunchAgent({
+      env,
+      stdout: new PassThrough(),
+      programArguments: defaultProgramArguments,
+      environment: { OPENCLAW_GATEWAY_PORT: "19006" },
+    });
+    state.launchctlCalls.length = 0;
+
+    await stopLaunchAgent({ env, stdout: new PassThrough() });
+
+    expect(cleanStaleGatewayProcessesSync).toHaveBeenCalledWith(19006);
+    expect(inspectPortUsage).toHaveBeenCalledWith(19006);
+  });
+
   it("fails stop when the verified gateway port remains busy after cleanup", async () => {
     const env = {
       ...createDefaultLaunchdEnv(),
@@ -961,6 +977,25 @@ describe("launchd install", () => {
     expect(cleanStaleGatewayProcessesSync).toHaveBeenCalledWith(19001);
   });
 
+  it("uses the stored LaunchAgent environment port for restart stale cleanup", async () => {
+    const env = createDefaultLaunchdEnv();
+    await installLaunchAgent({
+      env,
+      stdout: new PassThrough(),
+      programArguments: defaultProgramArguments,
+      environment: { OPENCLAW_GATEWAY_PORT: "19007" },
+    });
+    state.launchctlCalls.length = 0;
+
+    await restartLaunchAgent({
+      env,
+      stdout: new PassThrough(),
+    });
+
+    expect(cleanStaleGatewayProcessesSync).toHaveBeenCalledWith(19007);
+    expect(inspectPortUsage).toHaveBeenCalledWith(19007);
+  });
+
   it("fails restart before kickstart when the configured gateway port remains busy", async () => {
     const env = {
       ...createDefaultLaunchdEnv(),
diff --git a/src/daemon/launchd.ts b/src/daemon/launchd.ts
@@ -254,6 +254,12 @@ async function resolveLaunchAgentGatewayPort(env: GatewayServiceEnv): Promise<nu
   if (fromArgs !== null) {
     return fromArgs;
   }
+  const fromServiceEnv = parseStrictPositiveInteger(
+    command?.environment?.OPENCLAW_GATEWAY_PORT ?? "",
+  );
+  if (fromServiceEnv !== undefined) {
+    return fromServiceEnv;
+  }
   const fromEnv = parseStrictPositiveInteger(env.OPENCLAW_GATEWAY_PORT ?? "");
   return fromEnv ?? null;
 }

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,12 @@ async function resolveLaunchAgentGatewayPort(env: GatewayServiceEnv): Promise<nu`
`254`	`254`	`if (fromArgs !== null) {`
`255`	`255`	`return fromArgs;`
`256`	`256`	`}`
	`257`	`+ const fromServiceEnv = parseStrictPositiveInteger(`
	`258`	`+ command?.environment?.OPENCLAW_GATEWAY_PORT ?? "",`
	`259`	`+ );`
	`260`	`+ if (fromServiceEnv !== undefined) {`
	`261`	`+ return fromServiceEnv;`
	`262`	`+ }`
`257`	`263`	`const fromEnv = parseStrictPositiveInteger(env.OPENCLAW_GATEWAY_PORT ?? "");`
`258`	`264`	`return fromEnv ?? null;`
`259`	`265`	`}`