Skip to content

Commit

Permalink
refactor: forbid .exit role if the session is not empty (#963)
Browse files Browse the repository at this point in the history
  • Loading branch information
sigoden authored Nov 1, 2024
1 parent 9749369 commit f5cdd0f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ impl Config {

pub fn use_role_obj(&mut self, role: Role) -> Result<()> {
if self.agent.is_some() {
bail!("Cannot perform this action because you are using a agent")
bail!("Cannot perform this operation because you are using a agent")
}
if let Some(session) = self.session.as_mut() {
session.guard_empty()?;
Expand Down Expand Up @@ -861,6 +861,7 @@ impl Config {

pub fn exit_role(&mut self) -> Result<()> {
if let Some(session) = self.session.as_mut() {
session.guard_empty()?;
session.clear_role();
} else if self.role.is_some() {
self.role = None;
Expand Down Expand Up @@ -1193,7 +1194,7 @@ impl Config {
abort_signal: AbortSignal,
) -> Result<()> {
if config.read().agent.is_some() {
bail!("Cannot perform this action because you are using a agent")
bail!("Cannot perform this operation because you are using a agent")
}
let rag = match rag {
None => {
Expand Down
2 changes: 1 addition & 1 deletion src/config/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ impl Session {

pub fn guard_empty(&self) -> Result<()> {
if !self.is_empty() {
bail!("This action cannot be performed in a session with messages.")
bail!("Cannot perform this operation because the session has messages, please `.empty session` first.");
}
Ok(())
}
Expand Down

0 comments on commit f5cdd0f

Please sign in to comment.