Skip to content

Fix races #1420

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
rumpl merged 2 commits into from
Jan 19, 2026
Merged

Fix races #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5be5579
Send the user message to the title generation
rumpl Jan 19, 2026
2fcfb8d
Fix possible race in the runtime test
rumpl Jan 19, 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
3 changes: 2 additions & 1 deletion pkg/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,8 @@ func (r *LocalRuntime) RunStream(ctx context.Context, sess *session.Session) <-c
r.registerDefaultTools()

if sess.Title == "" {
r.titleGen.Generate(ctx, sess, events)
userMessage := sess.GetLastUserMessageContent()
r.titleGen.Generate(ctx, sess, userMessage, events)
}

iteration := 0
Expand Down
4 changes: 4 additions & 0 deletions pkg/runtime/runtime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"io"
"reflect"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -568,12 +569,15 @@ func TestToolCallVariations(t *testing.T) {
// queueProvider returns a different stream on each CreateChatCompletionStream call.
type queueProvider struct {
id string
mu sync.Mutex
streams []chat.MessageStream
}

func (p *queueProvider) ID() string { return p.id }

func (p *queueProvider) CreateChatCompletionStream(context.Context, []chat.Message, []tools.Tool) (chat.MessageStream, error) {
p.mu.Lock()
defer p.mu.Unlock()
if len(p.streams) == 0 {
return &mockStream{}, nil
}
Expand Down
14 changes: 6 additions & 8 deletions pkg/runtime/title_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,22 @@ func newTitleGenerator(model provider.Provider) *titleGenerator {
}
}

func (t *titleGenerator) Generate(ctx context.Context, sess *session.Session, events chan<- Event) {
func (t *titleGenerator) Generate(ctx context.Context, sess *session.Session, userMessage string, events chan<- Event) {
if userMessage == "" {
return
}
t.wg.Go(func() {
t.generate(ctx, sess, events)
t.generate(ctx, sess, userMessage, events)
})
}

func (t *titleGenerator) Wait() {
t.wg.Wait()
}

func (t *titleGenerator) generate(ctx context.Context, sess *session.Session, events chan<- Event) {
func (t *titleGenerator) generate(ctx context.Context, sess *session.Session, firstUserMessage string, events chan<- Event) {
slog.Debug("Generating title for session", "session_id", sess.ID)

firstUserMessage := sess.GetLastUserMessageContent()
if firstUserMessage == "" {
return
}

userPrompt := fmt.Sprintf(titleUserPromptFormat, firstUserMessage)

titleModel := provider.CloneWithOptions(
Expand Down