feat(conversation): add :rename command to set custom conversation titles (#2760)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Tushar <tusharmath@gmail.com>

Author: 3 people

crates/forge_api/src/api.rs

@@ -71,6 +71,20 @@ pub trait API: Sync + Send {
     /// Returns an error if the operation fails
     async fn delete_conversation(&self, conversation_id: &ConversationId) -> Result<()>;
 
+    /// Renames a conversation by setting its title
+    ///
+    /// # Arguments
+    /// * `conversation_id` - The ID of the conversation to rename
+    /// * `title` - The new title for the conversation
+    ///
+    /// # Errors
+    /// Returns an error if the conversation is not found or the operation fails
+    async fn rename_conversation(
+        &self,
+        conversation_id: &ConversationId,
+        title: String,
+    ) -> Result<()>;
+
     /// Compacts the context of the main agent for the given conversation and
     /// persists it. Returns metrics about the compaction (original vs.
     /// compacted tokens and messages).

crates/forge_api/src/forge_api.rs

@@ -169,6 +169,18 @@ impl<A: Services, F: CommandInfra + EnvironmentInfra + SkillRepository + GrpcInf
         self.services.delete_conversation(conversation_id).await
     }
 
+    async fn rename_conversation(
+        &self,
+        conversation_id: &ConversationId,
+        title: String,
+    ) -> anyhow::Result<()> {
+        self.services
+            .modify_conversation(conversation_id, |conv| {
+                conv.title = Some(title);
+            })
+            .await
+    }
+
     async fn execute_shell_command(
         &self,
         command: &str,

crates/forge_main/src/built_in_commands.json

@@ -115,6 +115,14 @@
     "command": "clone",
     "description": "Clone and manage conversation context"
   },
+  {
+    "command": "rename",
+    "description": "Rename the current conversation [alias: rn]"
+  },
+  {
+    "command": "conversation-rename",
+    "description": "Rename a conversation by ID or interactively"
+  },
   {
     "command": "copy",
     "description": "Copy last assistant message to clipboard as raw markdown"

crates/forge_main/src/cli.rs

@@ -645,6 +645,15 @@ pub enum ConversationCommand {
         /// Conversation ID to delete.
         id: String,
     },
+
+    /// Rename a conversation.
+    Rename {
+        /// Conversation ID to rename.
+        id: ConversationId,
+
+        /// New name for the conversation.
+        name: String,
+    },
 }
 
 /// Command group for provider authentication management.

crates/forge_main/src/model.rs

@@ -98,6 +98,8 @@ impl ForgeCommandManager {
                 | "conversations"
                 | "list"
                 | "commit"
+                | "rename"
+                | "rn"
         )
     }
 
@@ -107,6 +109,7 @@ impl ForgeCommandManager {
             .filter(|command| !matches!(command, SlashCommand::Custom(_)))
             .filter(|command| !matches!(command, SlashCommand::Shell(_)))
             .filter(|command| !matches!(command, SlashCommand::AgentSwitch(_)))
+            .filter(|command| !matches!(command, SlashCommand::Rename(_)))
             .map(|command| ForgeCommand {
                 name: command.name().to_string(),
                 description: command.usage().to_string(),
@@ -282,6 +285,16 @@ impl ForgeCommandManager {
                 Ok(SlashCommand::Commit { max_diff_size })
             }
             "/index" => Ok(SlashCommand::Index),
+            "/rename" | "/rn" => {
+                let name = parameters.join(" ");
+                let name = name.trim().to_string();
+                if name.is_empty() {
+                    return Err(anyhow::anyhow!(
+                        "Usage: /rename <name>. Please provide a name for the conversation."
+                    ));
+                }
+                Ok(SlashCommand::Rename(name))
+            }
             text => {
                 let parts = text.split_ascii_whitespace().collect::<Vec<&str>>();
 
@@ -420,6 +433,10 @@ pub enum SlashCommand {
     #[strum(props(usage = "Delete a conversation permanently"))]
     Delete,
 
+    /// Rename the current conversation
+    #[strum(props(usage = "Rename the current conversation. Usage: /rename <name>"))]
+    Rename(String),
+
     /// Switch directly to a specific agent by ID
     #[strum(props(usage = "Switch directly to a specific agent"))]
     AgentSwitch(String),
@@ -467,6 +484,7 @@ impl SlashCommand {
             SlashCommand::Retry => "retry",
             SlashCommand::Conversations => "conversation",
             SlashCommand::Delete => "delete",
+            SlashCommand::Rename(_) => "rename",
             SlashCommand::AgentSwitch(agent_id) => agent_id,
             SlashCommand::Index => "index",
         }
@@ -1242,4 +1260,55 @@ mod tests {
         let expected = SlashCommand::Dump { html: true };
         assert_eq!(actual, expected);
     }
+
+    #[test]
+    fn test_parse_rename_command() {
+        let fixture = ForgeCommandManager::default();
+        let actual = fixture.parse("/rename my-session").unwrap();
+        assert_eq!(actual, SlashCommand::Rename("my-session".to_string()));
+    }
+
+    #[test]
+    fn test_parse_rename_command_multi_word() {
+        let fixture = ForgeCommandManager::default();
+        let actual = fixture.parse("/rename auth refactor work").unwrap();
+        assert_eq!(
+            actual,
+            SlashCommand::Rename("auth refactor work".to_string())
+        );
+    }
+
+    #[test]
+    fn test_parse_rename_command_no_name() {
+        let fixture = ForgeCommandManager::default();
+        let result = fixture.parse("/rename");
+        assert!(result.is_err());
+        assert!(result.unwrap_err().to_string().contains("provide a name"));
+    }
+
+    #[test]
+    fn test_parse_rename_alias() {
+        let fixture = ForgeCommandManager::default();
+        let actual = fixture.parse("/rn my-session").unwrap();
+        assert_eq!(actual, SlashCommand::Rename("my-session".to_string()));
+    }
+
+    #[test]
+    fn test_parse_rename_trims_whitespace() {
+        let fixture = ForgeCommandManager::default();
+        let actual = fixture.parse("/rename   my title   ").unwrap();
+        assert_eq!(actual, SlashCommand::Rename("my title".to_string()));
+    }
+
+    #[test]
+    fn test_rename_is_reserved_command() {
+        assert!(ForgeCommandManager::is_reserved_command("rename"));
+        assert!(ForgeCommandManager::is_reserved_command("rn"));
+    }
+
+    #[test]
+    fn test_rename_command_name() {
+        let cmd = SlashCommand::Rename("test".to_string());
+        assert_eq!(cmd.name(), "rename");
+    }
 }

crates/forge_main/src/ui.rs

@@ -768,6 +768,21 @@ impl<A: API + ConsoleWriter + 'static, F: Fn() -> A + Send + Sync> UI<A, F> {
                 self.on_clone_conversation(conversation, porcelain).await?;
                 self.spinner.stop(None)?;
             }
+            ConversationCommand::Rename { id, name } => {
+                self.validate_conversation_exists(&id).await?;
+
+                let name = name.trim().to_string();
+                if name.is_empty() {
+                    return Err(anyhow::anyhow!(
+                        "Please provide a name for the conversation."
+                    ));
+                }
+                self.api.rename_conversation(&id, name.clone()).await?;
+                self.writeln_title(TitleFormat::info(format!(
+                    "Conversation renamed to '{}'",
+                    name.bold()
+                )))?;
+            }
         }
 
         Ok(())
@@ -1814,6 +1829,9 @@ impl<A: API + ConsoleWriter + 'static, F: Fn() -> A + Send + Sync> UI<A, F> {
             SlashCommand::Delete => {
                 self.handle_delete_conversation().await?;
             }
+            SlashCommand::Rename(ref name) => {
+                self.handle_rename_conversation(name.clone()).await?;
+            }
             SlashCommand::Dump { html } => {
                 self.spinner.start(Some("Dumping"))?;
                 self.on_dump(html).await?;
@@ -2007,6 +2025,18 @@ impl<A: API + ConsoleWriter + 'static, F: Fn() -> A + Send + Sync> UI<A, F> {
         Ok(())
     }
 
+    async fn handle_rename_conversation(&mut self, name: String) -> anyhow::Result<()> {
+        let conversation_id = self.init_conversation().await?;
+        self.api
+            .rename_conversation(&conversation_id, name.clone())
+            .await?;
+        self.writeln_title(TitleFormat::info(format!(
+            "Conversation renamed to '{}'",
+            name.bold()
+        )))?;
+        Ok(())
+    }
+
     /// Select a model from all configured providers using porcelain-style
     /// tabular display matching the shell plugin's `:model` UI.
     ///

crates/forge_repo/src/conversation/conversation_repo.rs

@@ -894,6 +894,43 @@ mod tests {
         Ok(())
     }
 
+    #[tokio::test]
+    async fn test_rename_conversation_via_upsert() -> anyhow::Result<()> {
+        let repo = repository()?;
+        let conversation =
+            Conversation::new(ConversationId::generate()).title(Some("Original Title".to_string()));
+
+        repo.upsert_conversation(conversation.clone()).await?;
+
+        // Rename by upserting with a new title
+        let renamed = conversation
+            .clone()
+            .title(Some("Renamed Session".to_string()));
+        repo.upsert_conversation(renamed).await?;
+
+        let actual = repo.get_conversation(&conversation.id).await?.unwrap();
+        assert_eq!(actual.title, Some("Renamed Session".to_string()));
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn test_rename_conversation_from_none() -> anyhow::Result<()> {
+        let repo = repository()?;
+        let conversation = Conversation::new(ConversationId::generate());
+
+        // Start with no title
+        assert!(conversation.title.is_none());
+        repo.upsert_conversation(conversation.clone()).await?;
+
+        // Rename it
+        let renamed = conversation.clone().title(Some("My Session".to_string()));
+        repo.upsert_conversation(renamed).await?;
+
+        let actual = repo.get_conversation(&conversation.id).await?.unwrap();
+        assert_eq!(actual.title, Some("My Session".to_string()));
+        Ok(())
+    }
+
     #[test]
     fn test_legacy_tool_value_pair_deserialization() {
         use crate::conversation::conversation_record::ToolOutputRecord;

shell-plugin/lib/actions/conversation.zsh

@@ -9,6 +9,9 @@
 # - :clone                 - Clone current or selected conversation
 # - :clone <id>            - Clone specific conversation by ID
 # - :copy                  - Copy last assistant message to OS clipboard as raw markdown
+# - :rename <name>         - Rename the current conversation
+# - :conversation-rename   - Rename a conversation (interactive picker)
+# - :conversation-rename <id> <name> - Rename specific conversation by ID
 #
 # Helper Functions:
 # - _forge_switch_conversation <id>  - Switch to a conversation and track previous
@@ -234,6 +237,91 @@ function _forge_action_copy() {
     _forge_log success "Copied to clipboard \033[90m[${line_count} lines, ${byte_count} bytes]\033[0m"
 }
 
+# Action handler: Rename current conversation
+# Usage: :rename <name>
+function _forge_action_rename() {
+    local input_text="$1"
+
+    echo
+
+    if [[ -z "$_FORGE_CONVERSATION_ID" ]]; then
+        _forge_log error "No active conversation. Start a conversation first or use :conversation to select one"
+        return 0
+    fi
+
+    if [[ -z "$input_text" ]]; then
+        _forge_log error "Usage: :rename <name>"
+        return 0
+    fi
+
+    _forge_exec conversation rename "$_FORGE_CONVERSATION_ID" $input_text
+}
+
+# Action handler: Rename a conversation (interactive picker or by ID)
+# Usage: :conversation-rename [<id> <name>]
+function _forge_action_conversation_rename() {
+    local input_text="$1"
+
+    echo
+
+    # If input looks like "<id> <name>", split and rename directly
+    if [[ -n "$input_text" ]]; then
+        local conversation_id="${input_text%% *}"
+        local new_name="${input_text#* }"
+
+        if [[ "$conversation_id" == "$new_name" ]]; then
+            # Only one arg provided — not enough
+            _forge_log error "Usage: :conversation-rename <id> <name>"
+            return 0
+        fi
+
+        _forge_exec conversation rename "$conversation_id" $new_name
+        return 0
+    fi
+
+    # No args — show interactive picker
+    local conversations_output
+    conversations_output=$($_FORGE_BIN conversation list --porcelain 2>/dev/null)
+
+    if [[ -z "$conversations_output" ]]; then
+        _forge_log error "No conversations found"
+        return 0
+    fi
+
+    local current_id="$_FORGE_CONVERSATION_ID"
+
+    local prompt_text="Rename Conversation ❯ "
+    local fzf_args=(
+        --prompt="$prompt_text"
+        --delimiter="$_FORGE_DELIMITER"
+        --with-nth="2,3"
+        --preview="CLICOLOR_FORCE=1 $_FORGE_BIN conversation info {1}; echo; CLICOLOR_FORCE=1 $_FORGE_BIN conversation show {1}"
+        $_FORGE_PREVIEW_WINDOW
+    )
+
+    if [[ -n "$current_id" ]]; then
+        local index=$(_forge_find_index "$conversations_output" "$current_id" 1)
+        fzf_args+=(--bind="start:pos($index)")
+    fi
+
+    local selected_conversation
+    selected_conversation=$(echo "$conversations_output" | _forge_fzf --header-lines=1 "${fzf_args[@]}")
+
+    if [[ -n "$selected_conversation" ]]; then
+        local conversation_id=$(echo "$selected_conversation" | sed -E 's/  .*//' | tr -d '\n')
+
+        # Prompt for new name
+        echo -n "Enter new name: "
+        read -r new_name </dev/tty
+
+        if [[ -n "$new_name" ]]; then
+            _forge_exec conversation rename "$conversation_id" $new_name
+        else
+            _forge_log error "No name provided, rename cancelled"
+        fi
+    fi
+}
+
 # Helper function to clone and switch to conversation
 function _forge_clone_and_switch() {
     local clone_target="$1"

shell-plugin/lib/dispatcher.zsh

@@ -217,6 +217,12 @@ function forge-accept-line() {
         clone)
             _forge_action_clone "$input_text"
         ;;
+        rename|rn)
+            _forge_action_rename "$input_text"
+        ;;
+        conversation-rename)
+            _forge_action_conversation_rename "$input_text"
+        ;;
         copy)
             _forge_action_copy
         ;;