vasceannie/openagent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Thomas Marchand
2025-12-21 21:37:54 +00:00
parent 93205cfb59
commit 2f62842ecd
10 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dashboard/src/app/console/console-wrapper.tsx
View File

@@ -15,3 +15,4 @@ export function ConsoleWrapper() {

1
dashboard/src/components/ui/confirm-dialog.tsx
View File

@@ -122,3 +122,4 @@ export function ConfirmDialog({

1
dashboard/src/components/ui/copy-button.tsx
View File

@@ -56,3 +56,4 @@ export function CopyButton({ text, className, label = 'Copied!', showOnHover = t

1
dashboard/src/components/ui/relative-time.tsx
View File

@@ -52,3 +52,4 @@ export function RelativeTime({ date, className }: RelativeTimeProps) {

1
dashboard/src/components/ui/shimmer.tsx
View File

@@ -88,3 +88,4 @@ export function ShimmerText({ lines = 3, className }: ShimmerProps & { lines?: n

1
dashboard/src/lib/settings.ts
View File

@@ -57,3 +57,4 @@ export function getRuntimeTaskDefaults(): { model?: string; budget_cents?: numbe

1
dashboard/src/lib/utils.ts
View File

@@ -39,3 +39,4 @@ export function formatRelativeTime(date: Date): string {

28
src/api/control.rs
View File

@@ -1196,6 +1196,10 @@ async fn control_actor_loop(
let mut queue: VecDeque<(Uuid, String, Option<String>)> = VecDeque::new();
let mut history: Vec<(String, String)> = Vec::new(); // (role, content) pairs (user/assistant)
let pricing = Arc::new(ModelPricing::new());
// Tracks whether complete_mission was explicitly called by the agent for the current mission.
// This prevents auto-complete logic from overwriting an explicit status set by the agent.
let mut explicit_mission_status_set = false;
let mut running: Option<tokio::task::JoinHandle<(Uuid, String, crate::agents::AgentResult)>> =
None;
@@ -1449,6 +1453,8 @@ async fn control_actor_loop(
if mission_id.is_none() {
if let Ok(new_mission) = create_new_mission(&memory, model.as_deref()).await {
*current_mission.write().await = Some(new_mission.id);
// Reset explicit status flag for new mission
explicit_mission_status_set = false;
tracing::info!("Auto-created mission: {} (model: {:?})", new_mission.id, model);
}
}
@@ -1555,6 +1561,8 @@ async fn control_actor_loop(
.map(|e| (e.role.clone(), e.content.clone()))
.collect();
*current_mission.write().await = Some(id);
// Reset explicit status flag for new mission context
explicit_mission_status_set = false;
let _ = respond.send(Ok(mission));
}
Err(e) => {
@@ -1571,6 +1579,8 @@ async fn control_actor_loop(
Ok(mission) => {
history.clear();
*current_mission.write().await = Some(mission.id);
// Reset explicit status flag for new mission
explicit_mission_status_set = false;
let _ = respond.send(Ok(mission));
}
Err(e) => {
@@ -1740,6 +1750,8 @@ async fn control_actor_loop(
.map(|e| (e.role.clone(), e.content.clone()))
.collect();
*current_mission.write().await = Some(mission_id);
// Reset explicit status flag for resumed mission
explicit_mission_status_set = false;
// Update mission status back to active
if let Some(mem) = &memory {
@@ -1922,6 +1934,9 @@ async fn control_actor_loop(
summary,
});
tracing::info!("Mission {} marked as {} by agent", id, new_status);
// Mark that an explicit status was set - prevents auto-complete from overwriting
explicit_mission_status_set = true;
}
}
}
@@ -1953,12 +1968,16 @@ async fn control_actor_loop(
// 1. There's a current mission
// 2. The execution finished (success or failure)
// 3. The output indicates terminal state (max iterations, stall, budget exhausted)
let should_auto_complete = agent_result.output.contains("Max iterations") ||
// 4. The agent did NOT explicitly call complete_mission (explicit_mission_status_set is false)
let has_terminal_output = agent_result.output.contains("Max iterations") ||
agent_result.output.contains("Agent stalled") ||
agent_result.output.contains("Budget exhausted") ||
agent_result.output.contains("infinite loop") ||
agent_result.output.contains("Cancelled");
// Only auto-complete if no explicit complete_mission was called
let should_auto_complete = has_terminal_output && !explicit_mission_status_set;
if should_auto_complete {
if let Some(mem) = &memory {
if let Some(mission_id) = current_mission.read().await.clone() {
@@ -1985,7 +2004,14 @@ async fn control_actor_loop(
}
}
}
} else if has_terminal_output && explicit_mission_status_set {
tracing::debug!(
"Skipping auto-complete: mission status was already set explicitly via complete_mission"
);
}
// Reset the flag after processing this execution
explicit_mission_status_set = false;
let _ = events_tx.send(AgentEvent::AssistantMessage {
id: Uuid::new_v4(),

1
src/memory/embed.rs
View File

@@ -130,3 +130,4 @@ struct EmbeddingUsage {

1
src/tools/github.rs
View File

@@ -633,3 +633,4 @@ Note: GitHub code search requires authentication. Set GH_TOKEN env var."
}
}