fix(codex): handle windows cli resume shims

mbelinky · mbelinky · commit 3595cd31e925 · 2026-05-14T10:56:10.000+02:00
diff --git a/extensions/codex/src/node-cli-sessions.test.ts b/extensions/codex/src/node-cli-sessions.test.ts
@@ -6,6 +6,7 @@ import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import {
   CODEX_CLI_SESSIONS_LIST_COMMAND,
   createCodexCliSessionNodeHostCommands,
+  resolveCodexCliResumeSpawnInvocation,
 } from "./node-cli-sessions.js";
 
 let tempDir: string;
@@ -121,4 +122,30 @@ describe("codex cli node sessions", () => {
       },
     ]);
   });
+
+  it("resolves Windows npm .cmd Codex shims through Node for resume", async () => {
+    const binDir = path.join(tempDir, "bin");
+    const entryPath = path.join(binDir, "node_modules", "@openai", "codex", "bin", "codex.js");
+    const shimPath = path.join(binDir, "codex.cmd");
+    await fs.mkdir(path.dirname(entryPath), { recursive: true });
+    await fs.writeFile(entryPath, "console.log('codex')\n", "utf8");
+    await fs.writeFile(
+      shimPath,
+      '@ECHO off\r\n"%~dp0\\node_modules\\@openai\\codex\\bin\\codex.js" %*\r\n',
+      "utf8",
+    );
+
+    const resolved = resolveCodexCliResumeSpawnInvocation(["exec", "resume", "session-id"], {
+      platform: "win32",
+      env: { PATH: binDir, PATHEXT: ".CMD;.EXE;.BAT" },
+      execPath: "C:\\node\\node.exe",
+    });
+
+    expect(resolved).toEqual({
+      command: "C:\\node\\node.exe",
+      args: [entryPath, "exec", "resume", "session-id"],
+      shell: undefined,
+      windowsHide: true,
+    });
+  });
 });
diff --git a/extensions/codex/src/node-cli-sessions.ts b/extensions/codex/src/node-cli-sessions.ts
@@ -9,6 +9,10 @@ import type {
 } from "openclaw/plugin-sdk/plugin-entry";
 import type { PluginRuntime } from "openclaw/plugin-sdk/plugin-runtime";
 import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/temp-path";
+import {
+  materializeWindowsSpawnProgram,
+  resolveWindowsSpawnProgram,
+} from "openclaw/plugin-sdk/windows-spawn";
 import { formatCodexDisplayText } from "./command-formatters.js";
 
 export const CODEX_CLI_SESSIONS_LIST_COMMAND = "codex.cli.sessions.list";
@@ -48,6 +52,18 @@ type CodexCliSessionNodeInfo = {
   commands?: string[];
 };
 
+type CodexCliResumeSpawnRuntime = {
+  platform: NodeJS.Platform;
+  env: NodeJS.ProcessEnv;
+  execPath: string;
+};
+
+const DEFAULT_RESUME_SPAWN_RUNTIME: CodexCliResumeSpawnRuntime = {
+  platform: process.platform,
+  env: process.env,
+  execPath: process.execPath,
+};
+
 export function createCodexCliSessionNodeHostCommands(): OpenClawPluginNodeHostCommand[] {
   return [
     {
@@ -249,10 +265,17 @@ async function runCodexExecResume(params: {
       params.sessionId,
       "-",
     ];
-    const child = spawn("codex", args, {
+    const invocation = resolveCodexCliResumeSpawnInvocation(args, {
+      platform: process.platform,
+      env: process.env,
+      execPath: process.execPath,
+    });
+    const child = spawn(invocation.command, invocation.args, {
       cwd: params.cwd || process.cwd(),
       stdio: ["pipe", "pipe", "pipe"],
       env: process.env,
+      shell: invocation.shell,
+      windowsHide: invocation.windowsHide,
     });
     const stdout: Buffer[] = [];
     const stderr: Buffer[] = [];
@@ -292,6 +315,26 @@ async function runCodexExecResume(params: {
   }
 }
 
+export function resolveCodexCliResumeSpawnInvocation(
+  args: string[],
+  runtime: CodexCliResumeSpawnRuntime = DEFAULT_RESUME_SPAWN_RUNTIME,
+): { command: string; args: string[]; shell?: boolean; windowsHide?: boolean } {
+  const program = resolveWindowsSpawnProgram({
+    command: "codex",
+    platform: runtime.platform,
+    env: runtime.env,
+    execPath: runtime.execPath,
+    packageName: "@openai/codex",
+  });
+  const resolved = materializeWindowsSpawnProgram(program, args);
+  return {
+    command: resolved.command,
+    args: resolved.argv,
+    shell: resolved.shell,
+    windowsHide: resolved.windowsHide,
+  };
+}
+
 async function readHistorySessions(
   codexHome: string,
 ): Promise<Map<string, CodexCliSessionSummary>> {
