Skip to content

fix: use actual provider for alloy models in sidebar #1807

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
Feb 21, 2026
Merged

fix: use actual provider for alloy models in sidebar #1807

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: 3 additions & 1 deletion pkg/runtime/fallback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,9 @@ func (r *LocalRuntime) tryModelWithFallback(

// Stream created successfully, now handle it
slog.Debug("Processing stream", "agent", a.Name(), "model", modelEntry.provider.ID())
res, err := r.handleStream(ctx, stream, a, agentTools, sess, m, events)
// Extract provider name from the provider ID (e.g., "openai" from "openai/gpt-4o")
providerName, _, _ := strings.Cut(modelEntry.provider.ID(), "/")
res, err := r.handleStream(ctx, stream, a, agentTools, sess, m, events, providerName)
if err != nil {
lastErr = err

Expand Down
13 changes: 6 additions & 7 deletions pkg/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,7 @@ func (r *LocalRuntime) Run(ctx context.Context, sess *session.Session) ([]sessio
return sess.GetAllMessages(), nil
}

func (r *LocalRuntime) handleStream(ctx context.Context, stream chat.MessageStream, a *agent.Agent, agentTools []tools.Tool, sess *session.Session, m *modelsdev.Model, events chan Event) (streamResult, error) {
func (r *LocalRuntime) handleStream(ctx context.Context, stream chat.MessageStream, a *agent.Agent, agentTools []tools.Tool, sess *session.Session, m *modelsdev.Model, events chan Event, providerID string) (streamResult, error) {
defer stream.Close()

var fullContent strings.Builder
Expand Down Expand Up @@ -1332,12 +1332,11 @@ func (r *LocalRuntime) handleStream(ctx context.Context, stream chat.MessageStre
if actualModel == "" && response.Model != "" {
actualModel = response.Model
if !actualModelEventEmitted && actualModel != modelID {
// NOTE(krissetto):Prepend the provider from the configured modelID to maintain consistent format
// every other invocation in the code uses the provider/model format
formattedModel := actualModel
if idx := strings.Index(modelID, "/"); idx != -1 {
formattedModel = modelID[:idx+1] + actualModel
}
// Use the actual providerID (passed from caller) to construct the model ID.
// This is important for alloy models where different providers can be selected.
// The providerID comes from the actual provider used for this stream,
// not from parsing the configured model reference.
formattedModel := providerID + "/" + actualModel
slog.Debug("Detected actual model differs from configured model (streaming)", "configured", modelID, "actual", formattedModel)
events <- AgentInfo(a.Name(), formattedModel, a.Description(), a.WelcomeMessage())
actualModelEventEmitted = true
Expand Down