deprecates use of profile flags

dingfeli · dingfeli · commit 392f96d0b835 · 2025-07-01T15:39:48.000-07:00
diff --git a/crates/chat-cli/src/cli/chat/cli/mod.rs b/crates/chat-cli/src/cli/chat/cli/mod.rs
@@ -23,7 +23,7 @@ use knowledge::KnowledgeSubcommand;
 use mcp::McpArgs;
 use model::ModelArgs;
 use persist::PersistSubcommand;
-use profile::ProfileSubcommand;
+use profile::AgentSubcommand;
 use prompts::PromptsArgs;
 use tools::ToolsArgs;
 
@@ -47,9 +47,9 @@ pub enum SlashCommand {
     Quit,
     /// Clear the conversation history
     Clear(ClearArgs),
-    /// Manage profiles
-    #[command(subcommand)]
-    Profile(ProfileSubcommand),
+    /// Manage agents
+    #[command(subcommand, aliases = ["profile"])]
+    Agent(AgentSubcommand),
     /// Manage context files for the chat session
     #[command(subcommand)]
     Context(ContextSubcommand),
@@ -89,7 +89,7 @@ impl SlashCommand {
         match self {
             Self::Quit => Ok(ChatState::Exit),
             Self::Clear(args) => args.execute(session).await,
-            Self::Profile(subcommand) => subcommand.execute(os, session).await,
+            Self::Agent(subcommand) => subcommand.execute(os, session).await,
             Self::Context(args) => args.execute(os, session).await,
             Self::Knowledge(subcommand) => subcommand.execute(os, session).await,
             Self::PromptEditor(args) => args.execute(session).await,
diff --git a/crates/chat-cli/src/cli/chat/cli/profile.rs b/crates/chat-cli/src/cli/chat/cli/profile.rs
@@ -17,15 +17,16 @@ use crate::util::directories::chat_global_agent_path;
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Subcommand)]
 #[command(
-    before_long_help = "Profiles allow you to organize and manage different sets of context files for different projects or tasks.
+    before_long_help = "Agents allow you to organize and manage different sets of context files for different projects or tasks.
 
 Notes
-• The \"global\" profile contains context files that are available in all profiles
-• The \"default\" profile is used when no profile is specified
-• You can switch between profiles to work on different projects
-• Each profile maintains its own set of context files"
+• Launch q chat with a specific agent with --agent
+• Construct an agent under ~/.aws/amazonq/agents/ (accessible globally) or cwd/.aws/amazonq/agents (accessible in workspace)
+• See example config under global directory
+• Set default agent to assume with settings by running \"q settings chat.defaultAgent agent_name\"
+• Each agent maintains its own set of context and customizations"
 )]
-pub enum ProfileSubcommand {
+pub enum AgentSubcommand {
     /// List all available profiles
     List,
     /// Create a new profile with the specified name
@@ -38,7 +39,7 @@ pub enum ProfileSubcommand {
     Rename { old_name: String, new_name: String },
 }
 
-impl ProfileSubcommand {
+impl AgentSubcommand {
     pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
         let agents = &session.conversation.agents;
 
diff --git a/crates/chat-cli/src/cli/chat/mod.rs b/crates/chat-cli/src/cli/chat/mod.rs
@@ -153,8 +153,8 @@ pub struct ChatArgs {
     #[arg(short, long)]
     pub resume: bool,
     /// Context profile to use
-    #[arg(long = "profile")]
-    pub profile: Option<String>,
+    #[arg(long = "agent", alias = "profile")]
+    pub agent: Option<String>,
     /// Current model to use
     #[arg(long = "model")]
     pub model: Option<String>,
@@ -178,13 +178,21 @@ impl ChatArgs {
             bail!("Input must be supplied when running in non-interactive mode");
         }
 
+        let args: Vec<String> = std::env::args().collect();
+        if args
+            .iter()
+            .any(|arg| arg == "--profile" || arg.starts_with("--profile="))
+        {
+            eprintln!("Warning: --profile is deprecated, use --agent instead");
+        }
+
         let stdout = std::io::stdout();
         let mut stderr = std::io::stderr();
 
         let agents = {
             let mut default_agent_name = None::<String>;
-            let agent_name = if let Some(profile) = self.profile.as_deref() {
-                Some(profile)
+            let agent_name = if let Some(agent) = self.agent.as_deref() {
+                Some(agent)
             } else if let Some(agent) = os.database.settings.get_string(Setting::ChatDefaultAgent) {
                 default_agent_name.replace(agent);
                 default_agent_name.as_deref()
@@ -194,7 +202,7 @@ impl ChatArgs {
             let mut agents = Agents::load(os, agent_name, self.non_interactive, &mut stderr).await;
             agents.trust_all_tools = self.trust_all_tools;
 
-            if let Some(name) = self.profile.as_ref() {
+            if let Some(name) = self.agent.as_ref() {
                 match agents.switch(name) {
                     Ok(agent) if !agent.mcp_servers.mcp_servers.is_empty() => {
                         if !self.non_interactive
diff --git a/crates/chat-cli/src/cli/mod.rs b/crates/chat-cli/src/cli/mod.rs
@@ -352,7 +352,7 @@ mod test {
             subcommand: Some(RootSubcommand::Chat(ChatArgs {
                 resume: false,
                 input: None,
-                profile: None,
+                agent: None,
                 model: None,
                 trust_all_tools: false,
                 trust_tools: None,
@@ -391,7 +391,7 @@ mod test {
             RootSubcommand::Chat(ChatArgs {
                 resume: false,
                 input: None,
-                profile: Some("my-profile".to_string()),
+                agent: Some("my-profile".to_string()),
                 model: None,
                 trust_all_tools: false,
                 trust_tools: None,
@@ -407,7 +407,7 @@ mod test {
             RootSubcommand::Chat(ChatArgs {
                 resume: false,
                 input: Some("Hello".to_string()),
-                profile: Some("my-profile".to_string()),
+                agent: Some("my-profile".to_string()),
                 model: None,
                 trust_all_tools: false,
                 trust_tools: None,
@@ -423,7 +423,7 @@ mod test {
             RootSubcommand::Chat(ChatArgs {
                 resume: false,
                 input: None,
-                profile: Some("my-profile".to_string()),
+                agent: Some("my-profile".to_string()),
                 model: None,
                 trust_all_tools: true,
                 trust_tools: None,
@@ -439,7 +439,7 @@ mod test {
             RootSubcommand::Chat(ChatArgs {
                 resume: true,
                 input: None,
-                profile: None,
+                agent: None,
                 model: None,
                 trust_all_tools: false,
                 trust_tools: None,
@@ -451,7 +451,7 @@ mod test {
             RootSubcommand::Chat(ChatArgs {
                 resume: true,
                 input: None,
-                profile: None,
+                agent: None,
                 model: None,
                 trust_all_tools: false,
                 trust_tools: None,
@@ -467,7 +467,7 @@ mod test {
             RootSubcommand::Chat(ChatArgs {
                 resume: false,
                 input: None,
-                profile: None,
+                agent: None,
                 model: None,
                 trust_all_tools: true,
                 trust_tools: None,
@@ -483,7 +483,7 @@ mod test {
             RootSubcommand::Chat(ChatArgs {
                 resume: false,
                 input: None,
-                profile: None,
+                agent: None,
                 model: None,
                 trust_all_tools: false,
                 trust_tools: Some(vec!["".to_string()]),
@@ -499,7 +499,7 @@ mod test {
             RootSubcommand::Chat(ChatArgs {
                 resume: false,
                 input: None,
-                profile: None,
+                agent: None,
                 model: None,
                 trust_all_tools: false,
                 trust_tools: Some(vec!["fs_read".to_string(), "fs_write".to_string()]),
