Fix: avoid plugin registration on global help/version (#2212) (thanks @dial481)

CHANGELOG.md

@@ -56,7 +56,6 @@ Status: unreleased.
 ### Fixes
 - Security: pin npm overrides to keep tar@7.5.4 for install toolchains.
 - Security: properly test Windows ACL audit for config includes. (#2403) Thanks @dominicnunez.
-- CLI: recognize versioned Node executables when parsing argv. (#2444) Thanks @David-Marsh-Photo.
 - BlueBubbles: coalesce inbound URL link preview messages. (#1981) Thanks @tyler6204.
 - Cron: allow payloads containing "heartbeat" in event filter. (#2219) Thanks @dwfinkelstein.
 - CLI: avoid loading config for global help/version while registering plugin commands. (#2212) Thanks @dial481.

src/cli/argv.test.ts

@@ -78,48 +78,6 @@ describe("argv helpers", () => {
     });
     expect(nodeArgv).toEqual(["node", "clawdbot", "status"]);
 
-    const versionedNodeArgv = buildParseArgv({
-      programName: "clawdbot",
-      rawArgs: ["node-22", "clawdbot", "status"],
-    });
-    expect(versionedNodeArgv).toEqual(["node-22", "clawdbot", "status"]);
-
-    const versionedNodeWindowsArgv = buildParseArgv({
-      programName: "clawdbot",
-      rawArgs: ["node-22.2.0.exe", "clawdbot", "status"],
-    });
-    expect(versionedNodeWindowsArgv).toEqual(["node-22.2.0.exe", "clawdbot", "status"]);
-
-    const versionedNodePatchlessArgv = buildParseArgv({
-      programName: "clawdbot",
-      rawArgs: ["node-22.2", "clawdbot", "status"],
-    });
-    expect(versionedNodePatchlessArgv).toEqual(["node-22.2", "clawdbot", "status"]);
-
-    const versionedNodeWindowsPatchlessArgv = buildParseArgv({
-      programName: "clawdbot",
-      rawArgs: ["node-22.2.exe", "clawdbot", "status"],
-    });
-    expect(versionedNodeWindowsPatchlessArgv).toEqual(["node-22.2.exe", "clawdbot", "status"]);
-
-    const versionedNodeWithPathArgv = buildParseArgv({
-      programName: "clawdbot",
-      rawArgs: ["/usr/bin/node-22.2.0", "clawdbot", "status"],
-    });
-    expect(versionedNodeWithPathArgv).toEqual(["/usr/bin/node-22.2.0", "clawdbot", "status"]);
-
-    const nodejsArgv = buildParseArgv({
-      programName: "clawdbot",
-      rawArgs: ["nodejs", "clawdbot", "status"],
-    });
-    expect(nodejsArgv).toEqual(["nodejs", "clawdbot", "status"]);
-
-    const nonVersionedNodeArgv = buildParseArgv({
-      programName: "clawdbot",
-      rawArgs: ["node-dev", "clawdbot", "status"],
-    });
-    expect(nonVersionedNodeArgv).toEqual(["node", "clawdbot", "node-dev", "clawdbot", "status"]);
-
     const directArgv = buildParseArgv({
       programName: "clawdbot",
       rawArgs: ["clawdbot", "status"],

src/cli/argv.ts

@@ -96,27 +96,15 @@ export function buildParseArgv(params: {
         : baseArgv;
   const executable = (normalizedArgv[0]?.split(/[/\\]/).pop() ?? "").toLowerCase();
   const looksLikeNode =
-    normalizedArgv.length >= 2 && (isNodeExecutable(executable) || isBunExecutable(executable));
+    normalizedArgv.length >= 2 &&
+    (executable === "node" ||
+      executable === "node.exe" ||
+      executable === "bun" ||
+      executable === "bun.exe");
   if (looksLikeNode) return normalizedArgv;
   return ["node", programName || "clawdbot", ...normalizedArgv];
 }
 
-const nodeExecutablePattern = /^node-\d+(?:\.\d+)*(?:\.exe)?$/;
-
-function isNodeExecutable(executable: string): boolean {
-  return (
-    executable === "node" ||
-    executable === "node.exe" ||
-    executable === "nodejs" ||
-    executable === "nodejs.exe" ||
-    nodeExecutablePattern.test(executable)
-  );
-}
-
-function isBunExecutable(executable: string): boolean {
-  return executable === "bun" || executable === "bun.exe";
-}
-
 export function shouldMigrateStateFromPath(path: string[]): boolean {
   if (path.length === 0) return true;
   const [primary, secondary] = path;