Skip to content

Commit b85e6a7

Browse files
chore: rename configuredMcpServerNames -> mcpServerNamesFromConfig
1 parent 13efe50 commit b85e6a7

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

src/CodexAcpClient.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ export class CodexAcpClient {
223223
currentModelId: currentModelId,
224224
models: codexModels,
225225
currentServiceTier: response.serviceTier ?? null,
226-
configuredMcpServerNames: sessionConfig.configuredMcpServerNames,
226+
mcpServerNamesFromConfig: sessionConfig.mcpServerNamesFromConfig,
227227
}
228228
}
229229

@@ -248,7 +248,7 @@ export class CodexAcpClient {
248248
currentModelId: currentModelId,
249249
models: codexModels,
250250
currentServiceTier: response.serviceTier ?? null,
251-
configuredMcpServerNames: sessionConfig.configuredMcpServerNames,
251+
mcpServerNamesFromConfig: sessionConfig.mcpServerNamesFromConfig,
252252
thread: response.thread,
253253
};
254254
}
@@ -280,7 +280,7 @@ export class CodexAcpClient {
280280
currentModelId: currentModelId,
281281
models: codexModels,
282282
currentServiceTier: response.serviceTier ?? null,
283-
configuredMcpServerNames: sessionConfig.configuredMcpServerNames,
283+
mcpServerNamesFromConfig: sessionConfig.mcpServerNamesFromConfig,
284284
};
285285
}
286286

@@ -305,7 +305,7 @@ export class CodexAcpClient {
305305
if (mcpServers.length === 0) {
306306
return {
307307
config: mergedConfig,
308-
configuredMcpServerNames,
308+
mcpServerNamesFromConfig: configuredMcpServerNames,
309309
};
310310
}
311311

@@ -315,7 +315,7 @@ export class CodexAcpClient {
315315
if (uniqueServers.length === 0) {
316316
return {
317317
config: mergedConfig,
318-
configuredMcpServerNames,
318+
mcpServerNamesFromConfig: configuredMcpServerNames,
319319
};
320320
}
321321

@@ -324,7 +324,7 @@ export class CodexAcpClient {
324324
...mergedConfig,
325325
"mcp_servers": Object.fromEntries(uniqueServers.map(mcp => [mcp.name, this.createMcpSeverConfig(mcp)])),
326326
},
327-
configuredMcpServerNames,
327+
mcpServerNamesFromConfig: configuredMcpServerNames,
328328
};
329329
}
330330

@@ -627,7 +627,7 @@ export type SessionMetadata = {
627627
currentModelId: string,
628628
models: Model[],
629629
currentServiceTier?: ServiceTier | null,
630-
configuredMcpServerNames?: Set<string>,
630+
mcpServerNamesFromConfig?: Set<string>,
631631
}
632632

633633
export type SessionMetadataWithThread = SessionMetadata & {
@@ -636,7 +636,7 @@ export type SessionMetadataWithThread = SessionMetadata & {
636636

637637
type SessionConfig = {
638638
config: JsonObject,
639-
configuredMcpServerNames: Set<string>,
639+
mcpServerNamesFromConfig: Set<string>,
640640
}
641641

642642
function buildPromptItems(prompt: acp.ContentBlock[]): UserInput[] {

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
fastModeEnabled: boolean;
5858
currentModelSupportsFast: boolean;
5959
sessionMcpServers: Array<acp.McpServer>;
60-
configuredMcpServerNames?: Set<string>;
60+
mcpServerNamesFromConfig?: Set<string>;
6161
}
6262

6363
interface PendingMcpStartupSession {
@@ -190,7 +190,7 @@ export class CodexAcpServer implements acp.Agent {
190190
fastModeEnabled: sessionMetadata.currentServiceTier === "fast",
191191
currentModelSupportsFast: currentModelSupportsFast,
192192
sessionMcpServers: this.createSessionMcpServers(requestedMcpServers, "sessionId" in request),
193-
configuredMcpServerNames: sessionMetadata.configuredMcpServerNames ?? new Set(),
193+
mcpServerNamesFromConfig: sessionMetadata.mcpServerNamesFromConfig ?? new Set(),
194194
}
195195
this.sessions.set(sessionId, sessionState);
196196

@@ -450,7 +450,7 @@ export class CodexAcpServer implements acp.Agent {
450450
fastModeEnabled: sessionMetadata.currentServiceTier === "fast",
451451
currentModelSupportsFast: currentModelSupportsFast,
452452
sessionMcpServers: this.createSessionMcpServers(requestedMcpServers, true),
453-
configuredMcpServerNames: sessionMetadata.configuredMcpServerNames ?? new Set(),
453+
mcpServerNamesFromConfig: sessionMetadata.mcpServerNamesFromConfig ?? new Set(),
454454
};
455455
this.sessions.set(sessionId, sessionState);
456456

src/CodexElicitationHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ export class CodexElicitationHandler implements ElicitationHandler {
271271
}
272272

273273
private serverSupportsPersistentApproval(serverName: string): boolean {
274-
return this.sessionState.configuredMcpServerNames?.has(serverName) === true;
274+
return this.sessionState.mcpServerNamesFromConfig?.has(serverName) === true;
275275
}
276276

277277
private handleItemStarted(event: ItemStartedNotification): void {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ describe('Elicitation Events', () => {
133133
describe('MCP tool call approval elicitation', () => {
134134
it('should show Allow/session/always/Cancel options when all persist values advertised', async () => {
135135
const { promptPromise, completeTurn } = setupSessionWithPendingPrompt({
136-
configuredMcpServerNames: new Set(['tool-server']),
136+
mcpServerNamesFromConfig: new Set(['tool-server']),
137137
});
138138
fixture.setPermissionResponse({ outcome: { outcome: 'selected', optionId: 'allow_once' } });
139139

@@ -154,7 +154,7 @@ describe('Elicitation Events', () => {
154154

155155
it('should include CLI-style descriptions for MCP tool approval options', async () => {
156156
const { promptPromise, completeTurn } = setupSessionWithPendingPrompt({
157-
configuredMcpServerNames: new Set(['tool-server']),
157+
mcpServerNamesFromConfig: new Set(['tool-server']),
158158
});
159159
fixture.setPermissionResponse({ outcome: { outcome: 'selected', optionId: 'allow_once' } });
160160

@@ -264,7 +264,7 @@ describe('Elicitation Events', () => {
264264

265265
it('should map persistent approval to accept with persist:always meta', async () => {
266266
const { promptPromise, completeTurn } = setupSessionWithPendingPrompt({
267-
configuredMcpServerNames: new Set(['tool-server']),
267+
mcpServerNamesFromConfig: new Set(['tool-server']),
268268
});
269269
fixture.setPermissionResponse({ outcome: { outcome: 'selected', optionId: 'allow_persist' } });
270270

0 commit comments

Comments
 (0)