[Fix] Keep node systemd tokens out of unit files (#84815)

clawsweeper[bot] · samzong · Takhoffman · web-flow · commit e42726204490 · 2026-05-21T06:48:15.000Z
Summary: - This replacement PR marks the Linux node daemon gateway token as file-backed, writes it to `node.systemd.env`, sanitizes and migrates systemd env artifacts, adds regression tests, and updates the changelog. - Reproducibility: yes. from source inspection: current `main` copies `OPENCLAW_GATEWAY_TOKEN` into the node s ... e-backed before systemd rendering. I did not run a local live systemd install during this read-only review. Automerge notes: - PR branch already contained follow-up commit before automerge: fix(systemd): scrub single-quoted env tokens - PR branch already contained follow-up commit before automerge: [Fix] Keep node systemd tokens out of unit files Validation: - ClawSweeper review passed for head f626b66. - Required merge gates passed before the squash merge. Prepared head SHA: f626b66 Review: #84815 (comment) Co-authored-by: samzong <samzong.lu@gmail.com> Co-authored-by: clawsweeper <274271284+clawsweeper[bot]@users.noreply.github.com> Co-authored-by: clawsweeper[bot] <274271284+clawsweeper[bot]@users.noreply.github.com> Approved-by: takhoffman Co-authored-by: takhoffman <781889+takhoffman@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Docs: https://docs.openclaw.ai
 ### Fixes
 
 - Media/audio: skip empty structured sherpa-onnx transcripts instead of treating the raw JSON payload as spoken text. (#84667) Thanks @TurboTheTurtle.
+- Node/Linux: keep `OPENCLAW_GATEWAY_TOKEN` out of generated systemd unit files by writing node service token values to a node-specific env file. (#84408)
 - Memory-core/dreaming: reuse stable narrative subagent session keys per workspace and phase while keeping per-run idempotency and bounded cleanup, so stale `dreaming-narrative-*` sessions do not accumulate. Fixes #68252, #69187, and #70402. (#70464) Thanks @chiyouYCH.
 - Trajectory/support: tolerate partial skill snapshot entries when building support metadata so rejected skill path scans no longer abort trajectory capture. (#71185) Thanks @lukeboyett.
 - Agents/Pi: disable the embedded pi-coding-agent runtime auto-retry so OpenClaw's own retry and failover loop does not replay failed tool calls through a nested SDK retry. Fixes #73781. (#74434) Thanks @yelog.
diff --git a/src/cli/node-cli/daemon.ts b/src/cli/node-cli/daemon.ts
@@ -136,7 +136,7 @@ export async function runNodeDaemonInstall(opts: NodeDaemonInstallOptions) {
   const tlsFingerprint =
     normalizeOptionalString(opts.tlsFingerprint) || config?.gateway?.tlsFingerprint;
   const tls = Boolean(opts.tls) || Boolean(tlsFingerprint) || Boolean(config?.gateway?.tls);
-  const { programArguments, workingDirectory, environment, description } =
+  const { programArguments, workingDirectory, environment, environmentValueSources, description } =
     await buildNodeInstallPlan({
       env: process.env,
       host,
@@ -168,6 +168,7 @@ export async function runNodeDaemonInstall(opts: NodeDaemonInstallOptions) {
         programArguments,
         workingDirectory,
         environment,
+        environmentValueSources,
         description,
       });
     },
diff --git a/src/commands/node-daemon-install-helpers.test.ts b/src/commands/node-daemon-install-helpers.test.ts
@@ -55,6 +55,9 @@ describe("buildNodeInstallPlan", () => {
     expect(plan.environment).toEqual({
       OPENCLAW_SERVICE_VERSION: "2026.3.22",
     });
+    expect(plan.environmentValueSources).toEqual({
+      OPENCLAW_GATEWAY_TOKEN: "file",
+    });
     expect(mocks.resolvePreferredNodePath).not.toHaveBeenCalled();
     expect(mocks.buildNodeServiceEnvironment).toHaveBeenCalledWith({
       env: {},
@@ -90,4 +93,33 @@ describe("buildNodeInstallPlan", () => {
       extraPathDirs: undefined,
     });
   });
+
+  it("marks node gateway tokens as file-backed service env", async () => {
+    mocks.resolveNodeProgramArguments.mockResolvedValue({
+      programArguments: ["node", "node-host"],
+      workingDirectory: "/Users/me",
+    });
+    mocks.resolveSystemNodeInfo.mockResolvedValue({
+      path: "/usr/bin/node",
+      version: "22.0.0",
+      supported: true,
+    });
+    mocks.renderSystemNodeWarning.mockReturnValue(undefined);
+    mocks.buildNodeServiceEnvironment.mockReturnValue({
+      OPENCLAW_GATEWAY_TOKEN: "node-token",
+      OPENCLAW_SERVICE_VERSION: "2026.3.22",
+    });
+
+    const plan = await buildNodeInstallPlan({
+      env: { OPENCLAW_GATEWAY_TOKEN: "node-token" },
+      host: "127.0.0.1",
+      port: 18789,
+      runtime: "node",
+    });
+
+    expect(plan.environment.OPENCLAW_GATEWAY_TOKEN).toBe("node-token");
+    expect(plan.environmentValueSources).toEqual({
+      OPENCLAW_GATEWAY_TOKEN: "file",
+    });
+  });
 });
diff --git a/src/commands/node-daemon-install-helpers.ts b/src/commands/node-daemon-install-helpers.ts
@@ -1,6 +1,7 @@
 import { formatNodeServiceDescription } from "../daemon/constants.js";
 import { resolveNodeProgramArguments } from "../daemon/program-args.js";
 import { buildNodeServiceEnvironment } from "../daemon/service-env.js";
+import type { GatewayServiceEnvironmentValueSource } from "../daemon/service-types.js";
 import {
   emitDaemonInstallRuntimeWarning,
   resolveDaemonInstallRuntimeInputs,
@@ -13,9 +14,19 @@ type NodeInstallPlan = {
   programArguments: string[];
   workingDirectory?: string;
   environment: Record<string, string | undefined>;
+  environmentValueSources?: Record<string, GatewayServiceEnvironmentValueSource | undefined>;
   description?: string;
 };
 
+function buildNodeInstallEnvironmentValueSources(): Record<
+  string,
+  GatewayServiceEnvironmentValueSource | undefined
+> {
+  return {
+    OPENCLAW_GATEWAY_TOKEN: "file",
+  };
+}
+
 export async function buildNodeInstallPlan(params: {
   env: Record<string, string | undefined>;
   host: string;
@@ -65,5 +76,11 @@ export async function buildNodeInstallPlan(params: {
     version: environment.OPENCLAW_SERVICE_VERSION,
   });
 
-  return { programArguments, workingDirectory, environment, description };
+  return {
+    programArguments,
+    workingDirectory,
+    environment,
+    environmentValueSources: buildNodeInstallEnvironmentValueSources(),
+    description,
+  };
 }
diff --git a/src/daemon/arg-split.ts b/src/daemon/arg-split.ts
@@ -1,13 +1,21 @@
 type ArgSplitEscapeMode = "none" | "backslash" | "backslash-quote-only";
+type ArgSplitQuoteChar = '"' | "'";
+type ArgSplitQuoteStart = "anywhere" | "item-start";
 
 export function splitArgsPreservingQuotes(
   value: string,
-  options?: { escapeMode?: ArgSplitEscapeMode },
+  options?: {
+    escapeMode?: ArgSplitEscapeMode;
+    quoteChars?: readonly ArgSplitQuoteChar[];
+    quoteStart?: ArgSplitQuoteStart;
+  },
 ): string[] {
   const args: string[] = [];
   let current = "";
-  let inQuotes = false;
+  let quoteChar: ArgSplitQuoteChar | null = null;
   const escapeMode = options?.escapeMode ?? "none";
+  const quoteChars = new Set<ArgSplitQuoteChar>(options?.quoteChars ?? ['"']);
+  const quoteStart = options?.quoteStart ?? "anywhere";
 
   for (let i = 0; i < value.length; i++) {
     const char = value[i];
@@ -28,11 +36,18 @@ export function splitArgsPreservingQuotes(
       i++;
       continue;
     }
-    if (char === '"') {
-      inQuotes = !inQuotes;
-      continue;
+    if (quoteChars.has(char as ArgSplitQuoteChar)) {
+      if (quoteChar === char) {
+        quoteChar = null;
+        continue;
+      }
+      const canOpenQuote = quoteStart === "anywhere" || current.length === 0;
+      if (!quoteChar && canOpenQuote) {
+        quoteChar = char as ArgSplitQuoteChar;
+        continue;
+      }
     }
-    if (!inQuotes && /\s/.test(char)) {
+    if (!quoteChar && /\s/.test(char)) {
       if (current) {
         args.push(current);
         current = "";
diff --git a/src/daemon/systemd-unit.ts b/src/daemon/systemd-unit.ts
@@ -106,7 +106,8 @@ export function parseSystemdEnvAssignment(raw: string): { key: string; value: st
   }
 
   const unquoted = (() => {
-    if (!(trimmed.startsWith('"') && trimmed.endsWith('"'))) {
+    const quote = trimmed[0];
+    if (!((quote === '"' || quote === "'") && trimmed.endsWith(quote))) {
       return trimmed;
     }
     let out = "";
@@ -137,3 +138,18 @@ export function parseSystemdEnvAssignment(raw: string): { key: string; value: st
   const value = unquoted.slice(eq + 1);
   return { key, value };
 }
+
+export function parseSystemdEnvAssignments(raw: string): Array<{ key: string; value: string }> {
+  return splitArgsPreservingQuotes(raw, {
+    escapeMode: "backslash",
+    quoteChars: ['"', "'"],
+    quoteStart: "item-start",
+  }).flatMap((entry) => {
+    const parsed = parseSystemdEnvAssignment(entry);
+    return parsed ? [parsed] : [];
+  });
+}
+
+export function renderSystemdEnvAssignment(key: string, value: string): string {
+  return systemdEscapeArg(`${key}=${value}`);
+}
diff --git a/src/daemon/systemd.test.ts b/src/daemon/systemd.test.ts
diff --git a/src/daemon/systemd.ts b/src/daemon/systemd.ts
