Skip to content

feat(acp/core): prefix tool call IDs with tool names to support tool rendering in ACP compliant IDEs. #26676

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
sripasg merged 1 commit into from
May 8, 2026
+186 −11
Merged

feat(acp/core): prefix tool call IDs with tool names to support tool rendering in ACP compliant IDEs. #26676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
124 changes: 124 additions & 0 deletions packages/core/src/core/geminiChat.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
StreamEventType,
SYNTHETIC_THOUGHT_SIGNATURE,
type StreamEvent,
stripToolCallIdPrefixes,
} from './geminiChat.js';
import {
type CompletedToolCall,
Expand Down Expand Up @@ -2969,4 +2970,127 @@ describe('GeminiChat', () => {
expect(curatedHistory[1].parts![0].fileData).toBeDefined();
});
});

describe('stripToolCallIdPrefixes', () => {
it('should strip tool name prefix matching the tool name', () => {
const contents: Content[] = [
{
role: 'model',
parts: [
{
functionCall: {
id: 'my_tool__call_123',
name: 'my_tool',
args: {},
},
},
],
},
{
role: 'user',
parts: [
{
functionResponse: {
id: 'my_tool__call_123',
name: 'my_tool',
response: { result: 'success' },
},
},
],
},
];

const stripped = stripToolCallIdPrefixes(contents);
expect(stripped[0].parts![0].functionCall!.id).toBe('call_123');
expect(stripped[1].parts![0].functionResponse!.id).toBe('call_123');
});

it('should correctly handle tool names that contain double underscores', () => {
const contents: Content[] = [
{
role: 'model',
parts: [
{
functionCall: {
id: 'my__custom__tool__call_abc',
name: 'my__custom__tool',
args: {},
},
},
],
},
{
role: 'user',
parts: [
{
functionResponse: {
id: 'my__custom__tool__call_abc',
name: 'my__custom__tool',
response: { result: 'success' },
},
},
],
},
];

const stripped = stripToolCallIdPrefixes(contents);
expect(stripped[0].parts![0].functionCall!.id).toBe('call_abc');
expect(stripped[1].parts![0].functionResponse!.id).toBe('call_abc');
});

it('should not strip if prefix does not match the tool name', () => {
const contents: Content[] = [
{
role: 'model',
parts: [
{
functionCall: {
id: 'other_tool__call_123',
name: 'my_tool',
args: {},
},
},
],
},
];

const stripped = stripToolCallIdPrefixes(contents);
expect(stripped[0].parts![0].functionCall!.id).toBe(
'other_tool__call_123',
);
});

it('should correctly handle fallback to generic_tool when name is missing or has whitespace', () => {
const contents: Content[] = [
{
role: 'model',
parts: [
{
functionCall: {
id: 'generic_tool__call_123',
name: ' ',
args: {},
},
},
],
},
{
role: 'user',
parts: [
{
functionResponse: {
id: 'generic_tool__call_123',
name: undefined as unknown as string,
response: { result: 'success' },
},
},
],
},
];

const stripped = stripToolCallIdPrefixes(contents);
expect(stripped[0].parts![0].functionCall!.id).toBe('call_123');
expect(stripped[1].parts![0].functionResponse!.id).toBe('call_123');
});
});
});
46 changes: 45 additions & 1 deletion packages/core/src/core/geminiChat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,10 +746,12 @@ export class GeminiChat {
lastConfig = config;
lastContentsToUse = contentsToUse;

const finalContents = stripToolCallIdPrefixes(contentsToUse);

return this.context.config.getContentGenerator().generateContentStream(
{
model: modelToUse,
contents: contentsToUse,
contents: finalContents,
config,
},
prompt_id,
Expand Down Expand Up @@ -1016,10 +1018,20 @@ export class GeminiChat {
}
fnCall.id = id;
}
const name = fnCall.name?.trim() || 'generic_tool';
if (fnCall.id && !fnCall.id.startsWith(`${name}__`)) {
fnCall.id = `${name}__${fnCall.id}`;
}
finalFunctionCallsMap.set(fnCall.id, fnCall);
}
runningFunctionCallCounter += chunk.functionCalls.length;
} else {
for (const fnCall of chunk.functionCalls) {
const name = fnCall.name?.trim() || 'generic_tool';
if (fnCall.id && !fnCall.id.startsWith(`${name}__`)) {
fnCall.id = `${name}__${fnCall.id}`;
}
}
legacyFunctionCalls.push(...chunk.functionCalls);
}
}
Expand Down Expand Up @@ -1288,3 +1300,35 @@ export function isSchemaDepthError(errorMessage: string): boolean {
export function isInvalidArgumentError(errorMessage: string): boolean {
return errorMessage.includes('Request contains an invalid argument');
}

export function stripToolCallIdPrefixes(contents: Content[]): Content[] {
return contents.map((content) => ({
...content,
parts: (content.parts || []).map((part) => {
const newPart = { ...part };
if (newPart.functionCall) {
const fc = newPart.functionCall;
const name = fc.name?.trim() || 'generic_tool';
if (fc.id && fc.id.startsWith(`${name}__`)) {
newPart.functionCall = {
name: fc.name,
args: fc.args,
id: fc.id.substring(name.length + 2),
};
}
}
if (newPart.functionResponse) {
const fr = newPart.functionResponse;
const name = fr.name?.trim() || 'generic_tool';
if (fr.id && fr.id.startsWith(`${name}__`)) {
newPart.functionResponse = {
name: fr.name,
response: fr.response,
id: fr.id.substring(name.length + 2),
};
}
}
return newPart;
}),
}));
}
16 changes: 8 additions & 8 deletions packages/core/src/core/turn.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ describe('Turn', () => {
expect(event1.type).toBe(GeminiEventType.ToolCallRequest);
expect(event1.value).toEqual(
expect.objectContaining({
callId: 'fc1',
callId: 'tool1__fc1',
name: 'tool1',
args: { arg1: 'val1' },
isClientInitiated: false,
Expand All @@ -190,7 +190,7 @@ describe('Turn', () => {
}),
);
expect(event2.value.callId).toEqual(
expect.stringMatching(/^tool2_\d{13}_\d+$/),
expect.stringMatching(/^tool2__tool2_\d{13}_\d+$/),
);
expect(turn.pendingToolCalls[1]).toEqual(event2.value);
expect(turn.getDebugResponses().length).toBe(1);
Expand Down Expand Up @@ -326,22 +326,22 @@ describe('Turn', () => {
// Assertions for each specific tool call event
const event1 = events[0] as ServerGeminiToolCallRequestEvent;
expect(event1.value).toMatchObject({
callId: 'fc1',
name: 'undefined_tool_name',
callId: 'generic_tool__fc1',
name: 'generic_tool',
args: { arg1: 'val1' },
});

const event2 = events[1] as ServerGeminiToolCallRequestEvent;
expect(event2.value).toMatchObject({
callId: 'fc2',
callId: 'tool2__fc2',
name: 'tool2',
args: {},
});

const event3 = events[2] as ServerGeminiToolCallRequestEvent;
expect(event3.value).toMatchObject({
callId: 'fc3',
name: 'undefined_tool_name',
callId: 'generic_tool__fc3',
name: 'generic_tool',
args: {},
});
});
Expand Down Expand Up @@ -858,7 +858,7 @@ describe('Turn', () => {
expect(toolCallEvent).toMatchObject({
type: GeminiEventType.ToolCallRequest,
value: expect.objectContaining({
callId: 'fc1',
callId: 'ReadFile__fc1',
name: 'ReadFile',
args: { path: 'file.txt' },
}),
Expand Down
11 changes: 9 additions & 2 deletions packages/core/src/core/turn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,15 +408,22 @@ export class Turn {
fnCall: FunctionCall,
traceId?: string,
): ServerGeminiStreamEvent | null {
const name = fnCall.name || 'undefined_tool_name';
const name = fnCall.name?.trim() || 'generic_tool';
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
const args = (fnCall.args as Record<string, unknown>) || {};
const callId =
const rawCallId =
fnCall.id ??
(this.chat.context.config.isContextManagementEnabled()
? `synth_${this.prompt_id}_${Date.now()}_${this.callCounter++}`
: `${name}_${Date.now()}_${this.callCounter++}`);

const callId = rawCallId.startsWith(`${name}__`)
? rawCallId
: `${name}__${rawCallId}`;

// Mutate the function call object ID so that history consolidation inherits it
fnCall.id = callId;

const tool = this.chat.loopContext.toolRegistry.getTool(name);
let display;
if (tool) {
Expand Down
Loading