Merge remote-tracking branch 'origin/main' into bskiser/add-experimental-model

brandonskiser · brandonskiser · commit 39cec188006d · 2025-08-04T17:08:52.000-07:00
diff --git a/crates/chat-cli/src/cli/agent/hook.rs b/crates/chat-cli/src/cli/agent/hook.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,
         }
     }
 
diff --git a/crates/chat-cli/src/cli/agent/legacy/hooks.rs b/crates/chat-cli/src/cli/agent/legacy/hooks.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(),
         })
     }
 }
diff --git a/crates/chat-cli/src/cli/chat/cli/context.rs b/crates/chat-cli/src/cli/chat/cli/context.rs
@@ -11,7 +11,10 @@ use crossterm::{
 };
 
 use crate::cli::chat::consts::AGENT_FORMAT_HOOKS_DOC_URL;
-use crate::cli::chat::context::calc_max_context_files_size;
+use crate::cli::chat::context::{
+    ContextFilePath,
+    calc_max_context_files_size,
+};
 use crate::cli::chat::token_counter::TokenCounter;
 use crate::cli::chat::util::drop_matched_context_files;
 use crate::cli::chat::{
@@ -80,26 +83,77 @@ impl ContextSubcommand {
 
         match self {
             Self::Show { expand } => {
-                let profile_context_files = HashSet::<(String, String)>::new();
+                // the bool signifies if the resources is temporary (i.e. is it session based as
+                // opposed to agent based)
+                let mut profile_context_files = HashSet::<(String, String, bool)>::new();
+
+                let (agent_owned_list, session_owned_list) = context_manager
+                    .paths
+                    .iter()
+                    .partition::<Vec<_>, _>(|p| matches!(**p, ContextFilePath::Agent(_)));
+
+                execute!(
+                    session.stderr,
+                    style::SetAttribute(Attribute::Bold),
+                    style::SetForegroundColor(Color::Magenta),
+                    style::Print(format!("👤 Agent ({}):\n", context_manager.current_profile)),
+                    style::SetAttribute(Attribute::Reset),
+                )?;
+
+                if agent_owned_list.is_empty() {
+                    execute!(
+                        session.stderr,
+                        style::SetForegroundColor(Color::DarkGrey),
+                        style::Print("    <none>\n\n"),
+                        style::SetForegroundColor(Color::Reset)
+                    )?;
+                } else {
+                    for path in &agent_owned_list {
+                        execute!(session.stderr, style::Print(format!("    {} ", path.get_path_as_str())))?;
+                        if let Ok(context_files) = context_manager
+                            .get_context_files_by_path(os, path.get_path_as_str())
+                            .await
+                        {
+                            execute!(
+                                session.stderr,
+                                style::SetForegroundColor(Color::Green),
+                                style::Print(format!(
+                                    "({} match{})",
+                                    context_files.len(),
+                                    if context_files.len() == 1 { "" } else { "es" }
+                                )),
+                                style::SetForegroundColor(Color::Reset)
+                            )?;
+                            profile_context_files
+                                .extend(context_files.into_iter().map(|(path, content)| (path, content, false)));
+                        }
+                        execute!(session.stderr, style::Print("\n"))?;
+                    }
+                    execute!(session.stderr, style::Print("\n"))?;
+                }
+
                 execute!(
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
                     style::SetForegroundColor(Color::Magenta),
-                    style::Print(format!("\n👤 Agent ({}):\n", context_manager.current_profile)),
+                    style::Print("💬 Session (temporary):\n"),
                     style::SetAttribute(Attribute::Reset),
                 )?;
 
-                if context_manager.paths.is_empty() {
+                if session_owned_list.is_empty() {
                     execute!(
                         session.stderr,
                         style::SetForegroundColor(Color::DarkGrey),
                         style::Print("    <none>\n\n"),
                         style::SetForegroundColor(Color::Reset)
                     )?;
                 } else {
-                    for path in &context_manager.paths {
-                        execute!(session.stderr, style::Print(format!("    {} ", path)))?;
-                        if let Ok(context_files) = context_manager.get_context_files_by_path(os, path).await {
+                    for path in &session_owned_list {
+                        execute!(session.stderr, style::Print(format!("    {} ", path.get_path_as_str())))?;
+                        if let Ok(context_files) = context_manager
+                            .get_context_files_by_path(os, path.get_path_as_str())
+                            .await
+                        {
                             execute!(
                                 session.stderr,
                                 style::SetForegroundColor(Color::Green),
@@ -110,6 +164,8 @@ impl ContextSubcommand {
                                 )),
                                 style::SetForegroundColor(Color::Reset)
                             )?;
+                            profile_context_files
+                                .extend(context_files.into_iter().map(|(path, content)| (path, content, true)));
                         }
                         execute!(session.stderr, style::Print("\n"))?;
                     }
@@ -127,7 +183,7 @@ impl ContextSubcommand {
                     let total = profile_context_files.len();
                     let total_tokens = profile_context_files
                         .iter()
-                        .map(|(_, content)| TokenCounter::count_tokens(content))
+                        .map(|(_, content, _)| TokenCounter::count_tokens(content))
                         .sum::<usize>();
                     execute!(
                         session.stderr,
@@ -142,11 +198,12 @@ impl ContextSubcommand {
                         style::SetAttribute(Attribute::Reset)
                     )?;
 
-                    for (filename, content) in &profile_context_files {
+                    for (filename, content, is_temporary) in &profile_context_files {
                         let est_tokens = TokenCounter::count_tokens(content);
+                        let icon = if *is_temporary { "💬" } else { "👤" };
                         execute!(
                             session.stderr,
-                            style::Print(format!("👤 {} ", filename)),
+                            style::Print(format!("{} {} ", icon, filename)),
                             style::SetForegroundColor(Color::DarkGrey),
                             style::Print(format!("(~{} tkns)\n", est_tokens)),
                             style::SetForegroundColor(Color::Reset),
@@ -166,7 +223,10 @@ impl ContextSubcommand {
                     }
 
                     let context_files_max_size = calc_max_context_files_size(session.conversation.model.as_deref());
-                    let mut files_as_vec = profile_context_files.iter().cloned().collect::<Vec<_>>();
+                    let mut files_as_vec = profile_context_files
+                        .iter()
+                        .map(|(path, content, _)| (path.clone(), content.clone()))
+                        .collect::<Vec<_>>();
                     let dropped_files = drop_matched_context_files(&mut files_as_vec, context_files_max_size).ok();
 
                     execute!(
@@ -239,7 +299,8 @@ impl ContextSubcommand {
                     execute!(
                         session.stderr,
                         style::SetForegroundColor(Color::Green),
-                        style::Print(format!("\nAdded {} path(s) to context.\n\n", paths.len())),
+                        style::Print(format!("\nAdded {} path(s) to context.\n", paths.len())),
+                        style::Print("Note: Context modifications via slash command is temporary.\n\n"),
                         style::SetForegroundColor(Color::Reset)
                     )?;
                 },
@@ -258,6 +319,7 @@ impl ContextSubcommand {
                         session.stderr,
                         style::SetForegroundColor(Color::Green),
                         style::Print(format!("\nRemoved {} path(s) from context.\n\n", paths.len(),)),
+                        style::Print("Note: Context modifications via slash command is temporary.\n\n"),
                         style::SetForegroundColor(Color::Reset)
                     )?;
                 },
@@ -275,7 +337,8 @@ impl ContextSubcommand {
                 execute!(
                     session.stderr,
                     style::SetForegroundColor(Color::Green),
-                    style::Print("\nCleared context\n\n"),
+                    style::Print("\nCleared context\n"),
+                    style::Print("Note: Context modifications via slash command is temporary.\n\n"),
                     style::SetForegroundColor(Color::Reset)
                 )?;
             },
diff --git a/crates/chat-cli/src/cli/chat/context.rs b/crates/chat-cli/src/cli/chat/context.rs
@@ -9,7 +9,9 @@ use eyre::{
 use glob::glob;
 use serde::{
     Deserialize,
+    Deserializer,
     Serialize,
+    Serializer,
 };
 
 use super::cli::model::context_window_tokens;
@@ -23,14 +25,77 @@ use crate::cli::chat::ChatError;
 use crate::cli::chat::cli::hooks::HookExecutor;
 use crate::os::Os;
 
+#[derive(Debug, Clone)]
+pub enum ContextFilePath {
+    /// Signifies that the path is brought in from the agent config
+    Agent(String),
+    /// Signifies that the path is brought in via /context add
+    Session(String),
+}
+
+impl Serialize for ContextFilePath {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self {
+            ContextFilePath::Agent(path) => path.serialize(serializer),
+            ContextFilePath::Session(_) => Err(serde::ser::Error::custom("Session paths are not serialized")),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ContextFilePath {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let path = String::deserialize(deserializer)?;
+        Ok(ContextFilePath::Agent(path))
+    }
+}
+
+impl ContextFilePath {
+    pub fn get_path_as_str(&self) -> &str {
+        match self {
+            Self::Agent(path) | Self::Session(path) => path.as_str(),
+        }
+    }
+}
+
+impl PartialEq for ContextFilePath {
+    fn eq(&self, other: &Self) -> bool {
+        let self_path = self.get_path_as_str();
+        let other_path = other.get_path_as_str();
+
+        self_path == other_path
+    }
+}
+
+impl PartialEq<str> for ContextFilePath {
+    fn eq(&self, other: &str) -> bool {
+        self.get_path_as_str() == other
+    }
+}
+
+impl PartialEq<ContextFilePath> for String {
+    fn eq(&self, other: &ContextFilePath) -> bool {
+        let inner = match other {
+            ContextFilePath::Agent(path) | ContextFilePath::Session(path) => path,
+        };
+
+        self == inner
+    }
+}
+
 /// Manager for context files and profiles.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ContextManager {
     max_context_files_size: usize,
     /// Name of the current active profile.
     pub current_profile: String,
     /// List of file paths or glob patterns to include in the context.
-    pub paths: Vec<String>,
+    pub paths: Vec<ContextFilePath>,
     /// Map of Hook Name to [`Hook`]. The hook name serves as the hook's ID.
     pub hooks: HashMap<HookTrigger, Vec<Hook>>,
     #[serde(skip)]
@@ -43,7 +108,7 @@ impl ContextManager {
             .resources
             .iter()
             .filter(|resource| resource.starts_with("file://"))
-            .map(|s| s.trim_start_matches("file://").to_string())
+            .map(|s| ContextFilePath::Agent(s.trim_start_matches("file://").to_string()))
             .collect::<Vec<_>>();
 
         Ok(Self {
@@ -79,12 +144,14 @@ impl ContextManager {
             }
         }
 
-        // Add each path, checking for duplicates
         for path in paths {
-            if self.paths.contains(&path) {
+            if self.paths.iter().any(|p| p == path.as_str()) {
                 return Err(eyre!("Rule '{}' already exists.", path));
             }
-            self.paths.push(path);
+
+            // The assumption here is that we are only calling [add_paths] for adding paths in
+            // session
+            self.paths.push(ContextFilePath::Session(path));
         }
 
         Ok(())
@@ -100,7 +167,8 @@ impl ContextManager {
     pub fn remove_paths(&mut self, paths: Vec<String>) -> Result<()> {
         // Remove each path if it exists
         let old_path_num = self.paths.len();
-        self.paths.retain(|p| !paths.contains(p));
+        self.paths
+            .retain(|p| !paths.iter().any(|path| path.as_str() == p.get_path_as_str()));
 
         if old_path_num == self.paths.len() {
             return Err(eyre!("None of the specified paths were found in the context"));
@@ -161,12 +229,12 @@ impl ContextManager {
     async fn collect_context_files(
         &self,
         os: &Os,
-        paths: &[String],
+        paths: &[ContextFilePath],
         context_files: &mut Vec<(String, String)>,
     ) -> Result<()> {
         for path in paths {
             // Use is_validation=false to handle non-matching globs gracefully
-            process_path(os, path, context_files, false).await?;
+            process_path(os, path.get_path_as_str(), context_files, false).await?;
         }
         Ok(())
     }
diff --git a/crates/chat-cli/src/cli/chat/skim_integration.rs b/crates/chat-cli/src/cli/chat/skim_integration.rs
@@ -165,7 +165,11 @@ pub fn select_context_paths_with_skim(context_manager: &ContextManager) -> Resul
 
     // Get profile-specific paths
     for path in &context_manager.paths {
-        all_paths.push(format!("(agent: {}) {}", context_manager.current_profile, path));
+        all_paths.push(format!(
+            "(agent: {}) {}",
+            context_manager.current_profile,
+            path.get_path_as_str()
+        ));
     }
 
     if all_paths.is_empty() {
diff --git a/crates/chat-cli/src/cli/chat/tools/gh_issue.rs b/crates/chat-cli/src/cli/chat/tools/gh_issue.rs
@@ -145,7 +145,15 @@ impl GhIssue {
         if os_manager.paths.is_empty() {
             os_str.push_str("profile_context=none\n\n");
         } else {
-            os_str.push_str(&format!("profile_context=\n{}\n\n", &os_manager.paths.join("\n")));
+            os_str.push_str(&format!(
+                "profile_context=\n{}\n\n",
+                &os_manager
+                    .paths
+                    .iter()
+                    .map(|p| p.get_path_as_str())
+                    .collect::<Vec<_>>()
+                    .join("\n")
+            ));
         }
 
         // Handle context files
diff --git a/crates/chat-cli/src/cli/mcp.rs b/crates/chat-cli/src/cli/mcp.rs

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ impl From<LegacyHook> for Option<Hook> {`
`80`	`80`	`timeout_ms: value.timeout_ms,`
`81`	`81`	`max_output_size: value.max_output_size,`
`82`	`82`	`cache_ttl_seconds: value.cache_ttl_seconds,`
	`83`	`+ source: Default::default(),`
`83`	`84`	`})`
`84`	`85`	`}`
`85`	`86`	`}`