Skip to content

.NET: Isolate Foundry toolbox response cache #8848

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

Draft
Roger Barreto (rogerbarreto) wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

.NET: Isolate Foundry toolbox response cache #8848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a877c87
fix(foundry): isolate toolbox response cache
rogerbarreto Sep 29, 2026
6145aee
fix(foundry): harden toolbox scope lifecycle
rogerbarreto Sep 29, 2026
9df5264
Merge remote-tracking branch 'origin/main' into i816r542-toolbox-cach…
rogerbarreto Sep 29, 2026
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
8 changes: 7 additions & 1 deletion dotnet/src/Microsoft.Agents.AI.Foundry.Hosting/AgentFrameworkResponseHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,11 @@ public override async IAsyncEnumerable<ResponseStreamEvent> CreateAsync(
// point below: AsyncLocal writes made in this streaming iterator are reverted across yield
// boundaries, so a single up-front assignment would be lost before the toolbox/MCP calls run.
var platformCallId = context.PlatformContext?.CallId;
var toolboxRequestScope = this._toolboxService?.CreateRequestScope()
?? FoundryToolboxService.RequestToolboxScope.CreateInactive();
await using var configuredToolboxRequestScope = toolboxRequestScope.ConfigureAwait(false);
HostedCallContext.CallId = platformCallId;
HostedCallContext.ToolboxCacheScopeId = toolboxRequestScope?.Id;

// Stamp/validate the hosted identity only when one was resolved. Locally (non-hosted) there is
// no user identity, so there is nothing to partition or tamper-check and the session is shared.
Expand Down Expand Up @@ -278,6 +282,7 @@ public override async IAsyncEnumerable<ResponseStreamEvent> CreateAsync(
// Re-apply the call id: the EmitCreated/EmitInProgress yields above reverted the ambient
// value, and the toolbox tools/list + consent egress below must carry it per request.
HostedCallContext.CallId = platformCallId;
HostedCallContext.ToolboxCacheScopeId = toolboxRequestScope?.Id;

var toolboxResolution = await this.ResolveToolboxToolsAsync(
this._toolboxService,
Expand Down Expand Up @@ -382,6 +387,7 @@ public override async IAsyncEnumerable<ResponseStreamEvent> CreateAsync(
// below revert the ambient AsyncLocal, but the MCP tools/call egress that happens
// inside MoveNextAsync must carry the platform call id on every request.
HostedCallContext.CallId = platformCallId;
HostedCallContext.ToolboxCacheScopeId = toolboxRequestScope?.Id;

bool shutdownDetected = false;
McpConsentInfo? consentInfo = null;
Expand Down Expand Up @@ -754,7 +760,7 @@ await toolboxService
return new(Tools: [], Consents: pendingConsents, Error: null);
}

List<AITool> toolsToAdd = [.. toolboxService.Tools];
List<AITool> toolsToAdd = [.. toolboxService.Tools, .. toolboxService.GetCurrentRequestTools()];
var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
List<McpConsentInfo>? markerConsents = null;

Expand Down
Loading
Loading