Skip to content

fix for https://github.com/antinomyhq/forgecode/issues/2846 #2891

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

Open
jeffbryner wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −8
Open

fix for https://github.com/antinomyhq/forgecode/issues/2846 #2891

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
27 changes: 19 additions & 8 deletions crates/forge_main/src/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,25 @@ impl<A: API + ConsoleWriter + 'static, F: Fn(ForgeConfig) -> A + Send + Sync> UI

// Update the app config with the new operating agent.
self.api.set_active_agent(agent.id.clone()).await?;

// Update model tracking to reflect the new agent's model
let model = self.get_agent_model(Some(agent.id.clone())).await;
self.update_model(model.clone());

let name = agent.id.as_str().to_case(Case::UpperSnake).bold();

let title = format!(
"∙ {}",
agent.title.as_deref().unwrap_or(MISSING_AGENT_TITLE)
)
.dimmed();
self.writeln_title(TitleFormat::action(format!("{name} {title}")))?;

// Show model info if agent uses a specific model
let model_info = model
.map(|m| format!(" ∙ model: {m}").dimmed().to_string())
.unwrap_or_default();

self.writeln_title(TitleFormat::action(format!("{name} {title}{model_info}")))?;

Ok(())
}
Expand Down Expand Up @@ -4362,9 +4373,14 @@ impl<A: API + ConsoleWriter + 'static, F: Fn(ForgeConfig) -> A + Send + Sync> UI
.filter(|text| !text.trim().is_empty())
.and_then(|str| ConversationId::from_str(str.as_str()).ok());

let agent_id = std::env::var("_FORGE_ACTIVE_AGENT")
.ok()
.filter(|text| !text.trim().is_empty())
.map(AgentId::new);

// Make IO calls in parallel
let (model_id, conversation, reasoning_effort) = tokio::join!(
async { self.api.get_session_config().await.map(|c| c.model) },
self.get_agent_model(agent_id.clone()),
async {
if let Some(cid) = cid {
self.api.conversation(&cid).await.ok().flatten()
Expand Down Expand Up @@ -4402,12 +4418,7 @@ impl<A: API + ConsoleWriter + 'static, F: Fn(ForgeConfig) -> A + Send + Sync> UI
.and_then(|s| s.parse::<usize>().ok());

let rprompt = ZshRPrompt::from_config(&self.config)
.agent(
std::env::var("_FORGE_ACTIVE_AGENT")
.ok()
.filter(|text| !text.trim().is_empty())
.map(AgentId::new),
)
.agent(agent_id)
.model(model_id)
.token_count(conversation.and_then(|conversation| conversation.token_count()))
.cost(cost)
Expand Down
Loading