Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

agent: Show checkmark for current profile, not default profile (#30314)

Browse source 
Closes #ISSUE

Release Notes:

- agent: Fixed a bug that caused the profile selector to display a
checkmark next to the wrong profile.
This commit is contained in:
Cole Miller 2025-05-08 18:17:55 -04:00 • committed by GitHub
parent 648d0054de
commit 83378b856f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/agent/src/thread.rs
View file

@ -5,7 +5,7 @@ use std::sync::Arc;
use std::time::Instant;
use anyhow::{Result, anyhow};
use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings, CompletionMode};
use assistant_settings::{AgentProfileId, AssistantSettings, CompletionMode};
use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolWorkingSet};
use chrono::{DateTime, Utc};
use collections::HashMap;
@ -359,7 +359,7 @@ pub struct Thread {
>,
remaining_turns: u32,
configured_model: Option<ConfiguredModel>,
configured_profile: Option<AgentProfile>,
configured_profile_id: Option<AgentProfileId>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@ -381,8 +381,7 @@ impl Thread {
let (detailed_summary_tx, detailed_summary_rx) = postage::watch::channel();
let configured_model = LanguageModelRegistry::read_global(cx).default_model();
let assistant_settings = AssistantSettings::get_global(cx);
let profile_id = &assistant_settings.default_profile;
let configured_profile = assistant_settings.profiles.get(profile_id).cloned();
let configured_profile_id = assistant_settings.default_profile.clone();
Self {
id: ThreadId::new(),
@ -425,7 +424,7 @@ impl Thread {
request_callback: None,
remaining_turns: u32::MAX,
configured_model,
configured_profile,
configured_profile_id: Some(configured_profile_id),
}
}
@ -473,12 +472,7 @@ impl Thread {
.completion_mode
.unwrap_or_else(|| AssistantSettings::get_global(cx).preferred_completion_mode);
let configured_profile = serialized.profile.and_then(|profile| {
AssistantSettings::get_global(cx)
.profiles
.get(&profile)
.cloned()
});
let configured_profile_id = serialized.profile.clone();
Self {
id,
@ -553,7 +547,7 @@ impl Thread {
request_callback: None,
remaining_turns: u32::MAX,
configured_model,
configured_profile,
configured_profile_id,
}
}
@ -609,16 +603,16 @@ impl Thread {
cx.notify();
}
pub fn configured_profile(&self) -> Option<AgentProfile> {
self.configured_profile.clone()
pub fn configured_profile_id(&self) -> Option<AgentProfileId> {
self.configured_profile_id.clone()
}
pub fn set_configured_profile(
pub fn set_configured_profile_id(
&mut self,
profile: Option<AgentProfile>,
id: Option<AgentProfileId>,
cx: &mut Context<Self>,
) {
self.configured_profile = profile;
self.configured_profile_id = id;
cx.notify();
}
@ -1126,10 +1120,7 @@ impl Thread {
provider: model.provider.id().0.to_string(),
model: model.model.id().0.to_string(),
}),
profile: this
.configured_profile
.as_ref()
.map(|profile| AgentProfileId(profile.name.clone().into())),
profile: this.configured_profile_id.clone(),
completion_mode: Some(this.completion_mode),
})
})