merge with main

Author: evanliu048

.github/CODEOWNERS

@@ -0,0 +1 @@
+schemas/ @chaynabors

Cargo.lock

@@ -8,7 +8,7 @@ authors = ["Amazon Q CLI Team ([email protected])", "Chay Nabors (nabochay@amazon
 edition = "2024"
 homepage = "https://aws.amazon.com/q/"
 publish = false
-version = "1.12.4"
+version = "1.13.2"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
@@ -92,7 +92,7 @@ security-framework = "3.2.0"
 semantic_search_client = { path = "crates/semantic-search-client" }
 semver = { version = "1.0.26", features = ["serde"] }
 serde = { version = "1.0.219", features = ["derive", "rc"] }
-serde_json = "1.0.140"
+serde_json = { version = "1.0.140", features = ["preserve_order"] }
 sha2 = "0.10.9"
 shell-color = "1.0.0"
 shell-words = "1.1.0"

Cargo.toml

@@ -303,6 +303,20 @@ impl BuilderIdToken {
 
     /// Load the token from the keychain, refresh the token if it is expired and return it
     pub async fn load(database: &Database) -> Result<Option<Self>, AuthError> {
+        // Can't use #[cfg(test)] without breaking lints, and we don't want to require
+        // authentication in order to run ChatSession tests. Hence, adding this here with cfg!(test)
+        if cfg!(test) {
+            return Ok(Some(Self {
+                access_token: Secret("test_access_token".to_string()),
+                expires_at: time::OffsetDateTime::now_utc() + time::Duration::minutes(60),
+                refresh_token: Some(Secret("test_refresh_token".to_string())),
+                region: Some(OIDC_BUILDER_ID_REGION.to_string()),
+                start_url: Some(START_URL.to_string()),
+                oauth_flow: OAuthFlow::DeviceCode,
+                scopes: Some(SCOPES.iter().map(|s| (*s).to_owned()).collect()),
+            }));
+        }
+
         trace!("loading builder id token from the secret store");
         match database.get_secret(Self::SECRET_KEY).await {
             Ok(Some(secret)) => {

crates/chat-cli/src/auth/builder_id.rs

@@ -32,6 +32,18 @@ impl Display for HookTrigger {
     }
 }
 
+#[derive(Debug, Clone, Deserialize, Eq, PartialEq, Hash)]
+pub enum Source {
+    Agent,
+    Session,
+}
+
+impl Default for Source {
+    fn default() -> Self {
+        Self::Agent
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, JsonSchema, Hash)]
 pub struct Hook {
     /// The command to run when the hook is triggered
@@ -48,15 +60,20 @@ pub struct Hook {
     /// How long the hook output is cached before it will be executed again
     #[serde(default = "Hook::default_cache_ttl_seconds")]
     pub cache_ttl_seconds: u64,
+
+    #[schemars(skip)]
+    #[serde(default, skip_serializing)]
+    pub source: Source,
 }
 
 impl Hook {
-    pub fn new(command: String) -> Self {
+    pub fn new(command: String, source: Source) -> Self {
         Self {
             command,
             timeout_ms: Self::default_timeout_ms(),
             max_output_size: Self::default_max_output_size(),
             cache_ttl_seconds: Self::default_cache_ttl_seconds(),
+            source,
         }
     }
 

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

@@ -80,6 +80,7 @@ impl From<LegacyHook> for Option<Hook> {
             timeout_ms: value.timeout_ms,
             max_output_size: value.max_output_size,
             cache_ttl_seconds: value.cache_ttl_seconds,
+            source: Default::default(),
         })
     }
 }

crates/chat-cli/src/cli/agent/legacy/hooks.rs

@@ -25,9 +25,9 @@ use crate::util::directories;
 ///
 /// Returns [Some] with the newly migrated agents if the migration was performed, [None] if the
 /// migration was already done previously.
-pub async fn migrate(os: &mut Os) -> eyre::Result<Option<Vec<Agent>>> {
+pub async fn migrate(os: &mut Os, force: bool) -> eyre::Result<Option<Vec<Agent>>> {
     let has_migrated = os.database.get_has_migrated()?;
-    if has_migrated.is_some_and(|has_migrated| has_migrated) {
+    if !force && has_migrated.is_some_and(|has_migrated| has_migrated) {
         return Ok(None);
     }
 
@@ -102,22 +102,27 @@ pub async fn migrate(os: &mut Os) -> eyre::Result<Option<Vec<Agent>>> {
     }
 
     let labels = vec!["Yes", "No"];
-    let selection: Option<_> = match Select::with_theme(&crate::util::dialoguer_theme())
-        .with_prompt("Legacy profiles detected. Would you like to migrate them?")
-        .items(&labels)
-        .default(1)
-        .interact_on_opt(&dialoguer::console::Term::stdout())
-    {
-        Ok(sel) => {
-            let _ = crossterm::execute!(
-                std::io::stdout(),
-                crossterm::style::SetForegroundColor(crossterm::style::Color::Magenta)
-            );
-            sel
-        },
-        // Ctrl‑C -> Err(Interrupted)
-        Err(dialoguer::Error::IO(ref e)) if e.kind() == std::io::ErrorKind::Interrupted => None,
-        Err(e) => bail!("Failed to choose an option: {e}"),
+    let selection: Option<_> = if !force {
+        match Select::with_theme(&crate::util::dialoguer_theme())
+            .with_prompt("Legacy profiles detected. Would you like to migrate them?")
+            .items(&labels)
+            .default(1)
+            .interact_on_opt(&dialoguer::console::Term::stdout())
+        {
+            Ok(sel) => {
+                let _ = crossterm::execute!(
+                    std::io::stdout(),
+                    crossterm::style::SetForegroundColor(crossterm::style::Color::Magenta)
+                );
+                sel
+            },
+            // Ctrl‑C -> Err(Interrupted)
+            Err(dialoguer::Error::IO(ref e)) if e.kind() == std::io::ErrorKind::Interrupted => None,
+            Err(e) => bail!("Failed to choose an option: {e}"),
+        }
+    } else {
+        // Yes
+        Some(0)
     };
 
     if selection.is_none() || selection == Some(1) {

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

@@ -71,6 +71,8 @@ use crate::util::{
     directories,
 };
 
+pub const DEFAULT_AGENT_NAME: &str = "q_cli_default";
+
 #[derive(Debug, Error)]
 pub enum AgentConfigError {
     #[error("Json supplied at {} is invalid: {}", path.display(), error)]
@@ -86,8 +88,6 @@ pub enum AgentConfigError {
     Directories(#[from] util::directories::DirectoryError),
     #[error("Encountered io error: {0}")]
     Io(#[from] std::io::Error),
-    #[error("Agent path missing file name")]
-    MissingFilename,
     #[error("Failed to parse legacy mcp config: {0}")]
     BadLegacyMcpConfig(#[from] eyre::Report),
 }
@@ -120,14 +120,14 @@ pub enum AgentConfigError {
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[schemars(description = "An Agent is a declarative way of configuring a given instance of q chat.")]
 pub struct Agent {
-    /// Agent names are derived from the file name. Thus they are skipped for
-    /// serializing
-    #[serde(skip)]
+    #[serde(rename = "$schema", default = "default_schema")]
+    pub schema: String,
+    /// Name of the agent
     pub name: String,
     /// This field is not model facing and is mostly here for users to discern between agents
     #[serde(default)]
     pub description: Option<String>,
-    /// (NOT YET IMPLEMENTED) The intention for this field is to provide high level context to the
+    /// The intention for this field is to provide high level context to the
     /// agent. This should be seen as the same category of context as a system prompt.
     #[serde(default)]
     pub prompt: Option<String>,
@@ -168,7 +168,8 @@ pub struct Agent {
 impl Default for Agent {
     fn default() -> Self {
         Self {
-            name: "default".to_string(),
+            schema: default_schema(),
+            name: DEFAULT_AGENT_NAME.to_string(),
             description: Some("Default agent".to_string()),
             prompt: Default::default(),
             mcp_servers: Default::default(),
@@ -206,18 +207,10 @@ impl Agent {
 
     /// This function mutates the agent to a state that is usable for runtime.
     /// Practically this means to convert some of the fields value to their usable counterpart.
-    /// For example, we populate the agent with its file name, convert the mcp array to actual
-    /// mcp config and populate the agent file path.
+    /// For example, converting the mcp array to actual mcp config and populate the agent file path.
     fn thaw(&mut self, path: &Path, global_mcp_config: Option<&McpServerConfig>) -> Result<(), AgentConfigError> {
         let Self { mcp_servers, .. } = self;
 
-        let name = path
-            .file_stem()
-            .ok_or(AgentConfigError::MissingFilename)?
-            .to_string_lossy()
-            .to_string();
-
-        self.name = name.clone();
         self.path = Some(path.to_path_buf());
 
         if let (true, Some(global_mcp_config)) = (self.use_legacy_mcp_json, global_mcp_config) {
@@ -259,7 +252,7 @@ impl Agent {
     pub async fn get_agent_by_name(os: &Os, agent_name: &str) -> eyre::Result<(Agent, PathBuf)> {
         let config_path: Result<PathBuf, PathBuf> = 'config: {
             // local first, and then fall back to looking at global
-            let local_config_dir = directories::chat_local_agent_dir()?.join(format!("{agent_name}.json"));
+            let local_config_dir = directories::chat_local_agent_dir(os)?.join(format!("{agent_name}.json"));
             if os.fs.exists(&local_config_dir) {
                 break 'config Ok(local_config_dir);
             }
@@ -397,7 +390,7 @@ impl Agents {
         };
 
         let new_agents = if !skip_migration {
-            match legacy::migrate(os).await {
+            match legacy::migrate(os, false).await {
                 Ok(Some(new_agents)) => {
                     let migrated_count = new_agents.len();
                     info!(migrated_count, "Profile migration successful");
@@ -431,7 +424,7 @@ impl Agents {
                 },
             }
 
-            let Ok(path) = directories::chat_local_agent_dir() else {
+            let Ok(path) = directories::chat_local_agent_dir(os) else {
                 break 'local Vec::<Agent>::new();
             };
             let Ok(files) = os.fs.read_dir(path).await else {
@@ -641,7 +634,7 @@ impl Agents {
                 agent
             });
 
-            "default".to_string()
+            DEFAULT_AGENT_NAME.to_string()
         };
 
         let _ = output.flush();
@@ -707,7 +700,7 @@ impl Agents {
                 // Here the tool names can take the following forms:
                 // - @{server_name}{delimiter}{tool_name}
                 // - native_tool_name
-                name == tool_name
+                name == tool_name && matches!(origin, &ToolOrigin::Native)
                     || name.strip_prefix("@").is_some_and(|remainder| {
                         remainder
                             .split_once(MCP_SERVER_TOOL_DELIMITER)
@@ -776,6 +769,10 @@ async fn load_agents_from_entries(
     res
 }
 
+fn default_schema() -> String {
+    "https://raw.githubusercontent.com/aws/amazon-q-developer-cli/refs/heads/main/schemas/agent-v1.json".into()
+}
+
 #[cfg(test)]
 fn validate_agent_name(name: &str) -> eyre::Result<()> {
     // Check if name is empty
@@ -800,6 +797,7 @@ mod tests {
 
     const INPUT: &str = r#"
             {
+              "name": "some_agent",
               "description": "My developer agent is used for small development tasks like solving open issues.",
               "prompt": "You are a principal developer who uses multiple agents to accomplish difficult engineering tasks",
               "mcpServers": {
@@ -841,11 +839,12 @@ mod tests {
         assert!(collection.get_active().is_none());
 
         let agent = Agent::default();
-        collection.agents.insert("default".to_string(), agent);
-        collection.active_idx = "default".to_string();
+        let agent_name = agent.name.clone();
+        collection.agents.insert(agent_name.clone(), agent);
+        collection.active_idx = agent_name.clone();
 
         assert!(collection.get_active().is_some());
-        assert_eq!(collection.get_active().unwrap().name, "default");
+        assert_eq!(collection.get_active().unwrap().name, agent_name);
     }
 
     #[test]