refactor: rename CodexAcpAgent to clarify difference

Author: AlexandrSuhinin

src/CodexACPAgent.ts src/CodexAcpServer.tssrc/CodexACPAgent.ts renamed to src/CodexAcpServer.ts

@@ -10,7 +10,7 @@ export interface SessionState {
     pendingPrompt: AbortController | null;
 }
 
-export class CodexACPAgent implements acp.Agent {
+export class CodexAcpServer implements acp.Agent {
     private readonly codexAcpClient: CodexAcpClient;
     private readonly connection: acp.AgentSideConnection;
     private readonly defaultAuthRequest: CodexAuthRequest | null;

src/CodexEventHandler.ts

@@ -1,5 +1,5 @@
 import type {ServerNotification} from "./app-server";
-import type {SessionState} from "./CodexACPAgent";
+import type {SessionState} from "./CodexAcpServer";
 import * as acp from "@agentclientprotocol/sdk";
 import {type PlanEntry, type ToolCallContent} from "@agentclientprotocol/sdk";
 import {applyPatch} from "diff";

src/__tests__/CodexACPAgent/CodexAcpClient.test.ts

@@ -2,7 +2,7 @@ import {describe, expect, it, vi, beforeEach, afterEach} from 'vitest';
 import type {CodexAuthRequest} from "../../CodexAuthMethod";
 import {createTestFixture, type TestFixture} from "../acp-test-utils";
 import type {ServerNotification} from "../../app-server";
-import type {SessionState} from "../../CodexACPAgent";
+import type {SessionState} from "../../CodexAcpServer";
 
 describe('ACP server test', () => {
 

src/__tests__/CodexACPAgent/initialize.test.ts

@@ -1,13 +1,13 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { CodexACPAgent } from '../../CodexACPAgent';
+import { CodexAcpServer } from '../../CodexAcpServer';
 import * as acp from '@agentclientprotocol/sdk';
 import { createMockConnections } from './test-utils';
 import {CodexAuthMethods} from "../../CodexAuthMethod";
 import {CodexAcpClient} from "../../CodexAcpClient";
 import {CodexAppServerClient} from "../../CodexAppServerClient";
 
 describe('CodexACPAgent - initialize', () => {
-    let agent: CodexACPAgent;
+    let agent: CodexAcpServer;
     let mockAcpConnection: any;
     let mockCodexConnection: any;
 
@@ -17,7 +17,7 @@ describe('CodexACPAgent - initialize', () => {
         mockCodexConnection = mocks.mockCodexConnection;
         const codexAppServerClient = new CodexAppServerClient(mockCodexConnection);
         const codexAcpClient = new CodexAcpClient(codexAppServerClient);
-        agent = new CodexACPAgent(mockAcpConnection, codexAcpClient);
+        agent = new CodexAcpServer(mockAcpConnection, codexAcpClient);
     });
 
     afterEach(() => {

src/__tests__/CodexACPAgent/reasoning-events.test.ts

@@ -1,17 +1,17 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { CodexACPAgent } from '../../CodexACPAgent';
+import { CodexAcpServer } from '../../CodexAcpServer';
 import { createMockConnections, testEventHandling, type MockConnections } from './test-utils';
 
 //TODO rewrite to more stable version
 describe.skip('CodexACPAgent - reasoning events', () => {
-    let agent: CodexACPAgent;
+    let agent: CodexAcpServer;
     let mocks: MockConnections;
     const sessionId = 'test-session-id';
 
     beforeEach(async () => {
         mocks = createMockConnections();
 
-        agent = new CodexACPAgent(mocks.mockAcpConnection, mocks.mockCodexConnection);
+        agent = new CodexAcpServer(mocks.mockAcpConnection, mocks.mockCodexConnection);
 
         mocks.mockCodexConnection.sendRequest.mockResolvedValueOnce(
             { conversationId: sessionId }

src/__tests__/CodexACPAgent/test-utils.ts

@@ -1,5 +1,5 @@
 import { vi, expect } from 'vitest';
-import type { CodexACPAgent } from '../../CodexACPAgent';
+import type { CodexAcpServer } from '../../CodexAcpServer';
 
 export interface MockConnections {
     mockAcpConnection: any;
@@ -37,7 +37,7 @@ export function createMockConnections(): MockConnections {
 }
 
 export async function startPromptForEventHandlers(
-    agent: CodexACPAgent,
+    agent: CodexAcpServer,
     sessionId: string,
     mocks: MockConnections
 ): Promise<() => Promise<void>> {
@@ -71,7 +71,7 @@ export async function triggerEvent(mocks: MockConnections, event: any): Promise<
 }
 
 export async function testEventHandling(
-    agent: CodexACPAgent,
+    agent: CodexAcpServer,
     sessionId: string,
     mocks: MockConnections,
     events: any | any[]

src/__tests__/acp-test-utils.ts

@@ -1,7 +1,7 @@
 import {CodexAcpClient} from '../CodexAcpClient';
 import {type CodexConnectionEvent, CodexAppServerClient} from '../CodexAppServerClient';
 import {startCodexConnection} from "../CodexJsonRpcConnection";
-import {CodexACPAgent} from "../CodexACPAgent";
+import {CodexAcpServer} from "../CodexAcpServer";
 import type {AgentSideConnection} from "@agentclientprotocol/sdk";
 
 export type MethodCallEvent = { method: string; args: any[] };
@@ -20,7 +20,7 @@ function createSmartMock<T extends object>(onCall: (event: MethodCallEvent) => v
 export interface TestFixture {
     getCodexAppServerClient(): CodexAppServerClient,
     getCodexAcpClient(): CodexAcpClient,
-    getCodexAcpAgent(): CodexACPAgent,
+    getCodexAcpAgent(): CodexAcpServer,
 
     onCodexConnectionEvent(handler: (event: CodexConnectionEvent) => void): void,
     getCodexConnectionDump(ignoredFields: string[]): string,
@@ -42,7 +42,7 @@ export function createTestFixture(): TestFixture {
     const codexAppServerClient = new CodexAppServerClient(startCodexConnection(pathToCodex));
 
     const codexAcpClient = new CodexAcpClient(codexAppServerClient);
-    const codexAcpAgent = new CodexACPAgent(acpConnection, codexAcpClient);
+    const codexAcpAgent = new CodexAcpServer(acpConnection, codexAcpClient);
 
     const transportEvents: CodexConnectionEvent[] = []
     const codexEventHandlers: ((event: CodexConnectionEvent) => void)[] = [];
@@ -52,7 +52,7 @@ export function createTestFixture(): TestFixture {
     });
 
     return {
-        getCodexAcpAgent(): CodexACPAgent {
+        getCodexAcpAgent(): CodexAcpServer {
             return codexAcpAgent;
         },
         getCodexAcpClient(): CodexAcpClient {

src/index.ts

@@ -2,7 +2,7 @@
 
 import * as acp from "@agentclientprotocol/sdk";
 import {startCodexConnection} from "./CodexJsonRpcConnection";
-import {CodexACPAgent} from "./CodexACPAgent";
+import {CodexAcpServer} from "./CodexAcpServer";
 import {createJsonStream} from "./StdUtils";
 import {isCodexAuthRequest} from "./CodexAuthMethod";
 import {CodexAcpClient} from "./CodexAcpClient";
@@ -14,7 +14,7 @@ const logPath = process.env["APP_SERVER_LOGS"];
 const appServerConnection = startCodexConnection(codexPath, logPath);
 const acpJsonStream = createJsonStream(process.stdin, process.stdout);
 
-function createAgent(connection: acp.AgentSideConnection): CodexACPAgent {
+function createAgent(connection: acp.AgentSideConnection): CodexAcpServer {
     const configString = process.env["CODEX_CONFIG"];
     const config = configString ? JSON.parse(configString) : undefined;
     const modelProvider= process.env["MODEL_PROVIDER"];
@@ -23,7 +23,7 @@ function createAgent(connection: acp.AgentSideConnection): CodexACPAgent {
     const defaultAuthRequest = parsedRequest && isCodexAuthRequest(parsedRequest) ? parsedRequest : undefined;
     const appServerClient = new CodexAppServerClient(appServerConnection);
     const codexClient = new CodexAcpClient(appServerClient, config, modelProvider)
-    return new CodexACPAgent(connection, codexClient, defaultAuthRequest);
+    return new CodexAcpServer(connection, codexClient, defaultAuthRequest);
 }
 
 new acp.AgentSideConnection(createAgent, acpJsonStream);