Skip to content

AI: Restore neutral tool approval rejection message #7913

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
jozkee merged 1 commit into from
Nov 4, 2026
+26 −22
Merged

AI: Restore neutral tool approval rejection message #7913

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
4 changes: 4 additions & 0 deletions src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/ToolApprovalResponseContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,9 @@ public ToolApprovalResponseContent(string requestId, bool approved, ToolCallCont
/// <summary>
/// Gets or sets the optional reason for the approval or rejection.
/// </summary>
/// <remarks>
/// When a function call is rejected by function invocation middleware, this reason is appended to the rejection message.
/// Callers can use the reason to indicate whether the rejection is final or a new call may be requested for approval.
/// </remarks>
public string? Reason { get; set; }
}
2 changes: 1 addition & 1 deletion src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,7 +1552,7 @@ FunctionResultContent CreateFunctionResultContent(FunctionInvocationResult resul
{
LogFunctionRejected(m.ResponseFunctionCallContent.Name, m.Response.Reason);

string result = "Tool call invocation was rejected by the approver and must not be retried.";
string result = "Tool call invocation rejected.";
if (!string.IsNullOrWhiteSpace(m.Response.Reason))
{
result = $"{result} {m.Response.Reason}";
Expand Down
42 changes: 21 additions & 21 deletions .../Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientApprovalsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,8 @@ public async Task RejectedApprovalResponsesAreFailedAsync()
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1"), new FunctionCallContent("callId2", "Func2", arguments: new Dictionary<string, object?> { { "i", 42 } })]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried."),
new FunctionResultContent("callId2", result: "Tool call invocation was rejected by the approver and must not be retried.")
new FunctionResultContent("callId1", result: "Tool call invocation rejected."),
new FunctionResultContent("callId2", result: "Tool call invocation rejected.")
]),
];

Expand All @@ -450,8 +450,8 @@ public async Task RejectedApprovalResponsesAreFailedAsync()
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1"), new FunctionCallContent("callId2", "Func2", arguments: new Dictionary<string, object?> { { "i", 42 } })]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried."),
new FunctionResultContent("callId2", result: "Tool call invocation was rejected by the approver and must not be retried.")
new FunctionResultContent("callId1", result: "Tool call invocation rejected."),
new FunctionResultContent("callId2", result: "Tool call invocation rejected.")
]),
new ChatMessage(ChatRole.Assistant, "world"),
];
Expand Down Expand Up @@ -492,7 +492,7 @@ public async Task MixedApprovedAndRejectedApprovalResponsesAreExecutedAndFailedA
[
new ChatMessage(ChatRole.User, "hello"),
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1"), new FunctionCallContent("callId2", "Func2", arguments: new Dictionary<string, object?> { { "i", 42 } })]),
new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried.")]),
new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId1", result: "Tool call invocation rejected.")]),
new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId2", result: "Result 2: 42")]),
];

Expand All @@ -504,7 +504,7 @@ public async Task MixedApprovedAndRejectedApprovalResponsesAreExecutedAndFailedA
List<ChatMessage> nonStreamingOutput =
[
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1"), new FunctionCallContent("callId2", "Func2", arguments: new Dictionary<string, object?> { { "i", 42 } })]),
new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried.")]),
new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId1", result: "Tool call invocation rejected.")]),
new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId2", result: "Result 2: 42")]),
new ChatMessage(ChatRole.Assistant, "world"),
];
Expand All @@ -514,7 +514,7 @@ public async Task MixedApprovedAndRejectedApprovalResponsesAreExecutedAndFailedA
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1"), new FunctionCallContent("callId2", "Func2", arguments: new Dictionary<string, object?> { { "i", 42 } })]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried."),
new FunctionResultContent("callId1", result: "Tool call invocation rejected."),
new FunctionResultContent("callId2", result: "Result 2: 42")
]),
new ChatMessage(ChatRole.Assistant, "world"),
Expand Down Expand Up @@ -564,8 +564,8 @@ public async Task RejectedApprovalResponsesWithCustomReasonAsync()
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1"), new FunctionCallContent("callId2", "Func2", arguments: new Dictionary<string, object?> { { "i", 42 } })]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried. User denied permission for this operation"),
new FunctionResultContent("callId2", result: "Tool call invocation was rejected by the approver and must not be retried. Function Func2 is not allowed at this time")
new FunctionResultContent("callId1", result: "Tool call invocation rejected. User denied permission for this operation"),
new FunctionResultContent("callId2", result: "Tool call invocation rejected. Function Func2 is not allowed at this time")
]),
];

Expand All @@ -579,8 +579,8 @@ public async Task RejectedApprovalResponsesWithCustomReasonAsync()
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1"), new FunctionCallContent("callId2", "Func2", arguments: new Dictionary<string, object?> { { "i", 42 } })]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried. User denied permission for this operation"),
new FunctionResultContent("callId2", result: "Tool call invocation was rejected by the approver and must not be retried. Function Func2 is not allowed at this time")
new FunctionResultContent("callId1", result: "Tool call invocation rejected. User denied permission for this operation"),
new FunctionResultContent("callId2", result: "Tool call invocation rejected. Function Func2 is not allowed at this time")
]),
new ChatMessage(ChatRole.Assistant, "world"),
];
Expand Down Expand Up @@ -631,8 +631,8 @@ public async Task MixedApprovalResponsesWithCustomAndDefaultReasonsAsync()
]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried. Custom rejection for Func1"),
new FunctionResultContent("callId2", result: "Tool call invocation was rejected by the approver and must not be retried.")
new FunctionResultContent("callId1", result: "Tool call invocation rejected. Custom rejection for Func1"),
new FunctionResultContent("callId2", result: "Tool call invocation rejected.")
]),
new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId3", result: "Result 3: test")]),
];
Expand All @@ -652,8 +652,8 @@ public async Task MixedApprovalResponsesWithCustomAndDefaultReasonsAsync()
]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried. Custom rejection for Func1"),
new FunctionResultContent("callId2", result: "Tool call invocation was rejected by the approver and must not be retried.")
new FunctionResultContent("callId1", result: "Tool call invocation rejected. Custom rejection for Func1"),
new FunctionResultContent("callId2", result: "Tool call invocation rejected.")
]),
new ChatMessage(ChatRole.Tool, [new FunctionResultContent("callId3", result: "Result 3: test")]),
new ChatMessage(ChatRole.Assistant, "world"),
Expand All @@ -669,8 +669,8 @@ public async Task MixedApprovalResponsesWithCustomAndDefaultReasonsAsync()
]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried. Custom rejection for Func1"),
new FunctionResultContent("callId2", result: "Tool call invocation was rejected by the approver and must not be retried."),
new FunctionResultContent("callId1", result: "Tool call invocation rejected. Custom rejection for Func1"),
new FunctionResultContent("callId2", result: "Tool call invocation rejected."),
new FunctionResultContent("callId3", result: "Result 3: test")
]),
new ChatMessage(ChatRole.Assistant, "world"),
Expand Down Expand Up @@ -717,7 +717,7 @@ public async Task RejectedApprovalResponsesWithEmptyOrWhitespaceReasonUsesDefaul
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1")]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried.")
new FunctionResultContent("callId1", result: "Tool call invocation rejected.")
]),
];

Expand All @@ -731,7 +731,7 @@ public async Task RejectedApprovalResponsesWithEmptyOrWhitespaceReasonUsesDefaul
new ChatMessage(ChatRole.Assistant, [new FunctionCallContent("callId1", "Func1")]),
new ChatMessage(ChatRole.Tool,
[
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried.")
new FunctionResultContent("callId1", result: "Tool call invocation rejected.")
]),
new ChatMessage(ChatRole.Assistant, "world"),
];
Expand Down Expand Up @@ -1944,7 +1944,7 @@ public async Task RejectedApprovalResponses_MixedWithMcpApprovalAsync(bool useAd
[
approveFuncCall ?
new FunctionResultContent("callId1", result: "Result 1") :
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried.")
new FunctionResultContent("callId1", result: "Tool call invocation rejected.")
]),
new ChatMessage(ChatRole.User,
[
Expand All @@ -1971,7 +1971,7 @@ [new McpServerToolResultContent("callId2") { Outputs = [new TextContent("Result
[
approveFuncCall ?
new FunctionResultContent("callId1", result: "Result 1") :
new FunctionResultContent("callId1", result: "Tool call invocation was rejected by the approver and must not be retried.")
new FunctionResultContent("callId1", result: "Tool call invocation rejected.")
]),
new ChatMessage(ChatRole.Assistant, [
new TextContent("world"),
Expand Down
Loading