More tests and cleanup

Author: brandonskiser

crates/agent/src/agent/agent_config/definitions.rs

@@ -9,7 +9,8 @@ use serde::{
     Serialize,
 };
 
-use crate::agent::consts::BUILTIN_VIBER_AGENT_NAME;
+use super::types::ResourcePath;
+use crate::agent::consts::DEFAULT_AGENT_NAME;
 use crate::agent::tools::BuiltInToolName;
 
 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
@@ -69,9 +70,10 @@ impl Config {
         }
     }
 
-    pub fn resources(&self) -> &Vec<String> {
+    // pub fn resources(&self) -> &[impl AsRef<str>] {
+    pub fn resources(&self) -> &[impl AsRef<str>] {
         match self {
-            Config::V2025_08_22(a) => &a.resources,
+            Config::V2025_08_22(a) => a.resources.as_slice(),
         }
     }
 
@@ -150,7 +152,7 @@ pub struct AgentConfigV2025_08_22 {
     // context files
     /// Files to include in the agent's context
     #[serde(default)]
-    pub resources: Vec<String>,
+    pub resources: Vec<ResourcePath>,
 
     // permissioning stuff
     /// List of tools the agent is explicitly allowed to use
@@ -162,9 +164,9 @@ impl Default for AgentConfigV2025_08_22 {
     fn default() -> Self {
         Self {
             schema: default_schema(),
-            name: BUILTIN_VIBER_AGENT_NAME.to_string(),
+            name: DEFAULT_AGENT_NAME.to_string(),
             description: Some("The default agent for Q CLI".to_string()),
-            system_prompt: Some("You are Q, an expert programmer dedicated to becoming the greatest vibe-coding assistant in the world.".to_string()),
+            system_prompt: None,
             tools: vec!["@builtin".to_string()],
             tool_settings: Default::default(),
             tool_aliases: Default::default(),
@@ -174,7 +176,16 @@ impl Default for AgentConfigV2025_08_22 {
             mcp_servers: Default::default(),
             use_legacy_mcp_json: false,
 
-            resources: Default::default(),
+            resources: vec![
+                "file://AmazonQ.md",
+                "file://AGENTS.md",
+                "file://README.md",
+                "file://.amazonq/rules/**/*.md",
+            ]
+            .into_iter()
+            .map(Into::into)
+            .collect::<Vec<_>>(),
+
             allowed_tools: HashSet::from([BuiltInToolName::FsRead.to_string()]),
         }
     }

crates/agent/src/agent/agent_config/mod.rs

@@ -1,5 +1,6 @@
 pub mod definitions;
 pub mod parse;
+pub mod types;
 
 use std::collections::{
     HashMap,
@@ -43,19 +44,19 @@ use crate::agent::util::error::{
     UtilError,
 };
 
-/// Represents an agent config
+/// Represents an agent config.
 ///
-/// Wraps [Config] along with some metadata
+/// Basically just wraps [Config] along with some metadata.
 #[derive(Debug, Clone)]
-pub struct AgentConfig {
+pub struct LoadedAgentConfig {
     /// Where the config was sourced from
     #[allow(dead_code)]
     source: ConfigSource,
     /// The actual config content
     config: Config,
 }
 
-impl AgentConfig {
+impl LoadedAgentConfig {
     pub fn config(&self) -> &Config {
         &self.config
     }
@@ -84,7 +85,7 @@ impl AgentConfig {
         self.config.hooks()
     }
 
-    pub fn resources(&self) -> &Vec<String> {
+    pub fn resources(&self) -> &[impl AsRef<str>] {
         self.config.resources()
     }
 }
@@ -103,7 +104,7 @@ pub enum ConfigSource {
     BuiltIn,
 }
 
-impl Default for AgentConfig {
+impl Default for LoadedAgentConfig {
     fn default() -> Self {
         Self {
             source: ConfigSource::BuiltIn,
@@ -112,7 +113,7 @@ impl Default for AgentConfig {
     }
 }
 
-impl AgentConfig {
+impl LoadedAgentConfig {
     pub fn system_prompt(&self) -> Option<&str> {
         self.config.system_prompt()
     }
@@ -136,7 +137,7 @@ impl From<UtilError> for AgentConfigError {
     }
 }
 
-pub async fn load_agents() -> Result<(Vec<AgentConfig>, Vec<AgentConfigError>)> {
+pub async fn load_agents() -> Result<(Vec<LoadedAgentConfig>, Vec<AgentConfigError>)> {
     let mut agent_configs = Vec::new();
     let mut invalid_agents = Vec::new();
     match load_workspace_agents().await {
@@ -148,7 +149,7 @@ pub async fn load_agents() -> Result<(Vec<AgentConfig>, Vec<AgentConfigError>)>
             agent_configs.append(
                 &mut valid
                     .into_iter()
-                    .map(|(path, config)| AgentConfig {
+                    .map(|(path, config)| LoadedAgentConfig {
                         source: ConfigSource::Workspace { path },
                         config,
                     })
@@ -169,7 +170,7 @@ pub async fn load_agents() -> Result<(Vec<AgentConfig>, Vec<AgentConfigError>)>
             agent_configs.append(
                 &mut valid
                     .into_iter()
-                    .map(|(path, config)| AgentConfig {
+                    .map(|(path, config)| LoadedAgentConfig {
                         source: ConfigSource::Global { path },
                         config,
                     })
@@ -182,7 +183,7 @@ pub async fn load_agents() -> Result<(Vec<AgentConfig>, Vec<AgentConfigError>)>
     };
 
     // Always include the default agent as a fallback.
-    agent_configs.push(AgentConfig::default());
+    agent_configs.push(LoadedAgentConfig::default());
 
     info!(?agent_configs, "loaded agent config");
 

crates/agent/src/agent/agent_config/types.rs

@@ -0,0 +1,47 @@
+use std::borrow::Borrow;
+use std::ops::Deref;
+
+use schemars::JsonSchema;
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, Hash, PartialEq, JsonSchema)]
+pub struct ResourcePath(
+    // You can extend this list via "|". e.g. r"^(file://|database://)"
+    #[schemars(regex(pattern = r"^(file://)"))]
+    String,
+);
+
+impl Deref for ResourcePath {
+    type Target = String;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl AsRef<str> for ResourcePath {
+    fn as_ref(&self) -> &str {
+        self.0.as_str()
+    }
+}
+
+impl Borrow<str> for ResourcePath {
+    fn borrow(&self) -> &str {
+        self.0.as_str()
+    }
+}
+
+impl From<&str> for ResourcePath {
+    fn from(value: &str) -> Self {
+        Self(value.to_string())
+    }
+}
+
+impl From<String> for ResourcePath {
+    fn from(value: String) -> Self {
+        Self(value)
+    }
+}

crates/agent/src/agent/agent_loop/mod.rs

@@ -3,6 +3,7 @@ pub mod protocol;
 pub mod types;
 
 use std::pin::Pin;
+use std::sync::Arc;
 use std::time::Instant;
 
 use chrono::Utc;
@@ -236,6 +237,7 @@ impl AgentLoop {
                         } else {
                             // For successful streams with no tool uses, this always ends a user turn.
                             loop_events.push(self.set_execution_state(LoopState::UserTurnEnded));
+                            self.loop_end_time = Some(Instant::now());
                             loop_events.push(AgentLoopEventKind::UserTurnEnd(self.make_user_turn_metadata()));
                         }
                     } else {
@@ -268,9 +270,6 @@ impl AgentLoop {
                 match self.execution_state {
                     LoopState::Idle | LoopState::Errored | LoopState::PendingToolUseResults => {},
                     LoopState::UserTurnEnded => {},
-                    // LoopState::UserTurnEnded => {
-                    //     return Err(AgentLoopResponseError::AgentLoopExited);
-                    // },
                     other => {
                         error!(
                             ?other,
@@ -314,6 +313,7 @@ impl AgentLoop {
                     self.stream_states.push(parse_state);
                 }
 
+                self.loop_end_time = Some(Instant::now());
                 let metadata = self.make_user_turn_metadata();
                 buf.push(self.set_execution_state(LoopState::UserTurnEnded));
                 buf.push(AgentLoopEventKind::UserTurnEnd(metadata.clone()));
@@ -642,16 +642,13 @@ impl AgentLoopHandle {
         self.loop_event_rx.recv().await
     }
 
-    pub async fn send_request<M: Model>(
+    pub async fn send_request(
         &mut self,
-        model: M,
+        model: Arc<dyn Model>,
         args: SendRequestArgs,
     ) -> Result<AgentLoopResponse, AgentLoopResponseError> {
         self.sender
-            .send_recv(AgentLoopRequest::SendRequest {
-                model: Box::new(model),
-                args,
-            })
+            .send_recv(AgentLoopRequest::SendRequest { model, args })
             .await
             .unwrap_or(Err(AgentLoopResponseError::AgentLoopExited))
     }

crates/agent/src/agent/agent_loop/model.rs

@@ -27,6 +27,14 @@ pub trait Model: std::fmt::Debug + Send + Sync + 'static {
         system_prompt: Option<String>,
         cancel_token: CancellationToken,
     ) -> Pin<Box<dyn Stream<Item = Result<StreamEvent, StreamError>> + Send + 'static>>;
+
+    /// Dump serializable state required by the model implementation.
+    ///
+    /// This is intended to provide the ability to save and restore state
+    /// associated with an implementation, useful for restoring a previous conversation.
+    fn state(&self) -> Option<serde_json::Value> {
+        None
+    }
 }
 
 /// The supported backends

crates/agent/src/agent/agent_loop/protocol.rs

@@ -1,3 +1,4 @@
+use std::sync::Arc;
 use std::time::Duration;
 
 use chrono::{
@@ -29,7 +30,7 @@ use super::{
 pub enum AgentLoopRequest {
     GetExecutionState,
     SendRequest {
-        model: Box<dyn Model>,
+        model: Arc<dyn Model>,
         args: SendRequestArgs,
     },
     /// Ends the agent loop
@@ -212,7 +213,7 @@ pub struct UserTurnMetadata {
 }
 
 /// The reason why a user turn ended
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum EndReason {
     /// Loop ended before handling any requests
     DidNotRun,

crates/agent/src/agent/consts.rs

@@ -1,6 +1,5 @@
 /// Name of the default agent.
-pub const BUILTIN_VIBER_AGENT_NAME: &str = "cli_default";
-pub const BUILTIN_PLANNER_AGENT_NAME: &str = "cli_planner";
+pub const DEFAULT_AGENT_NAME: &str = "q_cli_default";
 
 pub const MAX_CONVERSATION_STATE_HISTORY_LEN: usize = 500;