Skip to content

Commit 0461285

Browse files
refactor: review comment sessionMcpServers: Array<acp.McpServer> ->sessionMcpServers: Array<string>
1 parent c253630 commit 0461285

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/CodexAcpServer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export interface SessionState {
5757
cwd: string;
5858
fastModeEnabled: boolean;
5959
currentModelSupportsFast: boolean;
60-
sessionMcpServers: Array<acp.McpServer>;
60+
sessionMcpServers: Array<string>;
6161
configBackedMcpServerNames?: Set<string>;
6262
}
6363

@@ -715,10 +715,10 @@ export class CodexAcpServer implements acp.Agent {
715715
private createSessionMcpServers(
716716
mcpServers: Array<acp.McpServer>,
717717
recoverFromStartup: boolean,
718-
): Array<acp.McpServer> {
718+
): Array<string> {
719719
// Explicit MCP servers from the request are the primary source of truth for the session.
720720
if (mcpServers.length > 0) {
721-
return mcpServers;
721+
return mcpServers.map(server => server.name);
722722
}
723723
// Fresh sessions without MCP config should not inherit any session MCP state.
724724
if (!recoverFromStartup) {

src/CodexCommands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export class CodexCommands {
153153
const resourceCount = (server.resources ?? []).length;
154154
return `- ${server.name}: ${toolCount} tools, ${resourceCount} resources, auth=${server.authStatus}`;
155155
});
156-
const sessionServers = sessionState.sessionMcpServers.map(server => `- ${server.name}`);
156+
const sessionServers = sessionState.sessionMcpServers.map(server => `- ${server}`);
157157
const lines = [...configuredServers, ...sessionServers];
158158
const text = lines.length > 0
159159
? ["Configured MCP servers:", ...lines].join("\n")

src/__tests__/CodexACPAgent/load-session.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ describe("CodexACPAgent - loadSession", () => {
238238
mcpServers: [],
239239
});
240240

241-
expect(codexAcpAgent.getSessionState("session-1").sessionMcpServers.map(server => server.name)).toEqual([]);
241+
expect(codexAcpAgent.getSessionState("session-1").sessionMcpServers).toEqual([]);
242242
});
243243

244244
it("publishes MCP startup failure for explicitly requested servers during loadSession", async () => {
@@ -317,7 +317,7 @@ describe("CodexACPAgent - loadSession", () => {
317317
});
318318

319319
await vi.waitFor(() => {
320-
expect(codexAcpAgent.getSessionState("session-1").sessionMcpServers.map(server => server.name)).toEqual(["broken-mcp"]);
320+
expect(codexAcpAgent.getSessionState("session-1").sessionMcpServers).toEqual(["broken-mcp"]);
321321
});
322322

323323
fixture.sendServerNotification({

0 commit comments

Comments
 (0)