@agentclientprotocol/codex-acp 0.0.41 → 0.0.43

package/dist/index.js

@@ -3292,9 +3292,6 @@ var require_node = __commonJS({
   }
 });
 
-// src/index.ts
-import { createRequire } from "node:module";
-
 // node_modules/zod/v4/classic/external.js
 var external_exports = {};
 __export(external_exports, {
@@ -16692,6 +16689,7 @@ var RequestError = class _RequestError extends Error {
 // src/CodexJsonRpcConnection.ts
 var rpc = __toESM(require_node(), 1);
 import { spawn } from "node:child_process";
+import { createRequire } from "node:module";
 
 // src/StdUtils.ts
 var import_vscode_jsonrpc = __toESM(require_main(), 1);
@@ -16827,7 +16825,13 @@ var logger = new Logger();
 // src/CodexJsonRpcConnection.ts
 function startCodexConnection(codexPath, env) {
   const spawnEnv = env ?? process.env;
-  const codex = process.platform === "win32" ? spawn(`"${codexPath}" app-server`, { shell: true, env: spawnEnv }) : spawn(codexPath, ["app-server"], { env: spawnEnv });
+  let codex;
+  if (codexPath) {
+    codex = process.platform === "win32" ? spawn(`"${codexPath}" app-server`, { shell: true, env: spawnEnv }) : spawn(codexPath, ["app-server"], { env: spawnEnv });
+  } else {
+    const bundledCodexPath = createRequire(import.meta.url).resolve("@openai/codex/bin/codex.js");
+    codex = spawn(process.execPath, [bundledCodexPath, "app-server"], { env: spawnEnv });
+  }
   attachLogs(codex);
   const reader = createJSONRPCReader(codex.stdout);
   const writer = createJSONRPCWriter(codex.stdin);
@@ -18954,7 +18958,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "0.0.41",
+  version: "0.0.43",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -19163,7 +19167,7 @@ var CodexAcpClient = class {
       cwd: request.cwd,
       developerInstructions: null,
       model: null,
-      modelProvider: this.getModelProvider(),
+      modelProvider: this.getResumeModelProvider(),
       personality: null,
       threadId: request.sessionId
     });
@@ -19184,7 +19188,7 @@ var CodexAcpClient = class {
       cwd: request.cwd,
       developerInstructions: null,
       model: null,
-      modelProvider: this.getModelProvider(),
+      modelProvider: this.getResumeModelProvider(),
       personality: null,
       threadId: request.sessionId
     });
@@ -19248,6 +19252,9 @@ var CodexAcpClient = class {
   getModelProvider() {
     return this.gatewayConfig?.modelProvider ?? this.modelProvider;
   }
+  getResumeModelProvider() {
+    return this.getModelProvider() ?? "openai";
+  }
   async refreshSkills(cwd, meta) {
     if (!cwd) {
       return;
@@ -19933,7 +19940,7 @@ var CodexAcpServer = class {
       logger.log(`Create new session...`);
       sessionMetadata = await this.runWithProcessCheck(() => this.codexAcpClient.newSession(request));
     }
-    const accountResponse = await this.runWithProcessCheck(() => this.codexAcpClient.getAccount());
+    const account = await this.getActiveAccount();
     const { sessionId, currentModelId, models } = sessionMetadata;
     const sessionMcpServers = this.resolveSessionMcpServers(requestedMcpServers, "sessionId" in request);
     const currentModel = this.findCurrentModel(models, currentModelId);
@@ -19948,7 +19955,7 @@ var CodexAcpServer = class {
       totalTokenUsage: null,
       modelContextWindow: null,
       rateLimits: null,
-      account: accountResponse.account,
+      account,
       cwd: request.cwd,
       sessionMcpServers
     };
@@ -19965,6 +19972,13 @@ var CodexAcpServer = class {
     const sessionModeState = sessionState.agentMode.toSessionModeState();
     return [sessionId, sessionModelState, sessionModeState];
   }
+  async getActiveAccount() {
+    if (this.codexAcpClient.getModelProvider()) {
+      return null;
+    }
+    const accountResponse = await this.runWithProcessCheck(() => this.codexAcpClient.getAccount());
+    return accountResponse.account;
+  }
   async loadSession(params) {
     logger.log("Loading session...", { sessionId: params.sessionId });
     const {
@@ -20104,7 +20118,7 @@ var CodexAcpServer = class {
     const sessionMetadata = await this.runWithProcessCheck(
       () => this.codexAcpClient.loadSession(request)
     );
-    const accountResponse = await this.runWithProcessCheck(() => this.codexAcpClient.getAccount());
+    const account = await this.getActiveAccount();
     const { sessionId, currentModelId, models, thread } = sessionMetadata;
     const sessionMcpServers = this.resolveSessionMcpServers(requestedMcpServers, true);
     const currentModel = this.findCurrentModel(models, currentModelId);
@@ -20119,7 +20133,7 @@ var CodexAcpServer = class {
       totalTokenUsage: null,
       modelContextWindow: null,
       rateLimits: null,
-      account: accountResponse.account,
+      account,
       cwd: request.cwd,
       sessionMcpServers
     };
@@ -20861,7 +20875,7 @@ if (process.argv[2] === "login") {
   startAcpServer();
 }
 function startAcpServer() {
-  const codexPath = process.env["CODEX_PATH"] ?? createRequire(import.meta.url).resolve("@openai/codex/bin/codex.js");
+  const codexPath = process.env["CODEX_PATH"];
   const configString = process.env["CODEX_CONFIG"];
   const authRequestString = process.env["DEFAULT_AUTH_REQUEST"];
   const modelProvider = process.env["MODEL_PROVIDER"];

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.41",
+  "version": "0.0.43",
   "description": "",
   "main": "dist/index.js",
   "bin": {