fix(status): detect shell-wrapped gateway services

liaoandi · liaoandi · commit 8ba8752fae98 · 2026-05-14T17:39:32.000+08:00
diff --git a/src/daemon/service-audit.test.ts b/src/daemon/service-audit.test.ts
@@ -269,6 +269,37 @@ describe("auditGatewayServiceConfig", () => {
     ).toBe(undefined);
   });
 
+  it("accepts shell-wrapped LaunchAgent gateway commands", async () => {
+    const command =
+      'set -a; [ -f "$HOME/.config/api-keys.env" ] && . "$HOME/.config/api-keys.env"; set +a; unset OPENCLAW_GATEWAY_TOKEN; exec /opt/homebrew/opt/node/bin/node /Users/test/.npm-global/lib/node_modules/openclaw/dist/index.js gateway --port 18890';
+    const audit = await auditGatewayServiceConfig({
+      env: { HOME: "/tmp" },
+      platform: "darwin",
+      expectedPort: 18890,
+      command: {
+        programArguments: ["/bin/zsh", "-lc", command],
+        environment: {},
+      },
+    });
+
+    expect(hasIssue(audit, SERVICE_AUDIT_CODES.gatewayCommandMissing)).toBe(false);
+    expect(hasIssue(audit, SERVICE_AUDIT_CODES.gatewayPortMismatch)).toBe(false);
+    expect(readGatewayServiceCommandPort(["/bin/zsh", "-lc", command])).toBe(18890);
+  });
+
+  it("does not treat gateway-looking option names in shell wrappers as the gateway subcommand", async () => {
+    const audit = await auditGatewayServiceConfig({
+      env: { HOME: "/tmp" },
+      platform: "darwin",
+      command: {
+        programArguments: ["/bin/zsh", "-lc", "exec /usr/local/bin/helper --gateway-url ws://x"],
+        environment: {},
+      },
+    });
+
+    expect(hasIssue(audit, SERVICE_AUDIT_CODES.gatewayCommandMissing)).toBe(true);
+  });
+
   it("flags gateway service port drift from the expected config port", async () => {
     const audit = await auditGatewayServiceConfig({
       env: { HOME: "/tmp" },
diff --git a/src/daemon/service-audit.ts b/src/daemon/service-audit.ts
@@ -70,8 +70,26 @@ export function needsNodeRuntimeMigration(issues: ServiceConfigIssue[]): boolean
   );
 }
 
+function tokenizeShellCommandFragment(value: string): string[] {
+  return value.match(/[^\s;"'`]+/g) ?? [];
+}
+
+function expandServiceCommandTokens(programArguments?: string[]): string[] {
+  if (!programArguments || programArguments.length === 0) {
+    return [];
+  }
+  const tokens: string[] = [];
+  for (const arg of programArguments) {
+    tokens.push(arg);
+    if (/[\s;"'`]/.test(arg)) {
+      tokens.push(...tokenizeShellCommandFragment(arg));
+    }
+  }
+  return tokens;
+}
+
 function hasGatewaySubcommand(programArguments?: string[]): boolean {
-  return Boolean(programArguments?.some((arg) => arg === "gateway"));
+  return expandServiceCommandTokens(programArguments).some((arg) => arg === "gateway");
 }
 
 function parseSystemdUnit(content: string): {
@@ -227,10 +245,11 @@ export function readGatewayServiceCommandPort(programArguments?: string[]): numb
   if (!programArguments || programArguments.length === 0) {
     return undefined;
   }
-  for (let index = 0; index < programArguments.length; index += 1) {
-    const arg = programArguments[index];
+  const commandTokens = expandServiceCommandTokens(programArguments);
+  for (let index = 0; index < commandTokens.length; index += 1) {
+    const arg = commandTokens[index];
     if (arg === "--port") {
-      return parseGatewayPortArg(programArguments[index + 1]);
+      return parseGatewayPortArg(commandTokens[index + 1]);
     }
     if (arg.startsWith("--port=")) {
       return parseGatewayPortArg(arg.slice("--port=".length));
