[codex] fix routing and stale mission-help cleanup #90
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -533,6 +533,49 @@ impl Channel { | |
| Ok(agents.into_iter().find(|a| a.name == name)) | ||
| } | ||
|
|
||
| /// Resolve a user-supplied agent reference. | ||
| /// | ||
| /// Accepts a full UUID, short UUID, canonical name, nickname/display name, | ||
| /// or full display label. Returns `Ok(None)` when there is no match. | ||
| pub async fn resolve_agent_ref(&self, raw: &str) -> Result<Option<crate::agent::Agent>> { | ||
| let raw = raw.trim(); | ||
| if raw.is_empty() { | ||
| return Ok(None); | ||
| } | ||
|
|
||
| if let Ok(agent_id) = raw.parse::<AgentId>() { | ||
| return self.get_agent_state(agent_id).await; | ||
| } | ||
|
|
||
| let raw_lower = raw.to_ascii_lowercase(); | ||
| let agents = self.list_agents().await?; | ||
| let matches: Vec<_> = agents | ||
| .into_iter() | ||
| .filter(|agent| { | ||
| agent.name.eq_ignore_ascii_case(raw) | ||
| || agent.display_name().eq_ignore_ascii_case(raw) | ||
| || agent.display_label().eq_ignore_ascii_case(raw) | ||
| || agent.id.short_id().eq_ignore_ascii_case(&raw_lower) | ||
| }) | ||
| .collect(); | ||
|
|
||
| match matches.as_slice() { | ||
| [] => Ok(None), | ||
| [agent] => Ok(Some(agent.clone())), | ||
| _ => { | ||
| let labels = matches | ||
| .iter() | ||
| .map(|agent| format!("{} ({})", agent.display_label(), agent.id.short_id())) | ||
| .collect::<Vec<_>>() | ||
| .join(", "); | ||
| Err(crate::Error::Config(format!( | ||
| "Agent reference '{}' is ambiguous: {}", | ||
| raw, labels | ||
| ))) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Delete an agent from Redis. | ||
| pub async fn delete_agent(&self, agent_id: AgentId) -> Result<()> { | ||
| let mut conn = self.conn.clone(); | ||
|
|
@@ -948,6 +991,43 @@ impl Channel { | |
| Ok(messages) | ||
| } | ||
|
|
||
| /// Remove inbox messages matching a predicate while preserving order. | ||
| pub async fn remove_inbox_messages_matching<F>( | ||
| &self, | ||
| agent_id: AgentId, | ||
| mut predicate: F, | ||
| ) -> Result<usize> | ||
| where | ||
| F: FnMut(&Message) -> bool, | ||
| { | ||
| let mut conn = self.conn.clone(); | ||
| let inbox_key = self.inbox_key(agent_id); | ||
| let items: Vec<String> = conn.lrange(&inbox_key, 0, -1).await?; | ||
| if items.is_empty() { | ||
| return Ok(0); | ||
| } | ||
|
|
||
| let mut kept = Vec::with_capacity(items.len()); | ||
| let mut removed = 0usize; | ||
| for item in items { | ||
| match serde_json::from_str::<Message>(&item) { | ||
| Ok(message) if predicate(&message) => removed += 1, | ||
| _ => kept.push(item), | ||
| } | ||
| } | ||
|
|
||
| if removed == 0 { | ||
| return Ok(0); | ||
| } | ||
|
|
||
| let _: () = conn.del(&inbox_key).await?; | ||
| if !kept.is_empty() { | ||
| let _: () = conn.rpush(&inbox_key, kept).await?; | ||
| } | ||
|
There was a problem hiding this comment. Non-atomic inbox read-delete-write loses concurrent messagesMedium Severity
  Reviewed by Cursor Bugbot for commit 10ae7f5. Configure here. |
||
|
|
||
| Ok(removed) | ||
| } | ||
|
|
||
| /// Move a message to another agent's inbox. | ||
| pub async fn move_message_to_inbox(&self, message: &Message, to_agent: AgentId) -> Result<()> { | ||
| // Create a new message with updated recipient | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MCP note handler omits
clear_help_request_stateunlike other pathsMedium Severity
The MCP
mission.notehandler discards the loaded mission withOk(Some(_)) => {}and never callsclear_help_request_state(), while every other operator acknowledgment path (CLI note, MCP pause/resume/stop, API resume/stop, and MCP reject) does call it and saves the mission. This means operator notes sent via MCP won't reset the dispatcher's remembered help-request state, so the dispatcher may re-send stale help requests to the conductor inbox even though the operator already responded.Additional Locations (1)
src/main.rs#L5004-L5012Reviewed by Cursor Bugbot for commit 10ae7f5. Configure here.