SB-0MNFTJWE6006WA3G: replace legacy SB_CLI_PATH uses in tests/helpers and update assertions to rely on OB_CLI_PATH

Author: Sorra

package.json

@@ -13,6 +13,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
+    "test:integration": "vitest run tests/integration --runInBand",
     "start": "node dist/src/index.js",
     "start:dev": "tsx watch src/index.ts"
   },

src/bot/cli-runner.ts

@@ -345,15 +345,28 @@ function runCliSubprocess(
   // Add remaining args
   cmdArgs.push(...args);
 
+  // Resolve how we will spawn the subprocess.
+  // If the configured CLI executable is a JavaScript file (e.g. a test shim),
+  // spawn Node and pass the script path as the first argument. This makes it
+  // easy to point OB_CLI_PATH at a local JS shim without requiring the shim
+  // to be executable on disk.
+  let spawnCmd: string = cliExecutable;
+  let spawnArgs: (string | number)[] = cmdArgs;
+  if (path.extname(String(cliExecutable)).toLowerCase() === ".js") {
+    // Use the running Node executable to invoke the script
+    spawnCmd = process.execPath;
+    spawnArgs = [cliExecutable, ...cmdArgs];
+  }
+
   // Debug: Log the exact command being spawned for troubleshooting
   try {
-    console.log(`[CLI Debug] Spawning command: ${cliExecutable} ${cmdArgs.map((a) => String(a)).join(" ")}`);
+    console.log(`[CLI Debug] Spawning command: ${spawnCmd} ${spawnArgs.map((a) => String(a)).join(" ")}`);
   } catch {
     // ignore any logging issues
   }
 
   // Spawn the subprocess
-  const subprocess = spawn(cliExecutable, cmdArgs, {
+  const subprocess = spawn(spawnCmd, spawnArgs as string[], {
     cwd,
     env: { ...process.env, ...env },
     stdio: ["ignore", "pipe", "pipe"],

tests/bot/cli-runner.test.ts

@@ -270,8 +270,9 @@ describe("CLI Runner Module", () => {
 
   describe("setCliPath", () => {
     it("setCliPath is a no-op warning", () => {
-      // Function intentionally no longer mutates environment; it should not throw
+      // Function intentionally no longer mutates legacy env vars; it should not throw
       setCliPath("/new/path/to/sb");
+      // Only OB_CLI_PATH is used now; ensure legacy SB_CLI_PATH is not relied upon
       expect(process.env.SB_CLI_PATH).toBeUndefined();
     });
   });

tests/helpers/obCliEnv.ts

@@ -1,15 +1,15 @@
 /**
- * Test helpers to temporarily override OB_CLI_PATH (and related keys)
- * and ensure the environment and cli-runner internal state are restored.
+ * Test helpers to temporarily override OB_CLI_PATH and ensure the
+ * environment and cli-runner internal state are restored.
  */
-export type EnvSnapshot = { OB_CLI_PATH?: string; SB_CLI_PATH?: string };
+export type EnvSnapshot = { OB_CLI_PATH?: string };
 
 /**
  * Synchronously set OB_CLI_PATH and attempt to update cli-runner internal state.
  * Returns a restore function that will reset environment and cli-runner state.
  */
 export function setObCliPath(path?: string): () => void {
-  const prev: EnvSnapshot = { OB_CLI_PATH: process.env.OB_CLI_PATH, SB_CLI_PATH: process.env.SB_CLI_PATH };
+  const prev: EnvSnapshot = { OB_CLI_PATH: process.env.OB_CLI_PATH };
 
   if (path === undefined) delete process.env.OB_CLI_PATH;
   else process.env.OB_CLI_PATH = String(path);
@@ -36,7 +36,6 @@ export function setObCliPath(path?: string): () => void {
   return () => {
     // restore environment
     if (prev.OB_CLI_PATH === undefined) delete process.env.OB_CLI_PATH; else process.env.OB_CLI_PATH = prev.OB_CLI_PATH;
-    if (prev.SB_CLI_PATH === undefined) delete process.env.SB_CLI_PATH; else process.env.SB_CLI_PATH = prev.SB_CLI_PATH;
 
     // Attempt to restore cli-runner internal state (best-effort)
     (async () => {
@@ -58,7 +57,7 @@ export function setObCliPath(path?: string): () => void {
  * and restores environment and cli-runner internal state afterwards.
  */
 export async function withObCliPath<T>(path: string | undefined, fn: () => Promise<T> | T): Promise<T> {
-  const prev: EnvSnapshot = { OB_CLI_PATH: process.env.OB_CLI_PATH, SB_CLI_PATH: process.env.SB_CLI_PATH };
+  const prev: EnvSnapshot = { OB_CLI_PATH: process.env.OB_CLI_PATH };
 
   // Set env
   if (path === undefined) delete process.env.OB_CLI_PATH;
@@ -101,7 +100,6 @@ export async function withObCliPath<T>(path: string | undefined, fn: () => Promi
 
     // Restore env
     if (prev.OB_CLI_PATH === undefined) delete process.env.OB_CLI_PATH; else process.env.OB_CLI_PATH = prev.OB_CLI_PATH;
-    if (prev.SB_CLI_PATH === undefined) delete process.env.SB_CLI_PATH; else process.env.SB_CLI_PATH = prev.SB_CLI_PATH;
   }
 }