Skip to content

fix: acp/zed race condition between MCP initialisation and prompt #20205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scidomino merged 4 commits into from
Feb 28, 2026
Merged

fix: acp/zed race condition between MCP initialisation and prompt #20205

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd9077e
fix: acp/zed race condition
kartikangiras Feb 24, 2026
0157330
assign the mcpintilization to promise
kartikangiras Feb 27, 2026
f3e9942
revert the package-lock.json changes
kartikangiras Feb 28, 2026
8437cc1
Merge branch 'main' into acpzed
kartikangiras Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/a2a-server/src/config/config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
const mockConfig = {
...params,
initialize: vi.fn(),
waitForMcpInit: vi.fn(),
refreshAuth: vi.fn(),
getExperiments: vi.fn().mockReturnValue({
flags: {
Expand Down Expand Up @@ -94,6 +95,7 @@ describe('loadConfig', () => {
const mockConfig = {
...(params as object),
initialize: vi.fn(),
waitForMcpInit: vi.fn(),
refreshAuth: vi.fn(),
getExperiments: vi.fn().mockReturnValue({
flags: {
Expand Down
2 changes: 2 additions & 0 deletions packages/a2a-server/src/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ export async function loadConfig(

// Needed to initialize ToolRegistry, and git checkpointing if enabled
await config.initialize();

await config.waitForMcpInit();
startupProfiler.flush(config);

await refreshAuthentication(config, adcFilePath, 'Config');
Expand Down
24 changes: 24 additions & 0 deletions packages/cli/src/zed-integration/zedIntegration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ describe('GeminiAgent', () => {
mockConfig = {
refreshAuth: vi.fn(),
initialize: vi.fn(),
waitForMcpInit: vi.fn(),
getFileSystemService: vi.fn(),
setFileSystemService: vi.fn(),
getContentGeneratorConfig: vi.fn(),
Expand Down Expand Up @@ -458,6 +459,7 @@ describe('Session', () => {
getMessageBus: vi.fn().mockReturnValue(mockMessageBus),
setApprovalMode: vi.fn(),
isPlanEnabled: vi.fn().mockReturnValue(false),
waitForMcpInit: vi.fn(),
} as unknown as Mocked<Config>;
mockConnection = {
sessionUpdate: vi.fn(),
Expand All @@ -472,6 +474,28 @@ describe('Session', () => {
vi.clearAllMocks();
});

it('should await MCP initialization before processing a prompt', async () => {
const stream = createMockStream([
{
type: StreamEventType.CHUNK,
value: { candidates: [{ content: { parts: [{ text: 'Hi' }] } }] },
},
]);
mockChat.sendMessageStream.mockResolvedValue(stream);

await session.prompt({
sessionId: 'session-1',
prompt: [{ type: 'text', text: 'test' }],
});

expect(mockConfig.waitForMcpInit).toHaveBeenCalledOnce();
const waitOrder = (mockConfig.waitForMcpInit as Mock).mock
.invocationCallOrder[0];
const sendOrder = (mockChat.sendMessageStream as Mock).mock
.invocationCallOrder[0];
expect(waitOrder).toBeLessThan(sendOrder);
});

it('should handle prompt with text response', async () => {
const stream = createMockStream([
{
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/zed-integration/zedIntegration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@ export class Session {
const pendingSend = new AbortController();
this.pendingPrompt = pendingSend;

await this.config.waitForMcpInit();

const promptId = Math.random().toString(16).slice(2);
const chat = this.chat;

Expand Down
9 changes: 9 additions & 0 deletions packages/core/src/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,7 @@ export class Config {
private compressionTruncationCounter = 0;
private initialized = false;
private initPromise: Promise<void> | undefined;
private mcpInitializationPromise: Promise<void> | null = null;
readonly storage: Storage;
private readonly fileExclusions: FileExclusions;
private readonly eventEmitter?: EventEmitter;
Expand Down Expand Up @@ -1050,6 +1051,8 @@ export class Config {
}
});

this.mcpInitializationPromise = mcpInitialization;
Copy link
Copy Markdown
Collaborator

@scidomino scidomino Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the mcpInitialization variable and just immediately assign it to this.mcpInitializationPromise

Copy link
Copy Markdown
Contributor Author

@kartikangiras kartikangiras Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have assigned it to the this.mcpInitializationPromise


if (!this.interactive || this.experimentalZedIntegration) {
await mcpInitialization;
}
Expand Down Expand Up @@ -2080,6 +2083,12 @@ export class Config {
return this.experimentalZedIntegration;
}

async waitForMcpInit(): Promise<void> {
if (this.mcpInitializationPromise) {
await this.mcpInitializationPromise;
}
}

getListExtensions(): boolean {
return this.listExtensions;
}
Expand Down