Skip to content

Commit 94712ca

Browse files
authored
Cleanups (#219)
* Add missing TypeScript semicolons * Remove unused ACP namespace import * Remove unused stdin close argument * Clarify release archive and Codex update docs * Remove duplicate sed range script pattern
1 parent 30e6144 commit 94712ca

8 files changed

Lines changed: 16 additions & 18 deletions

File tree

readme-dev.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Run from sources
3131

3232
Run from binaries
3333

34-
1. Download a `codex-acp-<platform>.zip` archive from https://github.com/agentclientprotocol/codex-acp/releases
34+
1. Download a `codex-acp-<platform>.zip` archive from https://github.com/agentclientprotocol/codex-acp/releases (`<platform>` is one of: `linux`, `darwin`, `win32`)
3535
2. Unzip the archive:
3636
```bash
3737
unzip codex-acp-<platform>.zip
@@ -69,6 +69,6 @@ npm run package:all
6969

7070
### Update supported Codex version
7171

72-
1. Update Codex dependency: `package.json`
72+
1. Update the `@openai/codex` version in `package.json` (under `dependencies`).
7373
2. Regenerate Codex types in `src/app-server/`: `npm run generate-types`
7474
3. Ensure there are no type errors or failed tests: `npm run typecheck` and `npm run test`

src/CodexAcpClient.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export class CodexAcpClient {
107107
case "gateway":
108108
if (!authRequest._meta) throw RequestError.invalidRequest();
109109

110-
const gatewaySettings = authRequest._meta["gateway"]
110+
const gatewaySettings = authRequest._meta["gateway"];
111111
if (!gatewaySettings) throw RequestError.invalidRequest();
112112

113113
const baseUrl = gatewaySettings.baseUrl;
@@ -127,7 +127,7 @@ export class CodexAcpClient {
127127
http_headers: headers,
128128
wire_api: "responses"
129129
}
130-
}
130+
};
131131

132132
// Early return: model provider information will be sent to Codex later during the session creation
133133
return true;

src/CodexAcpServer.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ export class CodexAcpServer {
323323
let sessionMetadata: SessionMetadata;
324324
let resumeSubscribed = false;
325325
if ("sessionId" in request) {
326-
logger.log(`Resume existing session: ${request.sessionId}...`)
326+
logger.log(`Resume existing session: ${request.sessionId}...`);
327327
try {
328328
sessionMetadata = await this.runWithProcessCheck(() =>
329329
this.codexAcpClient.resumeSession(request, () => {
@@ -337,7 +337,7 @@ export class CodexAcpServer {
337337
throw err;
338338
}
339339
} else {
340-
logger.log(`Create new session...`)
340+
logger.log(`Create new session...`);
341341
sessionMetadata = await this.runWithProcessCheck(() => this.codexAcpClient.newSession(request));
342342
}
343343

@@ -378,7 +378,7 @@ export class CodexAcpServer {
378378
currentModelSupportsFast: currentModelSupportsFast,
379379
sessionMcpServers: sessionMcpServers,
380380
terminalOutputMode: this.terminalOutputMode,
381-
}
381+
};
382382
this.sessions.set(sessionId, sessionState);
383383
resumeSubscribed = false;
384384

@@ -1318,7 +1318,7 @@ export class CodexAcpServer {
13181318
_meta: this.buildQuotaMeta(sessionState),
13191319
};
13201320
}
1321-
const error = eventHandler.getFailure()
1321+
const error = eventHandler.getFailure();
13221322
if (error) {
13231323
// noinspection ExceptionCaughtLocallyJS
13241324
throw error;
@@ -1420,7 +1420,7 @@ export class CodexAcpServer {
14201420
};
14211421
}
14221422

1423-
const error = eventHandler.getFailure()
1423+
const error = eventHandler.getFailure();
14241424
if (error) {
14251425
// noinspection ExceptionCaughtLocallyJS
14261426
throw error;

src/CodexEventHandler.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import type {
44
ServerNotification
55
} from "./app-server";
66
import type {SessionState} from "./CodexAcpServer";
7-
import * as acp from "@agentclientprotocol/sdk";
87
import {type PlanEntry, RequestError} from "@agentclientprotocol/sdk";
98
import {ACPSessionConnection, type AcpClientConnection, type UpdateSessionEvent} from "./ACPSessionConnection";
109
import type {

src/CodexJsonRpcConnection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface CodexConnection {
1515
export function startCodexConnection(codexPath?: string, env?: NodeJS.ProcessEnv): CodexConnection {
1616
const spawnEnv = env ?? process.env;
1717

18-
let codex: ChildProcessWithoutNullStreams
18+
let codex: ChildProcessWithoutNullStreams;
1919
if (codexPath) {
2020
codex = process.platform === 'win32'
2121
? spawn(`"${codexPath}" app-server`, { shell: true, env: spawnEnv })

src/ResponseItemHistoryFallback.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -975,8 +975,7 @@ function sedFileArguments(args: string[]): string[] {
975975
}
976976

977977
function looksLikeSedRangeScript(arg: string): boolean {
978-
return /^(\d+|\$)?(,(\d+|\$))?[pd]$/.test(arg)
979-
|| /^(\d+|\$)?(,(\d+|\$))?p$/.test(arg);
978+
return /^(\d+|\$)?(,(\d+|\$))?[pd]$/.test(arg);
980979
}
981980

982981
function headTailFileArguments(args: string[]): string[] {

src/__tests__/CodexACPAgent/CodexAcpClient.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ describe('ACP server test', { timeout: 40_000 }, () => {
5656

5757
keyFixture.clearCodexConnectionDump();
5858

59-
const authRequest: CodexAuthRequest = { methodId: "api-key", _meta: { "api-key": { apiKey: "TOKEN" }}}
59+
const authRequest: CodexAuthRequest = { methodId: "api-key", _meta: { "api-key": { apiKey: "TOKEN" }}};
6060
await codexAcpAgent.authenticate(authRequest);
6161
const newSessionResponse = await codexAcpAgent.newSession({cwd: "", mcpServers: []});
62-
expect(newSessionResponse.sessionId).toBeDefined()
62+
expect(newSessionResponse.sessionId).toBeDefined();
6363

6464
const transportEvents = keyFixture.getCodexConnectionEvents([...ignoredFields, "upgrade"]);
6565
const transportMethods = transportEvents.flatMap(event => "method" in event ? [event.method] : []);
@@ -149,8 +149,8 @@ describe('ACP server test', { timeout: 40_000 }, () => {
149149
expect(authenticatedResponse).toEqual({type: "gateway", name: "custom-gateway"});
150150

151151
const newSessionResponse = await codexAcpAgent.newSession({cwd: "", mcpServers: []});
152-
expect(newSessionResponse.sessionId).toBeDefined()
153-
})
152+
expect(newSessionResponse.sessionId).toBeDefined();
153+
});
154154

155155
it('should show account in /status for api key auth and hide it for gateway auth', async () => {
156156
const authFixture = createTestFixture();

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function startAcpServer() {
7676
stderr = (stderr + data.toString()).slice(-maxStderrTailChars);
7777
});
7878

79-
process.stdin.on("close", (chunk: Buffer) => {
79+
process.stdin.on("close", () => {
8080
codexConnection.process.stdin.end();
8181
// Kill the codex process if it doesn't exit naturally
8282
setTimeout(() => {

0 commit comments

Comments
 (0)