fix: issues from /command refactor (#273)

* fix issue, subscribe, editor

* fix tool denail

* fix default model

* typi

* fmt

Author: evanliu048

crates/chat-cli/src/cli/chat/cli/mod.rs

@@ -32,6 +32,7 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
+use crate::cli::issue;
 use crate::database::Database;
 use crate::platform::Context;
 use crate::telemetry::TelemetryThread;
@@ -52,11 +53,14 @@ pub enum SlashCommand {
     #[command(subcommand)]
     Context(ContextSubcommand),
     /// Open $EDITOR (defaults to vi) to compose a prompt
+    #[command(name = "editor")]
     PromptEditor(EditorArgs),
     /// Summarize the conversation to free up context space
     Compact(CompactArgs),
     /// View and manage tools and permissions
     Tools(ToolsArgs),
+    /// Create a new Github issue
+    Issue(issue::IssueArgs),
     /// View and retrieve prompts
     Prompts(PromptsArgs),
     /// View and manage context hooks
@@ -91,6 +95,15 @@ impl SlashCommand {
             Self::PromptEditor(args) => args.execute(session).await,
             Self::Compact(args) => args.execute(ctx, database, telemetry, session).await,
             Self::Tools(args) => args.execute(session).await,
+            Self::Issue(args) => {
+                if let Err(err) = args.execute().await {
+                    return Err(ChatError::Custom(err.to_string().into()));
+                }
+
+                Ok(ChatState::PromptUser {
+                    skip_printing_tools: true,
+                })
+            },
             Self::Prompts(args) => args.execute(session).await,
             Self::Hooks(args) => args.execute(ctx, session).await,
             Self::Usage(args) => args.execute(ctx, session).await,

crates/chat-cli/src/cli/chat/cli/model.rs

@@ -14,6 +14,7 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
+use crate::database::Database;
 
 pub struct ModelOption {
     pub name: &'static str,
@@ -35,8 +36,6 @@ pub const MODEL_OPTIONS: [ModelOption; 3] = [
     },
 ];
 
-pub const DEFAULT_MODEL_ID: &str = "CLAUDE_3_7_SONNET_20250219_V1_0";
-
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Args)]
 pub struct ModelArgs;
@@ -98,3 +97,11 @@ impl ModelArgs {
         })
     }
 }
+
+/// Currently, Sonnet 4 is set as the default model for non-FRA users.
+pub fn default_model_id(database: &Database) -> &'static str {
+    match database.get_auth_profile() {
+        Ok(Some(profile)) if profile.arn.split(':').nth(3) == Some("eu-central-1") => "CLAUDE_3_7_SONNET_20250219_V1_0",
+        _ => "CLAUDE_SONNET_4_20250514_V1_0",
+    }
+}

crates/chat-cli/src/cli/chat/cli/subscribe.rs

@@ -32,6 +32,7 @@ Need help? Visit our subscription support page> <blue!>https://docs.aws.amazon.c
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Args)]
 pub struct SubscribeArgs {
+    #[arg(long)]
     manage: bool,
 }
 

crates/chat-cli/src/cli/chat/mod.rs

@@ -124,8 +124,8 @@ use crate::auth::AuthError;
 use crate::auth::builder_id::is_idc_user;
 use crate::cli::chat::cli::SlashCommand;
 use crate::cli::chat::cli::model::{
-    DEFAULT_MODEL_ID,
     MODEL_OPTIONS,
+    default_model_id,
 };
 use crate::cli::chat::cli::prompts::GetPromptError;
 use crate::database::Database;
@@ -480,19 +480,19 @@ impl ChatSession {
         tool_config: HashMap<String, ToolSpec>,
         tool_permissions: ToolPermissions,
     ) -> Result<Self> {
-        let valid_model_id = match model_id {
-            Some(id) => Some(id),
-            None => database
-                .settings
-                .get_string(Setting::ChatDefaultModel)
-                .and_then(|model_name| {
-                    MODEL_OPTIONS
-                        .iter()
-                        .find(|opt| opt.name == model_name)
-                        .map(|opt| opt.model_id.to_owned())
-                })
-                .or_else(|| Some(DEFAULT_MODEL_ID.to_owned())),
-        };
+        let valid_model_id = model_id
+            .or_else(|| {
+                database
+                    .settings
+                    .get_string(Setting::ChatDefaultModel)
+                    .and_then(|model_name| {
+                        MODEL_OPTIONS
+                            .iter()
+                            .find(|opt| opt.name == model_name)
+                            .map(|opt| opt.model_id.to_owned())
+                    })
+            })
+            .unwrap_or_else(|| default_model_id(database).to_owned());
 
         // Reload prior conversation
         let mut existing_conversation = false;
@@ -519,7 +519,15 @@ impl ChatSession {
                 cs
             },
             false => {
-                ConversationState::new(ctx, conversation_id, tool_config, profile, tool_manager, valid_model_id).await
+                ConversationState::new(
+                    ctx,
+                    conversation_id,
+                    tool_config,
+                    profile,
+                    tool_manager,
+                    Some(valid_model_id),
+                )
+                .await
             },
         };
 
@@ -1269,17 +1277,33 @@ impl ChatSession {
             })
         } else {
             // Check for a pending tool approval
+            let tool_denied_without_reason = ["n", "N"].contains(&input);
+
             if let Some(index) = self.pending_tool_index {
                 let is_trust = ["t", "T"].contains(&input);
+                let tool_use = &mut self.tool_uses[index];
                 if ["y", "Y"].contains(&input) || is_trust {
-                    let tool_use = &mut self.tool_uses[index];
-
                     if is_trust {
                         self.tool_permissions.trust_tool(&tool_use.name);
                     }
                     tool_use.accepted = true;
 
                     return Ok(ChatState::ExecuteTools);
+                // Prompt reason if no selected
+                } else if tool_denied_without_reason {
+                    tool_use.accepted = false;
+                    execute!(
+                        self.output,
+                        style::SetForegroundColor(Color::DarkGrey),
+                        style::Print(
+                            "\nPlease provide a reason for denying this tool use, or otherwise continue your conversation:\n\n"
+                        ),
+                        style::SetForegroundColor(Color::Reset),
+                    )?;
+
+                    return Ok(ChatState::PromptUser {
+                        skip_printing_tools: true,
+                    });
                 }
             } else if !self.pending_prompts.is_empty() {
                 let prompts = self.pending_prompts.drain(0..).collect();