fix(path): respect platform PATH delimiters

aniruddhaadak80 · aniruddhaadak80 · commit 09fb2032517c · 2026-03-12T22:59:29.000+05:30
diff --git a/src/config/schema.labels.ts b/src/config/schema.labels.ts
@@ -80,6 +80,11 @@ export const FIELD_LABELS: Record<string, string> = {
   "gateway.auth.trustedProxy": "Gateway Trusted Proxy Auth",
   "gateway.trustedProxies": "Gateway Trusted Proxy CIDRs",
   "gateway.allowRealIpFallback": "Gateway Allow x-real-ip Fallback",
+  "gateway.push": "Gateway Push Delivery",
+  "gateway.push.apns": "Gateway Push APNs",
+  "gateway.push.apns.relay": "Gateway Push APNs Relay",
+  "gateway.push.apns.relay.baseUrl": "Gateway Push APNs Relay Base URL",
+  "gateway.push.apns.relay.timeoutMs": "Gateway Push APNs Relay Timeout (ms)",
   "gateway.tools": "Gateway Tool Exposure Policy",
   "gateway.tools.allow": "Gateway Tool Allowlist",
   "gateway.tools.deny": "Gateway Tool Denylist",
diff --git a/src/infra/path-env.ts b/src/infra/path-env.ts
@@ -30,9 +30,15 @@ function isDirectory(dirPath: string): boolean {
   }
 }
 
-function mergePath(params: { existing: string; prepend?: string[]; append?: string[] }): string {
+function mergePath(params: {
+  existing: string;
+  prepend?: string[];
+  append?: string[];
+  delimiter?: string;
+}): string {
+  const delimiter = params.delimiter ?? path.delimiter;
   const partsExisting = params.existing
-    .split(path.delimiter)
+    .split(delimiter)
     .map((part) => part.trim())
     .filter(Boolean);
   const partsPrepend = (params.prepend ?? []).map((part) => part.trim()).filter(Boolean);
@@ -46,7 +52,7 @@ function mergePath(params: { existing: string; prepend?: string[]; append?: stri
       merged.push(part);
     }
   }
-  return merged.join(path.delimiter);
+  return merged.join(delimiter);
 }
 
 function candidateBinDirs(opts: EnsureOpenClawPathOpts): { prepend: string[]; append: string[] } {
@@ -142,12 +148,13 @@ export function ensureOpenClawCliOnPath(opts: EnsureOpenClawPathOpts = {}) {
   process.env.OPENCLAW_PATH_BOOTSTRAPPED = "1";
 
   const existing = opts.pathEnv ?? process.env.PATH ?? "";
+  const delimiter = (opts.platform ?? process.platform) === "win32" ? ";" : path.delimiter;
   const { prepend, append } = candidateBinDirs(opts);
   if (prepend.length === 0 && append.length === 0) {
     return;
   }
 
-  const merged = mergePath({ existing, prepend, append });
+  const merged = mergePath({ existing, prepend, append, delimiter });
   if (merged) {
     process.env.PATH = merged;
   }

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,15 @@ function isDirectory(dirPath: string): boolean {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-function mergePath(params: { existing: string; prepend?: string[]; append?: string[] }): string {`
	`33`	`+function mergePath(params: {`
	`34`	`+ existing: string;`
	`35`	`+ prepend?: string[];`
	`36`	`+ append?: string[];`
	`37`	`+ delimiter?: string;`
	`38`	`+}): string {`
	`39`	`+ const delimiter = params.delimiter ?? path.delimiter;`
`34`	`40`	`const partsExisting = params.existing`
`35`		`- .split(path.delimiter)`
	`41`	`+ .split(delimiter)`
`36`	`42`	`.map((part) => part.trim())`
`37`	`43`	`.filter(Boolean);`
`38`	`44`	`const partsPrepend = (params.prepend ?? []).map((part) => part.trim()).filter(Boolean);`
`@@ -46,7 +52,7 @@ function mergePath(params: { existing: string; prepend?: string[]; append?: stri`
`46`	`52`	`merged.push(part);`
`47`	`53`	`}`
`48`	`54`	`}`
`49`		`- return merged.join(path.delimiter);`
	`55`	`+ return merged.join(delimiter);`
`50`	`56`	`}`
`51`	`57`
`52`	`58`	`function candidateBinDirs(opts: EnsureOpenClawPathOpts): { prepend: string[]; append: string[] } {`
`@@ -142,12 +148,13 @@ export function ensureOpenClawCliOnPath(opts: EnsureOpenClawPathOpts = {}) {`
`142`	`148`	`process.env.OPENCLAW_PATH_BOOTSTRAPPED = "1";`
`143`	`149`
`144`	`150`	`const existing = opts.pathEnv ?? process.env.PATH ?? "";`
	`151`	`+ const delimiter = (opts.platform ?? process.platform) === "win32" ? ";" : path.delimiter;`
`145`	`152`	`const { prepend, append } = candidateBinDirs(opts);`
`146`	`153`	`if (prepend.length === 0 && append.length === 0) {`
`147`	`154`	`return;`
`148`	`155`	`}`
`149`	`156`
`150`		`- const merged = mergePath({ existing, prepend, append });`
	`157`	`+ const merged = mergePath({ existing, prepend, append, delimiter });`
`151`	`158`	`if (merged) {`
`152`	`159`	`process.env.PATH = merged;`
`153`	`160`	`}`