Merge branch 'main' into codex-update/0.120.0

NikolaiSviridov · web-flow · commit fa61f94525f8 · 2026-04-14T14:33:33.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/codex-acp",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "description": "",
   "main": "dist/index.js",
   "bin": {
diff --git a/src/index.ts b/src/index.ts
@@ -30,8 +30,7 @@ if (process.argv[2] === "login") {
 }
 
 function startAcpServer() {
-    const defaultCodexPath = createRequire(import.meta.url).resolve("@openai/codex/bin/codex.js");
-    const codexPath = process.env["CODEX_PATH"] ?? defaultCodexPath;
+    const codexPath = process.env["CODEX_PATH"] ?? createRequire(import.meta.url).resolve("@openai/codex/bin/codex.js");
     const configString = process.env["CODEX_CONFIG"];
     const authRequestString = process.env["DEFAULT_AUTH_REQUEST"];
     const modelProvider = process.env["MODEL_PROVIDER"];

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ if (process.argv[2] === "login") {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`function startAcpServer() {`
`33`		`- const defaultCodexPath = createRequire(import.meta.url).resolve("@openai/codex/bin/codex.js");`
`34`		`- const codexPath = process.env["CODEX_PATH"] ?? defaultCodexPath;`
	`33`	`+ const codexPath = process.env["CODEX_PATH"] ?? createRequire(import.meta.url).resolve("@openai/codex/bin/codex.js");`
`35`	`34`	`const configString = process.env["CODEX_CONFIG"];`
`36`	`35`	`const authRequestString = process.env["DEFAULT_AUTH_REQUEST"];`
`37`	`36`	`const modelProvider = process.env["MODEL_PROVIDER"];`