fix(runtime): reliable, correlation-safe, non-blocking elicitation delivery (#3584)#3587
Merged
Conversation
aheritier
commented
Jul 11, 2026
|
|
||
| For advanced use (custom elicitation, raw event inspection), call `chat.Runtime()` to access the underlying `runtime.Runtime` directly. | ||
|
|
||
| > [!WARNING] |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| b.ch <- ev | ||
| return nil | ||
| select { | ||
| case b.ch <- ev: |
| // means the response will reach the caller, never a discarded one. | ||
| func (r *LocalRuntime) ResumeElicitation(ctx context.Context, action tools.ElicitationAction, content map[string]any, elicitationID ...string) error { | ||
| id := firstElicitationID(elicitationID) | ||
| slog.DebugContext(ctx, "Resuming runtime with elicitation response", "agent", r.currentAgentName(), "action", action, "elicitation_id", id) |
| ok = r.elicitationWaiters.resolveSingle(result) | ||
| } | ||
| if !ok { | ||
| slog.DebugContext(ctx, "No matching elicitation request in progress", "elicitation_id", id) |
| slog.DebugContext(ctx, "No matching elicitation request in progress", "elicitation_id", id) | ||
| return errNoSuchElicitation | ||
| } | ||
| slog.DebugContext(ctx, "Elicitation response sent successfully", "action", action) |
| func (r *RemoteRuntime) ResumeElicitation(ctx context.Context, action tools.ElicitationAction, content map[string]any) error { | ||
| slog.DebugContext(ctx, "Resuming remote runtime with elicitation response", "agent", r.currentAgent, "action", action, "session_id", r.sessionID) | ||
| func (r *RemoteRuntime) ResumeElicitation(ctx context.Context, action tools.ElicitationAction, content map[string]any, elicitationID ...string) error { | ||
| id := firstElicitationID(elicitationID) |
| slog.DebugContext(ctx, "Resuming remote runtime with elicitation response", "agent", r.currentAgent, "action", action, "session_id", r.sessionID) | ||
| func (r *RemoteRuntime) ResumeElicitation(ctx context.Context, action tools.ElicitationAction, content map[string]any, elicitationID ...string) error { | ||
| id := firstElicitationID(elicitationID) | ||
| slog.DebugContext(ctx, "Resuming remote runtime with elicitation response", "agent", r.currentAgent, "action", action, "session_id", r.sessionID, "elicitation_id", id) |
aheritier
added
area/api
aheritier
force-pushed
the
fix/a6-elicitation-concurrency
branch
2 times, most recently
from
06d22e7 to
5db8299
Compare
aheritier
force-pushed
the
fix/a6-elicitation-concurrency
branch
from
5db8299 to
811d91d
Compare
aheritier
changed the title
Contributor
Author
|
/review |
Contributor
|
👋 Heads up: The |
dgageot
approved these changes
Jul 15, 2026
aheritier
added a commit
that referenced
this pull request
Jul 15, 2026
…ibility (#3584) Change NewElicitationDialog, NewURLElicitationDialog, NewOAuthAuthorizationDialog, and App.ResumeElicitation to take the new correlation-ID argument as a trailing variadic elicitationID ...string instead of a required positional string, following #3587's precedent for Runtime.ResumeElicitation. This restores source compatibility for external callers and fixes the compile break against 3-arg NewElicitationDialog call sites added on main (bebfc22). Existing call sites in this branch that pass a real elicitation ID are unchanged (still pass it as the variadic arg), so response correlation is preserved. NewOAuthAuthorizationDialog's parameter order also changes: appInstance now comes before the new variadic elicitationID, so the trailing ID stays last across all four signatures.
aheritier
added a commit
that referenced
this pull request
Jul 15, 2026
…ibility (#3584) Change NewElicitationDialog, NewURLElicitationDialog, NewOAuthAuthorizationDialog, and App.ResumeElicitation to take the new correlation-ID argument as a trailing variadic elicitationID ...string instead of a required positional string, following #3587's precedent for Runtime.ResumeElicitation. This restores source compatibility for external callers and fixes the compile break against 3-arg NewElicitationDialog call sites added on main (bebfc22). Existing call sites in this branch that pass a real elicitation ID are unchanged (still pass it as the variadic arg), so response correlation is preserved. NewOAuthAuthorizationDialog's parameter order also changes: appInstance now comes before the new variadic elicitationID, so the trailing ID stays last across all four signatures.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Previously this PR was the full A6 implementation; it has been split into a reviewable stack and now scopes to the runtime core only. Fixes the heart of #3584 — elicitation requests raised from concurrent background jobs were silently dropped and the requesting handler blocked forever.
#3584 stack
What changed
OnElicitationRequestsink is called synchronously; the best-effort bridge send is ctx-bounded on a detached goroutine and can never block delivery or response processing.ctx.Done().ResumeElicitation's newelicitationIDis variadic (pre-Concurrent background-job elicitations are silently dropped — nothing displayed to the user #3584 callers still compile); additiveelicitation_idwire field; server pass-through wires it end-to-end.The
Runtimeinterface change and its repo-wide implementor/mock updates are one commit for Go compile atomicity.Testing
pkg/runtime/elicitation_concurrency_test.go: duplicate wire IDs, cancel-vs-resolve race (300-iter-race), wedged bridge, real-handler TOCTOU, exactly-once delivery, concurrent background-job routing.task dev+-race— green.Bottom of the remaining stack (targets
mainnow that #3618 is merged).