@agentrouter-top/relay-dsh-plugin-codex 0.2.2-agentrouter.8 → 0.2.2-agentrouter.9

package/lib/host-plugin.js

@@ -4,10 +4,10 @@ import assert from "node:assert/strict";
 import { EventEmitter } from "node:events";
 import { spawn } from "node:child_process";
 import readline from "node:readline";
+import { basename, dirname, isAbsolute, join, resolve, sep } from "node:path";
 import { createHash, randomUUID, timingSafeEqual } from "node:crypto";
 import { chmod, cp, link, lstat, mkdir, readFile, realpath, stat, unlink, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { basename, dirname, isAbsolute, join, resolve, sep } from "node:path";
 import * as llm from "@deepseek-ai/dsh-llm";
 import { LlmAdapter, LlmError, MessageId, createMessage, freezeMessage } from "@deepseek-ai/dsh-llm";
 import { existsSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from "node:fs";
@@ -316,14 +316,35 @@ function resolveCodexLaunch({ command, env = process.env, execPath = process.exe
 		throw error;
 	}
 	let launcher;
+	let nativeCommand;
 	try {
 		launcher = resolvePackage(BUNDLED_CODEX_ENTRY);
 		resolvePackage(`${platformPackage}/package.json`);
+		if (platform === "win32") nativeCommand = resolvePackage(`${platformPackage}/vendor/${arch === "arm64" ? "aarch64" : "x86_64"}-pc-windows-msvc/bin/codex.exe`);
 	} catch (cause) {
 		const error = new Error(`The bundled Codex runtime for ${platform}/${arch} is unavailable. Reinstall @agentrouter-top/relay-dsh-plugin-codex, or set RELAY_CODEX_COMMAND to an absolute Codex executable path.`, { cause });
 		error.code = "CODEX_RUNTIME_MISSING";
 		throw error;
 	}
+	if (nativeCommand) {
+		const nativeEnv = {
+			...env,
+			CODEX_MANAGED_PACKAGE_ROOT: resolve(dirname(launcher), "..")
+		};
+		for (const manager of [
+			"NPM",
+			"BUN",
+			"PNPM",
+			"VITE_PLUS"
+		]) delete nativeEnv[`CODEX_MANAGED_BY_${manager}`];
+		nativeEnv.CODEX_MANAGED_BY_NPM = "1";
+		return Object.freeze({
+			command: nativeCommand,
+			argsPrefix: [],
+			source: "bundled",
+			env: Object.freeze(nativeEnv)
+		});
+	}
 	return Object.freeze({
 		command: execPath,
 		argsPrefix: [launcher],
@@ -440,6 +461,7 @@ var CodexAppServerClient = class extends EventEmitter {
 			command,
 			env: this.env
 		});
+		if (launch.env) this.env = launch.env;
 		this.command = launch.command;
 		this.commandSource = launch.source;
 		this.appServerArgs = [...args];