Skip to content

fix: move registerDefaultTools to constructor to prevent concurrent map writes #2041

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
dgageot merged 1 commit into from
Mar 10, 2026
Merged

fix: move registerDefaultTools to constructor to prevent concurrent map writes #2041

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
5 changes: 5 additions & 0 deletions pkg/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,11 @@ func NewLocalRuntime(agents *team.Team, opts ...Opt) (*LocalRuntime, error) {

r.sessionCompactor = newSessionCompactor(model, r.sessionStore)

// Register runtime-managed tool handlers once during construction.
// This avoids concurrent map writes when multiple goroutines call
// RunStream on the same runtime (e.g. background agent sessions).
Copy link
Member

@rumpl rumpl Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Background agent sessions are using the same runtime??

Copy link
Member Author

@dgageot dgageot Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I understand, yes. I'm still trying to improve the code

r.registerDefaultTools()

slog.Debug("Creating new runtime", "agent", r.currentAgent, "available_agents", agents.Size())

return r, nil
Expand Down