merge main & fix ci

Author: evanliu048

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

@@ -161,6 +161,9 @@ pub struct Agent {
     /// you configure in the mcpServers field in this config
     #[serde(default)]
     pub use_legacy_mcp_json: bool,
+    /// The model ID to use for this agent. If not specified, uses the default model.
+    #[serde(default)]
+    pub model: Option<String>,
     #[serde(skip)]
     pub path: Option<PathBuf>,
 }
@@ -181,13 +184,19 @@ impl Default for Agent {
                 set.extend(default_approve);
                 set
             },
-            resources: vec!["file://AmazonQ.md", "file://AGENTS.md", "file://README.md", "file://.amazonq/rules/**/*.md"]
-                .into_iter()
-                .map(Into::into)
-                .collect::<Vec<_>>(),
+            resources: vec![
+                "file://AmazonQ.md",
+                "file://AGENTS.md",
+                "file://README.md",
+                "file://.amazonq/rules/**/*.md",
+            ]
+            .into_iter()
+            .map(Into::into)
+            .collect::<Vec<_>>(),
             hooks: Default::default(),
             tools_settings: Default::default(),
             use_legacy_mcp_json: true,
+            model: None,
             path: None,
         }
     }
@@ -1215,6 +1224,7 @@ mod tests {
             resources: Vec::new(),
             hooks: Default::default(),
             use_legacy_mcp_json: false,
+            model: None,
             path: None,
         };
 
@@ -1285,4 +1295,62 @@ mod tests {
             label
         );
     }
+
+    #[test]
+    fn test_agent_model_field() {
+        // Test deserialization with model field
+        let agent_json = r#"{
+            "name": "test-agent",
+            "model": "claude-sonnet-4"
+        }"#;
+
+        let agent: Agent = serde_json::from_str(agent_json).expect("Failed to deserialize agent with model");
+        assert_eq!(agent.model, Some("claude-sonnet-4".to_string()));
+
+        // Test default agent has no model
+        let default_agent = Agent::default();
+        assert_eq!(default_agent.model, None);
+
+        // Test serialization includes model field
+        let agent_with_model = Agent {
+            model: Some("test-model".to_string()),
+            ..Default::default()
+        };
+        let serialized = serde_json::to_string(&agent_with_model).expect("Failed to serialize");
+        assert!(serialized.contains("\"model\":\"test-model\""));
+    }
+
+    #[test]
+    fn test_agent_model_fallback_priority() {
+        // Test that agent model is checked and falls back correctly
+        let mut agents = Agents::default();
+
+        // Create agent with unavailable model
+        let agent_with_invalid_model = Agent {
+            name: "test-agent".to_string(),
+            model: Some("unavailable-model".to_string()),
+            ..Default::default()
+        };
+
+        agents.agents.insert("test-agent".to_string(), agent_with_invalid_model);
+        agents.active_idx = "test-agent".to_string();
+
+        // Verify the agent has the model set
+        assert_eq!(
+            agents.get_active().and_then(|a| a.model.as_ref()),
+            Some(&"unavailable-model".to_string())
+        );
+
+        // Test agent without model
+        let agent_without_model = Agent {
+            name: "no-model-agent".to_string(),
+            model: None,
+            ..Default::default()
+        };
+
+        agents.agents.insert("no-model-agent".to_string(), agent_without_model);
+        agents.active_idx = "no-model-agent".to_string();
+
+        assert_eq!(agents.get_active().and_then(|a| a.model.as_ref()), None);
+    }
 }

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

@@ -43,6 +43,7 @@ use clap::{
 };
 use cli::compact::CompactStrategy;
 use cli::model::{
+    find_model,
     get_available_models,
     select_model,
 };
@@ -142,7 +143,6 @@ use crate::cli::TodoListState;
 use crate::cli::agent::Agents;
 use crate::cli::chat::cli::SlashCommand;
 use crate::cli::chat::cli::editor::open_editor;
-use crate::cli::chat::cli::model::find_model;
 use crate::cli::chat::cli::prompts::{
     GetPromptError,
     PromptsSubcommand,
@@ -354,7 +354,19 @@ impl ChatArgs {
         // If modelId is specified, verify it exists before starting the chat
         // Otherwise, CLI will use a default model when starting chat
         let (models, default_model_opt) = get_available_models(os).await?;
+        // Fallback logic: try user's saved default, then system default
+        let fallback_model_id = || {
+            if let Some(saved) = os.database.settings.get_string(Setting::ChatDefaultModel) {
+                find_model(&models, &saved)
+                    .map(|m| m.model_id.clone())
+                    .or(Some(default_model_opt.model_id.clone()))
+            } else {
+                Some(default_model_opt.model_id.clone())
+            }
+        };
+
         let model_id: Option<String> = if let Some(requested) = self.model.as_ref() {
+            // CLI argument takes highest priority
             if let Some(m) = find_model(&models, requested) {
                 Some(m.model_id.clone())
             } else {
@@ -365,12 +377,26 @@ impl ChatArgs {
                     .join(", ");
                 bail!("Model '{}' does not exist. Available models: {}", requested, available);
             }
-        } else if let Some(saved) = os.database.settings.get_string(Setting::ChatDefaultModel) {
-            find_model(&models, &saved)
-                .map(|m| m.model_id.clone())
-                .or(Some(default_model_opt.model_id.clone()))
+        } else if let Some(agent_model) = agents.get_active().and_then(|a| a.model.as_ref()) {
+            // Agent model takes second priority
+            if let Some(m) = find_model(&models, agent_model) {
+                Some(m.model_id.clone())
+            } else {
+                let _ = execute!(
+                    stderr,
+                    style::SetForegroundColor(Color::Yellow),
+                    style::Print("WARNING: "),
+                    style::SetForegroundColor(Color::Reset),
+                    style::Print("Agent specifies model '"),
+                    style::SetForegroundColor(Color::Cyan),
+                    style::Print(agent_model),
+                    style::SetForegroundColor(Color::Reset),
+                    style::Print("' which is not available. Falling back to configured defaults.\n"),
+                );
+                fallback_model_id()
+            }
         } else {
-            Some(default_model_opt.model_id.clone())
+            fallback_model_id()
         };
 
         let (prompt_request_sender, prompt_request_receiver) = tokio::sync::broadcast::channel::<PromptQuery>(5);
@@ -3346,6 +3372,7 @@ mod tests {
             tool_config,
             true,
             false,
+            None,
         )
         .await
         .unwrap()
@@ -3586,6 +3613,7 @@ mod tests {
             tool_config,
             true,
             false,
+            None,
         )
         .await
         .unwrap()
@@ -3661,6 +3689,7 @@ mod tests {
             tool_config,
             true,
             false,
+            None,
         )
         .await
         .unwrap()
@@ -3712,6 +3741,7 @@ mod tests {
             tool_config,
             true,
             false,
+            None,
         )
         .await
         .unwrap()

crates/chat-cli/src/util/directories.rs

@@ -193,7 +193,11 @@ pub fn canonicalizes_path(os: &Os, path_as_str: &str) -> Result<String> {
 /// patterns to exist in a globset.
 pub fn add_gitignore_globs(builder: &mut GlobSetBuilder, path: &str) -> Result<()> {
     let glob_for_file = Glob::new(path)?;
-    let glob_for_dir = Glob::new(&format!("{path}/**"))?;
+
+    // remove existing slash in path so we don't end up with double slash
+    // Glob doesn't normalize the path so it doesn't work with double slash
+    let dir_pattern: String = format!("{}/**", path.trim_end_matches('/'));
+    let glob_for_dir = Glob::new(&dir_pattern)?;
 
     builder.add(glob_for_file);
     builder.add(glob_for_dir);
@@ -278,6 +282,40 @@ mod linux_tests {
         assert!(logs_dir().is_ok());
         assert!(settings_path().is_ok());
     }
+
+    #[test]
+    fn test_add_gitignore_globs() {
+        let direct_file = "/home/user/a.txt";
+        let nested_file = "/home/user/folder/a.txt";
+        let other_file = "/home/admin/a.txt";
+
+        // Case 1: Path with trailing slash
+        let mut builder1 = GlobSetBuilder::new();
+        add_gitignore_globs(&mut builder1, "/home/user/").unwrap();
+        let globset1 = builder1.build().unwrap();
+
+        assert!(globset1.is_match(direct_file));
+        assert!(globset1.is_match(nested_file));
+        assert!(!globset1.is_match(other_file));
+
+        // Case 2: Path without trailing slash - should behave same as case 1
+        let mut builder2 = GlobSetBuilder::new();
+        add_gitignore_globs(&mut builder2, "/home/user").unwrap();
+        let globset2 = builder2.build().unwrap();
+
+        assert!(globset2.is_match(direct_file));
+        assert!(globset2.is_match(nested_file));
+        assert!(!globset1.is_match(other_file));
+
+        // Case 3: File path - should only match exact file
+        let mut builder3 = GlobSetBuilder::new();
+        add_gitignore_globs(&mut builder3, "/home/user/a.txt").unwrap();
+        let globset3 = builder3.build().unwrap();
+
+        assert!(globset3.is_match(direct_file));
+        assert!(!globset3.is_match(nested_file));
+        assert!(!globset1.is_match(other_file));
+    }
 }
 
 // TODO(grant): Add back path tests on linux

docs/agent-format.md

@@ -2,6 +2,9 @@
 
 The agent configuration file for each agent is a JSON file. The filename (without the `.json` extension) becomes the agent's name. It contains configuration needed to instantiate and run the agent.
 
+> [!TIP]
+> We recommend using the `/agent generate` slash command within your active Q session to intelligently generate your agent configuration with the help of Q.
+
 Every agent configuration file can include the following sections:
 
 - [`name`](#name-field) — The name of the agent (optional, derived from filename if not specified).
@@ -15,6 +18,7 @@ Every agent configuration file can include the following sections:
 - [`resources`](#resources-field) — Resources available to the agent.
 - [`hooks`](#hooks-field) — Commands run at specific trigger points.
 - [`useLegacyMcpJson`](#uselegacymcpjson-field) — Whether to include legacy MCP configuration.
+- [`model`](#model-field) — The model ID to use for this agent.
 
 ## Name Field
 
@@ -290,6 +294,20 @@ The `useLegacyMcpJson` field determines whether to include MCP servers defined i
 
 When set to `true`, the agent will have access to all MCP servers defined in the global and local configurations in addition to those defined in the agent's `mcpServers` field.
 
+## Model Field
+
+The `model` field specifies the model ID to use for this agent. If not specified, the agent will use the default model.
+
+```json
+{
+  "model": "claude-sonnet-4"
+}
+```
+
+The model ID must match one of the available models returned by the Q CLI's model service. You can see available models by using the `/model` command in an active chat session.
+
+If the specified model is not available, the agent will fall back to the default model and display a warning.
+
 ## Complete Example
 
 Here's a complete example of an agent configuration file:
@@ -348,6 +366,7 @@ Here's a complete example of an agent configuration file:
       }
     ]
   },
-  "useLegacyMcpJson": true
+  "useLegacyMcpJson": true,
+  "model": "claude-sonnet-4"
 }
 ```

docs/knowledge-management.md

@@ -2,7 +2,8 @@
 
 The /knowledge command provides persistent knowledge base functionality for Amazon Q CLI, allowing you to store, search, and manage contextual information that persists across chat sessions.
 
-> Note: This is a beta feature that must be enabled before use.
+> [!NOTE]
+> This is a beta feature that must be enabled before use.
 
 ## Getting Started
 

schemas/agent-v1.json

@@ -159,6 +159,14 @@
       "description": "Whether or not to include the legacy ~/.aws/amazonq/mcp.json in the agent\nYou can reference tools brought in by these servers as just as you would with the servers\nyou configure in the mcpServers field in this config",
       "type": "boolean",
       "default": false
+    },
+    "model": {
+      "description": "The model ID to use for this agent. If not specified, uses the default model.",
+      "type": [
+        "string",
+        "null"
+      ],
+      "default": null
     }
   },
   "additionalProperties": false,