Skip to content

Commit 507d789

Browse files
refactor: review comment sessionMcpServers: Array<acp.McpServer> ->sessionMcpServers: Array<string>
1 parent 296b7f7 commit 507d789

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
@@ -56,7 +56,7 @@ export interface SessionState {
5656
cwd: string;
5757
fastModeEnabled: boolean;
5858
currentModelSupportsFast: boolean;
59-
sessionMcpServers: Array<acp.McpServer>;
59+
sessionMcpServers: Array<string>;
6060
configBackedMcpServerNames?: Set<string>;
6161
}
6262

@@ -707,10 +707,10 @@ export class CodexAcpServer implements acp.Agent {
707707
private createSessionMcpServers(
708708
mcpServers: Array<acp.McpServer>,
709709
recoverFromStartup: boolean,
710-
): Array<acp.McpServer> {
710+
): Array<string> {
711711
// Explicit MCP servers from the request are the primary source of truth for the session.
712712
if (mcpServers.length > 0) {
713-
return mcpServers;
713+
return mcpServers.map(server => server.name);
714714
}
715715
// Fresh sessions without MCP config should not inherit any session MCP state.
716716
if (!recoverFromStartup) {

src/CodexCommands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export class CodexCommands {
165165
const resourceCount = (server.resources ?? []).length;
166166
return `- ${server.name}: ${toolCount} tools, ${resourceCount} resources, auth=${server.authStatus}`;
167167
});
168-
const sessionServers = sessionState.sessionMcpServers.map(server => `- ${server.name}`);
168+
const sessionServers = sessionState.sessionMcpServers.map(server => `- ${server}`);
169169
const lines = [...configuredServers, ...sessionServers];
170170
const text = lines.length > 0
171171
? ["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)