fix(follow-cwd): split ps -o columns for procps-ng 3.3

A single -o spec with col=,col= is folded into the first column's header
on procps-ng 3.3, so cwd probes never see the su'd shell.

Fixes #3820

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

electron/bridges/ptyProcessTree.cjs

@@ -34,10 +34,11 @@ function createProcessTree({ platform, listPosix, listWindows } = {}) {
 
 function defaultListPosix(ppid, { execFileFn = execFile } = {}) {
   return new Promise((resolve) => {
-    // `ps -A -o pid=,ppid=,args=` works on both BSD (macOS) and GNU (Linux).
-    // `args=` shows the full command line (not truncated like `comm=`).
-    // The trailing `=` on each column suppresses the header row.
-    execFileFn("ps", ["-A", "-o", "pid=,ppid=,args="], {
+    // Separate `-o col=` options. A single `-o pid=,ppid=,args=` spec is
+    // misread by procps-ng 3.3.x: the text after the first `=` becomes the
+    // header, so only pid is printed. The split form works on BSD (macOS),
+    // modern procps, and BusyBox. `args=` is the full command line.
+    execFileFn("ps", ["-A", "-o", "pid=", "-o", "ppid=", "-o", "args="], {
       timeout: POSIX_PROCESS_LIST_TIMEOUT_MS,
       maxBuffer: POSIX_PROCESS_LIST_MAX_BUFFER_BYTES,
       windowsHide: true,

electron/bridges/ptyProcessTree.test.cjs

@@ -101,7 +101,7 @@ test("default posix process listing bounds the child lifetime and captured outpu
     { pid: 2003, command: "python worker.py" },
   ]);
   assert.equal(invocation.command, "ps");
-  assert.deepEqual(invocation.args, ["-A", "-o", "pid=,ppid=,args="]);
+  assert.deepEqual(invocation.args, ["-A", "-o", "pid=", "-o", "ppid=", "-o", "args="]);
   assert.equal(invocation.options.timeout, POSIX_PROCESS_LIST_TIMEOUT_MS);
   assert.equal(invocation.options.maxBuffer, POSIX_PROCESS_LIST_MAX_BUFFER_BYTES);
   assert.equal(invocation.options.windowsHide, true);

electron/bridges/sshBridge/sessionOps.cjs

@@ -105,7 +105,7 @@ function withRemoteWatchdog(command, timeoutMs) {
     // exec replaces the command-substitution shell: without it Bash may
     // report that intermediate PID instead of the watchdog subshell.
     `&& nc_self=$(exec sh -c 'echo $PPID' 2>/dev/null)`,
-    `&& nc_tree=$(ps -e -o pid=,ppid= 2>/dev/null | awk -v root="$$" -v self="$nc_self" '${descendantTreeAwk}')`,
+    `&& nc_tree=$(ps -e -o pid= -o ppid= 2>/dev/null | awk -v root="$$" -v self="$nc_self" '${descendantTreeAwk}')`,
     `&& kill -9 $nc_tree "$$" 2>/dev/null ) </dev/null >/dev/null 2>&1 & nc_watchdog_pid=$!`,
   ].join(' ');
   return [
@@ -115,7 +115,7 @@ function withRemoteWatchdog(command, timeoutMs) {
     // Reap the watchdog's pending `sleep` before killing the subshell: after
     // the subshell is SIGKILLed its children are reparented to init and a
     // PPID walk can no longer find them.
-    'nc_kids=$(ps -e -o pid=,ppid= 2>/dev/null | awk -v root="$nc_watchdog_pid" -v self="-1" \'' +
+    'nc_kids=$(ps -e -o pid= -o ppid= 2>/dev/null | awk -v root="$nc_watchdog_pid" -v self="-1" \'' +
       descendantTreeAwk +
       "')",
     'kill -9 $nc_kids "$nc_watchdog_pid" 2>/dev/null',
@@ -589,7 +589,7 @@ function createSessionOpsApi(ctx) {
     # different parent) of this exec session, so the sibling search misses it
     # entirely (#1123).
     find_login_shell() {
-      _shell=$(ps -e -o pid=,ppid=,tty=,comm= 2>/dev/null | awk -v pp="$1" -v self="$SELF" '
+      _shell=$(ps -e -o pid= -o ppid= -o tty= -o comm= 2>/dev/null | awk -v pp="$1" -v self="$SELF" '
         function isshell(c) { sub(/^.*\\//, "", c); sub(/^-/, "", c); return c ~ /^(ba|z|fi|k|da|a|c|tc)?sh$/ }
         $1 != self && $2 == pp && isshell($4) {
           if ($3 !~ /^\\?+$/) { print $1; found=1; exit }
@@ -638,7 +638,7 @@ function createSessionOpsApi(ctx) {
     # su'd / sudo'd shell instead of stopping at the login shell (#1065). Falls
     # back to the login shell when no foreground shell is found.
     find_active_shell() {
-      ps -e -o pid=,ppid=,stat=,comm= 2>/dev/null | awk -v start="$1" '
+      ps -e -o pid= -o ppid= -o stat= -o comm= 2>/dev/null | awk -v start="$1" '
         { pp[$1]=$2; st[$1]=$3; cm[$1]=$4; ord[NR]=$1 }
         function isshell(c) { sub(/^.*\\//, "", c); sub(/^-/, "", c); return c ~ /^(ba|z|fi|k|da|a|c|tc)?sh$/ }
         function depth(p,   d) { d=0; while (p != "" && d < 64) { if (p == start) return d; p=pp[p]; d++ } return -1 }
@@ -826,7 +826,7 @@ function createSessionOpsApi(ctx) {
         if (session.singleChannelSsh) return null;
         const script = `SELF=$$
     find_login_shell() {
-      ps -e -o pid=,ppid=,tty=,comm= 2>/dev/null | awk -v pp="$1" -v self="$SELF" '
+      ps -e -o pid= -o ppid= -o tty= -o comm= 2>/dev/null | awk -v pp="$1" -v self="$SELF" '
         $1 != self && $2 == pp && $4 ~ /^-?(ba|z|fi|k|da|a)?sh$/ {
           if ($3 != "?") { print $1; found=1; exit }
           if (any == "") any=$1
@@ -834,7 +834,7 @@ function createSessionOpsApi(ctx) {
         END { if (!found && any != "") print any }'
     }
     find_fg_leaf() {
-      ps -e -o pid=,ppid=,stat=,comm= 2>/dev/null | awk -v start="$1" '
+      ps -e -o pid= -o ppid= -o stat= -o comm= 2>/dev/null | awk -v start="$1" '
         { pp[$1]=$2; st[$1]=$3; ord[NR]=$1 }
         function depth(p,  d){ d=0; while(p!="" && d<64){ if(p==start) return d; p=pp[p]; d++ } return -1 }
         END { best=-1; bp=""; for(i=1;i<=NR;i++){ p=ord[i];
@@ -988,7 +988,7 @@ function createSessionOpsApi(ctx) {
         // so that relative paths like "." or "src" are resolved correctly.
         const needsCwdResolve = !dirPath.startsWith('/') && dirPath !== '~' && !dirPath.startsWith('~/');
         const cwdResolveCmd = needsCwdResolve
-          ? `_sc_p=$(ps --ppid $PPID -o pid=,comm= 2>/dev/null | awk -v self=$$ '$1!=self && $2~/^(ba|z|fi|k|da)?sh$/{pid=$1}END{print pid}'); [ -z "$_sc_p" ] && _sc_p=$(ps -e -o pid=,ppid=,comm= 2>/dev/null | awk -v pp=$PPID -v self=$$ '$1!=self && $2==pp && $3~/^(ba|z|fi|k|da)?sh$/{pid=$1}END{print pid}'); [ -n "$_sc_p" ] && { _sc_d=$(readlink /proc/$_sc_p/cwd 2>/dev/null); [ -n "$_sc_d" ] && cd "$_sc_d" 2>/dev/null; }; `
+          ? `_sc_p=$(ps --ppid $PPID -o pid= -o comm= 2>/dev/null | awk -v self=$$ '$1!=self && $2~/^(ba|z|fi|k|da)?sh$/{pid=$1}END{print pid}'); [ -z "$_sc_p" ] && _sc_p=$(ps -e -o pid= -o ppid= -o comm= 2>/dev/null | awk -v pp=$PPID -v self=$$ '$1!=self && $2==pp && $3~/^(ba|z|fi|k|da)?sh$/{pid=$1}END{print pid}'); [ -n "$_sc_p" ] && { _sc_d=$(readlink /proc/$_sc_p/cwd 2>/dev/null); [ -n "$_sc_d" ] && cd "$_sc_d" 2>/dev/null; }; `
           : '';
         const cmd = `${cwdResolveCmd}find ${pathExpr} -mindepth 1 -maxdepth 1 -exec sh -c '
           prefix="$1"
@@ -1210,7 +1210,7 @@ function createSessionOpsApi(ctx) {
         `swapused=$(echo "$swapraw" | awk '{for(i=1;i<=NF;i++){if($i=="used"&&$(i+1)=="="){v=$(i+2);m=1;if(v~/G/)m=1024;gsub(/[MmGg]/,"",v);su=v*m}};printf "%.0f",su+0}')`,
         `swapfree=$(echo "$swaptotal $swapused" | awk '{printf "%.0f",$1-$2}')`,
         // Top processes by memory%
-        `procs=$(ps -A -o pid=,%mem=,comm= 2>/dev/null | sort -k2 -rn | head -10 | awk '{gsub(/;/,"_",$3);printf "%s;%.1f;%s,",$1,$2,$3}' | sed 's/,$//')`,
+        `procs=$(ps -A -o pid= -o %mem= -o comm= 2>/dev/null | sort -k2 -rn | head -10 | awk '{gsub(/;/,"_",$3);printf "%s;%.1f;%s,",$1,$2,$3}' | sed 's/,$//')`,
         // Disk: -P keeps a stable six-column POSIX layout on macOS.
         `mounts=$(mount 2>/dev/null || true)`,
         `disks=$({ printf "%s\n" "$mounts"; printf "__NETCATTY_DF__\n"; df -kP 2>/dev/null; } | awk '$0=="__NETCATTY_DF__"{in_df=1;next} !in_df{if(index($1,"/dev/disk")==1&&(index($0,"(apfs,")||index($0,"(apfs)"))){key=$1;sub(/s[0-9].*$/,"",key);capacity[$1]="apfs:" key}next} $1=="Filesystem"{next} index($1,"/dev/")==1{m=$6;if(m=="/"||index(m,"/Volumes/")==1){t=$2/1048576;key=(($1 in capacity)?capacity[$1]:$1);if(key~/^apfs:/){u=($2-$4)/1048576;p=(t>0?int(u*100/t+0.5):0)}else{u=$3/1048576;p=$5;gsub(/%/,"",p)}printf "%s:%.6f:%.6f:%s:%s,",m,u,t,p,key}}' | sed 's/,$//')`,

electron/bridges/sshBridge/sessionOps.cwd.test.cjs

@@ -333,6 +333,9 @@ test("cwd probe forces POSIX sh, captures sshd PPID, and keeps the watchdog", as
   assert.ok(command.includes(") </dev/null >/dev/null 2>&1 & nc_watchdog_pid=$!"));
   assert.ok(command.includes('kill -9 $nc_kids "$nc_watchdog_pid"'));
   assert.ok(command.includes('find_login_shell "${NC_SSHD_PPID:-$PPID}"'));
+  assert.match(command, /ps -e -o pid= -o ppid= -o tty= -o comm=/);
+  assert.match(command, /ps -e -o pid= -o ppid= -o stat= -o comm=/);
+  assert.equal(command.includes("pid=,"), false);
 });
 
 test("immediate parked reconnect does not guess cwd from an exiting shell", async () => {

electron/bridges/sshInteractiveShells.cjs

@@ -8,7 +8,7 @@ const discoveryDisabledConnections = new WeakSet();
 
 function buildInteractiveShellPidCommand(quoteShellArg) {
   const script = `SELF=$$
-ps_output=$(ps -e -o pid=,ppid=,tty=,comm=,etimes= 2>/dev/null) || ps_output=$(ps -e -o pid=,ppid=,tty=,comm= 2>/dev/null) || exit 69
+ps_output=$(ps -e -o pid= -o ppid= -o tty= -o comm= -o etimes= 2>/dev/null) || ps_output=$(ps -e -o pid= -o ppid= -o tty= -o comm= 2>/dev/null) || exit 69
 {
   printf '%s\n' "$ps_output" | awk -v pp="$PPID" -v self="$SELF" '
     function isshell(c) { sub(/^.*\\//, "", c); sub(/^-/, "", c); return c ~ /^(ba|z|fi|k|da|a|c|tc)?sh$/ }