Skip to content

Commit 7634356

Browse files
authored
.NET: Fix Foundry MCP approval replay IDs (#8873)
* Fix Foundry MCP approval replay IDs * Fail closed on stale MCP approval mapping * fix: do not fallback on request id * tests: updates outdated definitions
1 parent 853c456 commit 7634356

2 files changed

Lines changed: 161 additions & 16 deletions

File tree

‎dotnet/src/Microsoft.Agents.AI.Foundry.Hosting/InputConverter.cs‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ static CreateResponseOptions LocalDisableStoredOutput(CreateResponseOptions resp
229229
ItemMessage msg => ConvertItemMessage(msg),
230230
FunctionCallOutputItemParam funcOutput => ConvertFunctionCallOutput(funcOutput),
231231
ItemFunctionToolCall funcCall => ConvertItemFunctionToolCall(funcCall),
232-
ItemMcpApprovalRequest approvalRequest => ConvertMcpApprovalRequest(approvalRequest.Id, approvalRequest.Name, approvalRequest.Arguments),
232+
ItemMcpApprovalRequest approvalRequest => ConvertMcpApprovalRequest(approvalRequest.Id, approvalRequest.Name, approvalRequest.Arguments, stateBag),
233233
MCPApprovalResponse approvalResponse => ConvertMcpApprovalResponse(approvalResponse.ApprovalRequestId, approvalResponse.Approve, stateBag),
234234
ItemReferenceParam => null,
235235
_ => null
@@ -312,12 +312,22 @@ private static ChatMessage ConvertItemFunctionToolCall(ItemFunctionToolCall func
312312
/// or fresh-input) to a <see cref="ToolApprovalRequestContent"/> wrapping a
313313
/// <see cref="FunctionCallContent"/>.
314314
/// </summary>
315-
private static ChatMessage ConvertMcpApprovalRequest(string id, string name, string? arguments)
315+
private static ChatMessage ConvertMcpApprovalRequest(string id, string name, string? arguments, AgentSessionStateBag? stateBag)
316316
{
317-
var functionCall = new FunctionCallContent(id, name, ParseFunctionArgumentsObject(arguments));
317+
var entry = ToolApprovalIdMap.ResolveEntry(stateBag, id);
318+
if (entry is not { AfRequestId: string requestId } || entry.Name != name || entry.Arguments != arguments)
319+
{
320+
throw new InvalidOperationException(
321+
$"Approval mapping for wire id '{id}' does not match the replayed approval request.");
322+
}
323+
324+
var functionCall = new FunctionCallContent(
325+
entry.CallId,
326+
entry.Name,
327+
ParseFunctionArgumentsObject(arguments));
318328
return new ChatMessage(
319329
ChatRole.Assistant,
320-
[new ToolApprovalRequestContent(id, functionCall)]);
330+
[new ToolApprovalRequestContent(requestId, functionCall)]);
321331
}
322332

323333
/// <summary>
@@ -372,7 +382,7 @@ private static ChatMessage ConvertMcpApprovalResponse(string approvalRequestId,
372382
OutputItemMessage msg => ConvertOutputItemMessageToChat(msg),
373383
OutputItemFunctionToolCall funcCall => ConvertOutputItemFunctionCall(funcCall),
374384
OutputItemFunctionToolCallOutput funcOutput => ConvertFunctionToolCallOutput(funcOutput),
375-
OutputItemMcpApprovalRequest approvalRequest => ConvertMcpApprovalRequest(approvalRequest.Id, approvalRequest.Name, approvalRequest.Arguments),
385+
OutputItemMcpApprovalRequest approvalRequest => ConvertMcpApprovalRequest(approvalRequest.Id, approvalRequest.Name, approvalRequest.Arguments, stateBag),
376386
OutputItemMcpApprovalResponseResource approvalResponse => ConvertMcpApprovalResponse(approvalResponse.ApprovalRequestId, approvalResponse.Approve, stateBag),
377387
OutputItemReasoningItem => null,
378388
_ => null

‎dotnet/tests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests/InputConverterTests.cs‎

Lines changed: 146 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -810,17 +810,31 @@ public void ReadMcpToolboxMarkers_MixedTools_ReturnsOnlyToolboxMarkers()
810810
[Fact]
811811
public void ConvertItemsToMessages_McpApprovalRequest_ProducesToolApprovalRequest()
812812
{
813+
// Arrange
814+
const string AfRequestId = "ficc_call_weather";
815+
var wireId = ToolApprovalIdMap.ComputeWireId(AfRequestId);
816+
var stateBag = new AgentSessionStateBag();
817+
ToolApprovalIdMap.Record(
818+
stateBag,
819+
wireId,
820+
AfRequestId,
821+
"call_weather",
822+
"get_weather",
823+
"{\"city\":\"Seattle\"}");
813824
var item = new ItemMcpApprovalRequest(
814-
id: "mcpr_" + new string('a', 50),
825+
id: wireId,
815826
serverLabel: "agent_framework",
816827
name: "get_weather",
817828
arguments: "{\"city\":\"Seattle\"}");
818829

819-
var messages = InputConverter.ConvertItemsToMessages([item]);
830+
// Act
831+
var messages = InputConverter.ConvertItemsToMessages([item], stateBag);
820832

833+
// Assert
821834
var content = Assert.IsType<ToolApprovalRequestContent>(Assert.Single(messages[0].Contents));
822-
Assert.Equal(item.Id, content.RequestId);
835+
Assert.Equal(AfRequestId, content.RequestId);
823836
var fc = Assert.IsType<FunctionCallContent>(content.ToolCall);
837+
Assert.Equal("call_weather", fc.CallId);
824838
Assert.Equal("get_weather", fc.Name);
825839
Assert.NotNull(fc.Arguments);
826840
Assert.Equal("Seattle", fc.Arguments!["city"]?.ToString());
@@ -878,17 +892,122 @@ public void ConvertItemsToMessages_McpApprovalResponse_ResolvesAfRequestIdFromSt
878892
[Fact]
879893
public void ConvertOutputItemsToMessages_McpApprovalRequest_ProducesToolApprovalRequest()
880894
{
895+
// Arrange
896+
const string AfRequestId = "ficc_call_delete";
897+
var wireId = ToolApprovalIdMap.ComputeWireId(AfRequestId);
898+
var stateBag = new AgentSessionStateBag();
899+
ToolApprovalIdMap.Record(
900+
stateBag,
901+
wireId,
902+
AfRequestId,
903+
"call_delete",
904+
"delete_file",
905+
"{}");
881906
var item = new OutputItemMcpApprovalRequest(
882-
id: "mcpr_" + new string('b', 50),
907+
id: wireId,
883908
serverLabel: "agent_framework",
884909
name: "delete_file",
885910
arguments: "{}");
886911

887-
var messages = InputConverter.ConvertOutputItemsToMessages([item]);
912+
// Act
913+
var messages = InputConverter.ConvertOutputItemsToMessages([item], stateBag);
888914

915+
// Assert
889916
var content = Assert.IsType<ToolApprovalRequestContent>(Assert.Single(messages[0].Contents));
890-
Assert.Equal(item.Id, content.RequestId);
891-
Assert.Equal("delete_file", Assert.IsType<FunctionCallContent>(content.ToolCall).Name);
917+
Assert.Equal(AfRequestId, content.RequestId);
918+
var functionCall = Assert.IsType<FunctionCallContent>(content.ToolCall);
919+
Assert.Equal("call_delete", functionCall.CallId);
920+
Assert.Equal("delete_file", functionCall.Name);
921+
}
922+
923+
[Fact]
924+
public void ConvertOutputItemsToMessages_McpApprovalRequest_ResolvesAfRequestFromStateBag()
925+
{
926+
const string AfRequestId = "ficc_call_history";
927+
var wireId = ToolApprovalIdMap.ComputeWireId(AfRequestId);
928+
var stateBag = new AgentSessionStateBag();
929+
ToolApprovalIdMap.Record(
930+
stateBag,
931+
wireId,
932+
AfRequestId,
933+
"call_history",
934+
"delete_file",
935+
"{\"path\":\"/tmp/x\"}");
936+
937+
var item = new OutputItemMcpApprovalRequest(
938+
id: wireId,
939+
serverLabel: "agent_framework",
940+
name: "delete_file",
941+
arguments: "{\"path\":\"/tmp/x\"}");
942+
943+
var messages = InputConverter.ConvertOutputItemsToMessages([item], stateBag);
944+
945+
var content = Assert.IsType<ToolApprovalRequestContent>(Assert.Single(messages[0].Contents));
946+
Assert.Equal(AfRequestId, content.RequestId);
947+
948+
var fcc = Assert.IsType<FunctionCallContent>(content.ToolCall);
949+
Assert.Equal("call_history", fcc.CallId);
950+
Assert.Equal("delete_file", fcc.Name);
951+
Assert.NotNull(fcc.Arguments);
952+
Assert.Equal("/tmp/x", ((System.Text.Json.JsonElement)fcc.Arguments!["path"]!).GetString());
953+
}
954+
955+
[Fact]
956+
public void ConvertOutputItemsToMessages_McpApprovalRequest_ThrowsWhenMappedMetadataDisagrees()
957+
{
958+
const string AfRequestId = "ficc_reused_call";
959+
var wireId = ToolApprovalIdMap.ComputeWireId(AfRequestId);
960+
var stateBag = new AgentSessionStateBag();
961+
ToolApprovalIdMap.Record(
962+
stateBag,
963+
wireId,
964+
AfRequestId,
965+
"reused_call",
966+
"new_tool",
967+
"{\"value\":2}");
968+
969+
var replayedItem = new OutputItemMcpApprovalRequest(
970+
id: wireId,
971+
serverLabel: "agent_framework",
972+
name: "old_tool",
973+
arguments: "{\"value\":1}");
974+
975+
var ex = Assert.Throws<InvalidOperationException>(() => InputConverter.ConvertOutputItemsToMessages([replayedItem], stateBag));
976+
Assert.Contains(wireId, ex.Message);
977+
Assert.Contains("does not match", ex.Message);
978+
}
979+
980+
[Fact]
981+
public void ConvertOutputAndInputItems_McpApprovalRoundTrip_UsesSameAfRequestId()
982+
{
983+
const string AfRequestId = "ficc_call_roundtrip";
984+
var wireId = ToolApprovalIdMap.ComputeWireId(AfRequestId);
985+
var stateBag = new AgentSessionStateBag();
986+
ToolApprovalIdMap.Record(
987+
stateBag,
988+
wireId,
989+
AfRequestId,
990+
"call_roundtrip",
991+
"get_monster",
992+
"{\"slug\":\"goblin\"}");
993+
994+
var historyItem = new OutputItemMcpApprovalRequest(
995+
id: wireId,
996+
serverLabel: "agent_framework",
997+
name: "get_monster",
998+
arguments: "{\"slug\":\"goblin\"}");
999+
var approvalResponse = new MCPApprovalResponse(approvalRequestId: wireId, approve: true);
1000+
1001+
var historyMessages = InputConverter.ConvertOutputItemsToMessages([historyItem], stateBag);
1002+
var inputMessages = InputConverter.ConvertItemsToMessages([approvalResponse], stateBag);
1003+
1004+
var request = Assert.IsType<ToolApprovalRequestContent>(Assert.Single(historyMessages[0].Contents));
1005+
var response = Assert.IsType<ToolApprovalResponseContent>(Assert.Single(inputMessages[0].Contents));
1006+
Assert.Equal(request.RequestId, response.RequestId);
1007+
Assert.Equal(AfRequestId, request.RequestId);
1008+
1009+
Assert.Equal("call_roundtrip", Assert.IsType<FunctionCallContent>(request.ToolCall).CallId);
1010+
Assert.Equal("call_roundtrip", Assert.IsType<FunctionCallContent>(response.ToolCall).CallId);
8921011
}
8931012

8941013
[Fact]
@@ -924,18 +1043,34 @@ public void ConvertOutputItemsToMessages_McpApprovalResponse_ProducesToolApprova
9241043
[Fact]
9251044
public void ConvertItemsToMessages_McpApprovalRequest_MalformedArguments_PreservesRaw()
9261045
{
1046+
// Arrange
1047+
const string AfRequestId = "ficc_call_noisy";
1048+
const string Arguments = "not valid json";
1049+
var wireId = ToolApprovalIdMap.ComputeWireId(AfRequestId);
1050+
var stateBag = new AgentSessionStateBag();
1051+
ToolApprovalIdMap.Record(
1052+
stateBag,
1053+
wireId,
1054+
AfRequestId,
1055+
"call_noisy",
1056+
"noisy",
1057+
Arguments);
9271058
var item = new ItemMcpApprovalRequest(
928-
id: "mcpr_" + new string('c', 50),
1059+
id: wireId,
9291060
serverLabel: "agent_framework",
9301061
name: "noisy",
931-
arguments: "not valid json");
1062+
arguments: Arguments);
9321063

933-
var messages = InputConverter.ConvertItemsToMessages([item]);
1064+
// Act
1065+
var messages = InputConverter.ConvertItemsToMessages([item], stateBag);
9341066

1067+
// Assert
9351068
var content = Assert.IsType<ToolApprovalRequestContent>(Assert.Single(messages[0].Contents));
1069+
Assert.Equal(AfRequestId, content.RequestId);
9361070
var fc = Assert.IsType<FunctionCallContent>(content.ToolCall);
1071+
Assert.Equal("call_noisy", fc.CallId);
9371072
Assert.NotNull(fc.Arguments);
938-
Assert.Equal("not valid json", fc.Arguments!["_raw"]?.ToString());
1073+
Assert.Equal(Arguments, fc.Arguments!["_raw"]?.ToString());
9391074
}
9401075

9411076
[Fact]

0 commit comments

Comments
 (0)