fix(doctor): anchor WhatsApp TUI process matching (#83313)

giodl73-repo · web-flow · commit 1fb09069c342 · 2026-05-18T12:04:32.000-07:00
diff --git a/src/commands/doctor-whatsapp-responsiveness.test.ts b/src/commands/doctor-whatsapp-responsiveness.test.ts
@@ -29,12 +29,17 @@ describe("doctor WhatsApp responsiveness", () => {
         " 102 /usr/bin/node /usr/lib/node_modules/openclaw/dist/index.js gateway --port 18789",
         " 103 openclaw channels",
         " 104 openclaw tui --local",
+        " 105 /usr/bin/openclaw chat",
+        " 106 helper --note 'openclaw tui'",
+        " 107 openclaw-helper openclaw terminal",
+        " 108 openclaw --flag tui",
       ].join("\n"),
     });
 
     expect(listLocalTuiProcesses()).toEqual([
       { pid: 101, command: "openclaw-tui" },
       { pid: 104, command: "openclaw tui --local" },
+      { pid: 105, command: "/usr/bin/openclaw chat" },
     ]);
   });
 
diff --git a/src/commands/doctor-whatsapp-responsiveness.ts b/src/commands/doctor-whatsapp-responsiveness.ts
@@ -1,4 +1,5 @@
 import { spawnSync } from "node:child_process";
+import path from "node:path";
 import { formatCliCommand } from "../cli/command-format.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { note } from "../terminal/note.js";
@@ -15,8 +16,24 @@ type ProcessController = {
   kill: (pid: number, signal: ProcessSignal | 0) => boolean;
 };
 
-const LOCAL_TUI_CMD_RE =
-  /(?:^|\s)(?:openclaw-tui|openclaw\s+tui|openclaw\s+chat|openclaw\s+terminal)(?:\s|$)/;
+const LOCAL_TUI_SUBCOMMANDS = new Set(["chat", "terminal", "tui"]);
+
+function tokenizeCommandLine(command: string): string[] {
+  return command.trim().split(/\s+/u).filter(Boolean);
+}
+
+function normalizeExecutableName(value: string | undefined): string {
+  return path.basename(value ?? "").replace(/\.exe$/iu, "");
+}
+
+function isLocalTuiCommand(command: string): boolean {
+  const argv = tokenizeCommandLine(command);
+  const executable = normalizeExecutableName(argv[0]);
+  if (executable === "openclaw-tui") {
+    return true;
+  }
+  return executable === "openclaw" && LOCAL_TUI_SUBCOMMANDS.has(argv[1] ?? "");
+}
 
 function parsePsPidLine(line: string): LocalTuiProcess | null {
   const match = line.match(/^\s*(\d+)\s+(.+)$/);
@@ -28,7 +45,7 @@ function parsePsPidLine(line: string): LocalTuiProcess | null {
     return null;
   }
   const command = match[2]?.trim() ?? "";
-  if (!LOCAL_TUI_CMD_RE.test(command)) {
+  if (!isLocalTuiCommand(command)) {
     return null;
   }
   return { pid, command };
