Skip to content

Commit d7015fd

Browse files
authored
[trueforge-ui] show mcp server tool name on tool approval (#398)
1 parent aa4be44 commit d7015fd

4 files changed

Lines changed: 48 additions & 4 deletions

File tree

‎.changeset/plenty-books-itch.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@truefoundry/trueforge-ui": patch
3+
---
4+
5+
show mcp server tool name on tool approval
6+

‎packages/trueforge-ui/src/containers/ToolApprovalContainer.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { useCallback, useMemo, useState } from 'react';
44

55
import type { ApprovalOption } from '../atoms/ToolApprovalBar.js';
66

7+
import { parseMcpToolArgs } from '@/utils/toolCallParsing.js';
78
import { useSlot } from '../theme/SlotsProvider.js';
89

910
export type ToolApprovalOption = {
@@ -19,12 +20,20 @@ export type ToolApprovalOption = {
1920

2021
type ToolApprovalContainerProps = {
2122
toolName?: string;
23+
argsText?: string;
2224
options: ToolApprovalOption[];
2325
onSelectOption: (optionId: string, reason?: string) => void;
2426
};
2527

26-
export function ToolApprovalContainer({ toolName = '', options, onSelectOption }: ToolApprovalContainerProps) {
28+
export function ToolApprovalContainer({
29+
toolName = '',
30+
argsText,
31+
options,
32+
onSelectOption,
33+
}: ToolApprovalContainerProps) {
2734
const ToolApprovalBar = useSlot('ToolApprovalBar');
35+
const { mcpServer, innerToolName } = parseMcpToolArgs(argsText);
36+
const displayToolName = innerToolName && mcpServer ? `${innerToolName} (${mcpServer})` : toolName;
2837
const [selectedDenyOptionId, setSelectedDenyOptionId] = useState<string | null>(null);
2938
const [denialReason, setDenialReason] = useState('');
3039
const [showReasonError, setShowReasonError] = useState(false);
@@ -75,7 +84,7 @@ export function ToolApprovalContainer({ toolName = '', options, onSelectOption }
7584

7685
return (
7786
<ToolApprovalBar
78-
toolName={toolName}
87+
toolName={displayToolName}
7988
approveOptions={approveOptions.length > 0 ? approveOptions : undefined}
8089
denyOptions={denyOptions.length > 0 ? denyOptions : undefined}
8190
selectedDenyOption={selectedDenyOption}

‎packages/trueforge-ui/src/containers/ToolCallContainer.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ function ToolApprovalSlot({ part }: { part: ToolCallMessagePartProps }) {
100100
return (
101101
<ToolApprovalContainer
102102
toolName={part.toolName}
103+
argsText={part.argsText}
103104
options={
104105
buildApprovalOptions(part.approval?.options) as import('./ToolApprovalContainer.js').ToolApprovalOption[]
105106
}

‎packages/trueforge-ui/test/containers/ToolApprovalContainer.test.tsx‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,18 @@ const options: ToolApprovalOption[] = [
8282
},
8383
];
8484

85-
function renderSubject(onSelectOption: (optionId: string, reason?: string) => void) {
85+
function renderSubject(
86+
onSelectOption: (optionId: string, reason?: string) => void,
87+
props: { toolName?: string; argsText?: string } = { toolName: 'shell' },
88+
) {
8689
return render(
8790
<SlotsProvider overrides={{ ToolApprovalBar: ToolApprovalBarProbe }}>
88-
<ToolApprovalContainer toolName="shell" options={options} onSelectOption={onSelectOption} />
91+
<ToolApprovalContainer
92+
toolName={props.toolName}
93+
argsText={props.argsText}
94+
options={options}
95+
onSelectOption={onSelectOption}
96+
/>
8997
</SlotsProvider>,
9098
);
9199
}
@@ -106,6 +114,26 @@ describe('ToolApprovalContainer', () => {
106114
expect(onSelectOption).toHaveBeenNthCalledWith(2, 'reject-now');
107115
});
108116

117+
it('shows MCP inner tool name with server when args include both fields', () => {
118+
const onSelectOption = vi.fn();
119+
renderSubject(onSelectOption, {
120+
toolName: 'call_tool',
121+
argsText: JSON.stringify({ mcp_server: 'github', tool_name: 'search' }),
122+
});
123+
124+
expect(screen.getByTestId('approval-probe')).toHaveAttribute('data-tool-name', 'search (github)');
125+
});
126+
127+
it('falls back to toolName when MCP fields are missing', () => {
128+
const onSelectOption = vi.fn();
129+
renderSubject(onSelectOption, {
130+
toolName: 'shell',
131+
argsText: JSON.stringify({ command: 'ls' }),
132+
});
133+
134+
expect(screen.getByTestId('approval-probe')).toHaveAttribute('data-tool-name', 'shell');
135+
});
136+
109137
it('requires, trims, and submits a denial reason with confirmation metadata', () => {
110138
const onSelectOption = vi.fn();
111139
renderSubject(onSelectOption);

0 commit comments

Comments
 (0)