The open-source agent harness - the runtime layer that turns an LLM into a working agent.
[trueforge-ui] show mcp server tool name on tool approval (#398)
Shubham Kumar Singhd7015fd69973
diff --git a/.changeset/plenty-books-itch.md b/.changeset/plenty-books-itch.mdnew file mode 100644index 000000000..1880da8fc--- /dev/null+++ b/.changeset/plenty-books-itch.md@@ -0,0 +1,6 @@+---+"@truefoundry/trueforge-ui": patch+---++show mcp server tool name on tool approval+\ No newline at end of filediff --git a/packages/trueforge-ui/src/containers/ToolApprovalContainer.tsx b/packages/trueforge-ui/src/containers/ToolApprovalContainer.tsxindex ff698477e..51f1e554a 100644--- a/packages/trueforge-ui/src/containers/ToolApprovalContainer.tsx+++ b/packages/trueforge-ui/src/containers/ToolApprovalContainer.tsx@@ -4,6 +4,7 @@ import { useCallback, useMemo, useState } from 'react';import type { ApprovalOption } from '../atoms/ToolApprovalBar.js';+import { parseMcpToolArgs } from '@/utils/toolCallParsing.js';import { useSlot } from '../theme/SlotsProvider.js';export type ToolApprovalOption = {@@ -19,12 +20,20 @@ export type ToolApprovalOption = {type ToolApprovalContainerProps = {toolName?: string;+ argsText?: string;options: ToolApprovalOption[];onSelectOption: (optionId: string, reason?: string) => void;};-export function ToolApprovalContainer({ toolName = '', options, onSelectOption }: ToolApprovalContainerProps) {+export function ToolApprovalContainer({+ toolName = '',+ argsText,+ options,+ onSelectOption,+}: ToolApprovalContainerProps) {const ToolApprovalBar = useSlot('ToolApprovalBar');+ const { mcpServer, innerToolName } = parseMcpToolArgs(argsText);+ const displayToolName = innerToolName && mcpServer ? `${innerToolName} (${mcpServer})` : toolName;const [selectedDenyOptionId, setSelectedDenyOptionId] = useState<string | null>(null);const [denialReason, setDenialReason] = useState('');const [showReasonError, setShowReasonError] = useState(false);@@ -75,7 +84,7 @@ export function ToolApprovalContainer({ toolName = '', options, onSelectOption }return (<ToolApprovalBar- toolName={toolName}+ toolName={displayToolName}approveOptions={approveOptions.length > 0 ? approveOptions : undefined}denyOptions={denyOptions.length > 0 ? denyOptions : undefined}selectedDenyOption={selectedDenyOption}diff --git a/packages/trueforge-ui/src/containers/ToolCallContainer.tsx b/packages/trueforge-ui/src/containers/ToolCallContainer.tsxindex 2fbf21da3..6ee8660d7 100644--- a/packages/trueforge-ui/src/containers/ToolCallContainer.tsx+++ b/packages/trueforge-ui/src/containers/ToolCallContainer.tsx@@ -100,6 +100,7 @@ function ToolApprovalSlot({ part }: { part: ToolCallMessagePartProps }) {return (<ToolApprovalContainertoolName={part.toolName}+ argsText={part.argsText}options={buildApprovalOptions(part.approval?.options) as import('./ToolApprovalContainer.js').ToolApprovalOption[]}diff --git a/packages/trueforge-ui/test/containers/ToolApprovalContainer.test.tsx b/packages/trueforge-ui/test/containers/ToolApprovalContainer.test.tsxindex b058221e8..339e08439 100644--- a/packages/trueforge-ui/test/containers/ToolApprovalContainer.test.tsx+++ b/packages/trueforge-ui/test/containers/ToolApprovalContainer.test.tsx@@ -82,10 +82,18 @@ const options: ToolApprovalOption[] = [},];-function renderSubject(onSelectOption: (optionId: string, reason?: string) => void) {+function renderSubject(+ onSelectOption: (optionId: string, reason?: string) => void,+ props: { toolName?: string; argsText?: string } = { toolName: 'shell' },+) {return render(<SlotsProvider overrides={{ ToolApprovalBar: ToolApprovalBarProbe }}>- <ToolApprovalContainer toolName="shell" options={options} onSelectOption={onSelectOption} />+ <ToolApprovalContainer+ toolName={props.toolName}+ argsText={props.argsText}+ options={options}+ onSelectOption={onSelectOption}+ /></SlotsProvider>,);}@@ -106,6 +114,26 @@ describe('ToolApprovalContainer', () => {expect(onSelectOption).toHaveBeenNthCalledWith(2, 'reject-now');});+ it('shows MCP inner tool name with server when args include both fields', () => {+ const onSelectOption = vi.fn();+ renderSubject(onSelectOption, {+ toolName: 'call_tool',+ argsText: JSON.stringify({ mcp_server: 'github', tool_name: 'search' }),+ });++ expect(screen.getByTestId('approval-probe')).toHaveAttribute('data-tool-name', 'search (github)');+ });++ it('falls back to toolName when MCP fields are missing', () => {+ const onSelectOption = vi.fn();+ renderSubject(onSelectOption, {+ toolName: 'shell',+ argsText: JSON.stringify({ command: 'ls' }),+ });++ expect(screen.getByTestId('approval-probe')).toHaveAttribute('data-tool-name', 'shell');+ });+it('requires, trims, and submits a denial reason with confirmation metadata', () => {const onSelectOption = vi.fn();renderSubject(onSelectOption);