resolve merge conflict

Author: evanliu048

Cargo.lock

@@ -14,7 +14,6 @@ workspace = true
 [features]
 default = []
 wayland = ["arboard/wayland-data-control"]
-knowledge = []
 
 [[bin]]
 name = "test_mcp_server"
@@ -46,6 +45,7 @@ bstr.workspace = true
 bytes.workspace = true
 camino.workspace = true
 cfg-if.workspace = true
+chrono.workspace = true
 clap.workspace = true
 clap_complete.workspace = true
 clap_complete_fig.workspace = true

crates/chat-cli/Cargo.toml

@@ -19,7 +19,6 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
-#[cfg(feature = "knowledge")]
 use crate::database::settings::Setting;
 use crate::os::Os;
 use crate::util::knowledge_store::KnowledgeStore;
@@ -70,19 +69,10 @@ impl KnowledgeSubcommand {
     }
 
     fn is_feature_enabled(os: &Os) -> bool {
-        // Feature is only available when compiled with the knowledge feature flag
-        #[cfg(feature = "knowledge")]
-        {
-            os.database
-                .settings
-                .get_bool(Setting::EnabledKnowledge)
-                .unwrap_or(false)
-        }
-        #[cfg(not(feature = "knowledge"))]
-        {
-            let _ = os; // Suppress unused variable warning
-            false
-        }
+        os.database
+            .settings
+            .get_bool(Setting::EnabledKnowledge)
+            .unwrap_or(false)
     }
 
     fn write_feature_disabled_message(session: &mut ChatSession) -> Result<(), std::io::Error> {

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

@@ -3,7 +3,6 @@ pub mod compact;
 pub mod context;
 pub mod editor;
 pub mod hooks;
-#[cfg(feature = "knowledge")]
 pub mod knowledge;
 pub mod mcp;
 pub mod model;
@@ -20,7 +19,6 @@ use compact::CompactArgs;
 use context::ContextSubcommand;
 use editor::EditorArgs;
 use hooks::HooksArgs;
-#[cfg(feature = "knowledge")]
 use knowledge::KnowledgeSubcommand;
 use mcp::McpArgs;
 use model::ModelArgs;
@@ -58,9 +56,9 @@ pub enum SlashCommand {
     /// Manage context files for the chat session
     #[command(subcommand)]
     Context(ContextSubcommand),
-    /// (Beta) Manage knowledge base for persistent context storage
-    #[cfg(feature = "knowledge")]
-    #[command(subcommand)]
+    /// (Beta) Manage knowledge base for persistent context storage. Requires "q settings
+    /// chat.enableKnowledge true"
+    #[command(subcommand, hide = true)]
     Knowledge(KnowledgeSubcommand),
     /// Open $EDITOR (defaults to vi) to compose a prompt
     #[command(name = "editor")]
@@ -119,7 +117,6 @@ impl SlashCommand {
                 })
             },
             Self::Context(args) => args.execute(os, session).await,
-            #[cfg(feature = "knowledge")]
             Self::Knowledge(subcommand) => subcommand.execute(os, session).await,
             Self::PromptEditor(args) => args.execute(session).await,
             Self::Compact(args) => args.execute(os, session).await,
@@ -159,7 +156,6 @@ impl SlashCommand {
             Self::Agent(_) => "agent",
             Self::Profile => "profile",
             Self::Context(_) => "context",
-            #[cfg(feature = "knowledge")]
             Self::Knowledge(_) => "knowledge",
             Self::PromptEditor(_) => "editor",
             Self::Compact(_) => "compact",
@@ -182,7 +178,6 @@ impl SlashCommand {
         match self {
             SlashCommand::Agent(sub) => Some(sub.name()),
             SlashCommand::Context(sub) => Some(sub.name()),
-            #[cfg(feature = "knowledge")]
             SlashCommand::Knowledge(sub) => Some(sub.name()),
             SlashCommand::Tools(arg) => arg.subcommand_name(),
             SlashCommand::Prompts(arg) => arg.subcommand_name(),

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

@@ -30,6 +30,7 @@ use super::context::{
     ContextManager,
     calc_max_context_files_size,
 };
+use super::line_tracker::FileLineTracker;
 use super::message::{
     AssistantMessage,
     ToolUseResult,
@@ -71,8 +72,8 @@ use crate::cli::chat::cli::model::{
 use crate::mcp_client::Prompt;
 use crate::os::Os;
 
-const CONTEXT_ENTRY_START_HEADER: &str = "--- CONTEXT ENTRY BEGIN ---\n";
-const CONTEXT_ENTRY_END_HEADER: &str = "--- CONTEXT ENTRY END ---\n\n";
+pub const CONTEXT_ENTRY_START_HEADER: &str = "--- CONTEXT ENTRY BEGIN ---\n";
+pub const CONTEXT_ENTRY_END_HEADER: &str = "--- CONTEXT ENTRY END ---\n\n";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct HistoryEntry {
@@ -113,6 +114,11 @@ pub struct ConversationState {
     /// Model explicitly selected by the user in this conversation state via `/model`.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub model: Option<ModelInfo>,
+    /// Used to track agent vs user updates to file modifications.
+    ///
+    /// Maps from a file path to [FileLineTracker]
+    #[serde(default)]
+    pub file_line_tracker: HashMap<String, FileLineTracker>,
 }
 
 impl ConversationState {
@@ -167,6 +173,7 @@ impl ConversationState {
             latest_summary: None,
             agents,
             model,
+            file_line_tracker: HashMap::new(),
         }
     }
 

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

@@ -0,0 +1,39 @@
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+/// Contains metadata for tracking user and agent contribution metrics for a given file for
+/// `fs_write` tool uses.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct FileLineTracker {
+    /// Line count at the end of the last `fs_write`
+    pub prev_fswrite_lines: usize,
+    /// Line count before `fs_write` executes
+    pub before_fswrite_lines: usize,
+    /// Line count after `fs_write` executes
+    pub after_fswrite_lines: usize,
+    /// Whether or not this is the first `fs_write` invocation
+    pub is_first_write: bool,
+}
+
+impl Default for FileLineTracker {
+    fn default() -> Self {
+        Self {
+            prev_fswrite_lines: 0,
+            before_fswrite_lines: 0,
+            after_fswrite_lines: 0,
+            is_first_write: true,
+        }
+    }
+}
+
+impl FileLineTracker {
+    pub fn lines_by_user(&self) -> isize {
+        (self.before_fswrite_lines as isize) - (self.prev_fswrite_lines as isize)
+    }
+
+    pub fn lines_by_agent(&self) -> isize {
+        (self.after_fswrite_lines as isize) - (self.before_fswrite_lines as isize)
+    }
+}

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

@@ -1,6 +1,10 @@
 use std::collections::HashMap;
 use std::env;
 
+use chrono::{
+    DateTime,
+    Utc,
+};
 use serde::{
     Deserialize,
     Serialize,
@@ -14,6 +18,10 @@ use super::consts::{
     MAX_CURRENT_WORKING_DIRECTORY_LEN,
     MAX_USER_MESSAGE_SIZE,
 };
+use super::conversation::{
+    CONTEXT_ENTRY_END_HEADER,
+    CONTEXT_ENTRY_START_HEADER,
+};
 use super::tools::{
     InvokeOutput,
     OutputKind,
@@ -46,6 +54,7 @@ pub struct UserMessage {
     pub additional_context: String,
     pub env_context: UserEnvContext,
     pub content: UserMessageContent,
+    pub timestamp: DateTime<Utc>,
     pub images: Option<Vec<ImageBlock>>,
 }
 
@@ -101,6 +110,7 @@ impl UserMessage {
     pub fn new_prompt(prompt: String) -> Self {
         Self {
             images: None,
+            timestamp: Utc::now(),
             additional_context: String::new(),
             env_context: UserEnvContext::generate_new(),
             content: UserMessageContent::Prompt { prompt },
@@ -110,6 +120,7 @@ impl UserMessage {
     pub fn new_cancelled_tool_uses<'a>(prompt: Option<String>, tool_use_ids: impl Iterator<Item = &'a str>) -> Self {
         Self {
             images: None,
+            timestamp: Utc::now(),
             additional_context: String::new(),
             env_context: UserEnvContext::generate_new(),
             content: UserMessageContent::CancelledToolUses {
@@ -130,6 +141,7 @@ impl UserMessage {
     pub fn new_tool_use_results(results: Vec<ToolUseResult>) -> Self {
         Self {
             additional_context: String::new(),
+            timestamp: Utc::now(),
             env_context: UserEnvContext::generate_new(),
             content: UserMessageContent::ToolUseResults {
                 tool_use_results: results,
@@ -141,6 +153,7 @@ impl UserMessage {
     pub fn new_tool_use_results_with_images(results: Vec<ToolUseResult>, images: Vec<ImageBlock>) -> Self {
         Self {
             additional_context: String::new(),
+            timestamp: Utc::now(),
             env_context: UserEnvContext::generate_new(),
             content: UserMessageContent::ToolUseResults {
                 tool_use_results: results,
@@ -267,13 +280,25 @@ impl UserMessage {
 
     /// Returns a formatted [String] containing [Self::additional_context] and [Self::prompt].
     fn content_with_context(&self) -> String {
-        match (self.additional_context.is_empty(), self.prompt()) {
+        // Format the time with iso8601 format using Z, e.g. 2025-08-08T17:43:28.672Z
+        let timestamp = self.timestamp.to_rfc3339_opts(chrono::SecondsFormat::Millis, true);
+
+        let prompt_with_timestamp = self.prompt().map(|p| {
+            format!(
+                "{}Current UTC time: {}{}{}{}{}",
+                CONTEXT_ENTRY_START_HEADER,
+                timestamp,
+                CONTEXT_ENTRY_END_HEADER,
+                USER_ENTRY_START_HEADER,
+                p,
+                USER_ENTRY_END_HEADER
+            )
+        });
+
+        match (self.additional_context.is_empty(), prompt_with_timestamp) {
             // Only add special delimiters if we have both a prompt and additional context
-            (false, Some(prompt)) => format!(
-                "{} {}{}{}",
-                self.additional_context, USER_ENTRY_START_HEADER, prompt, USER_ENTRY_END_HEADER
-            ),
-            (true, Some(prompt)) => prompt.to_string(),
+            (false, Some(prompt)) => format!("{}\n{}", self.additional_context, prompt),
+            (true, Some(prompt)) => prompt,
             _ => self.additional_context.clone(),
         }
         .trim()
@@ -521,4 +546,23 @@ mod tests {
         assert!(env_state.operating_system.as_ref().is_some_and(|os| !os.is_empty()));
         println!("{env_state:?}");
     }
+
+    #[test]
+    fn test_user_input_message_timestamp_formatting() {
+        let msg = UserMessage::new_prompt("hello world".to_string());
+
+        let msgs = [
+            msg.clone().into_user_input_message(None, &HashMap::new()),
+            msg.clone().into_history_entry(),
+        ];
+
+        for m in msgs {
+            m.content.contains(CONTEXT_ENTRY_START_HEADER);
+            m.content.contains("Current UTC time");
+            m.content.contains(CONTEXT_ENTRY_END_HEADER);
+            m.content.contains(USER_ENTRY_START_HEADER);
+            m.content.contains("hello world");
+            m.content.contains(USER_ENTRY_END_HEADER);
+        }
+    }
 }

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

@@ -7,6 +7,7 @@ mod input_source;
 mod message;
 mod parse;
 use std::path::MAIN_SEPARATOR;
+mod line_tracker;
 mod parser;
 mod prompt;
 mod prompt_parser;
@@ -1883,7 +1884,10 @@ impl ChatSession {
                 }
             }
 
-            let invoke_result = tool.tool.invoke(os, &mut self.stdout).await;
+            let invoke_result = tool
+                .tool
+                .invoke(os, &mut self.stdout, &mut self.conversation.file_line_tracker)
+                .await;
 
             if self.spinner.is_some() {
                 queue!(
@@ -1945,6 +1949,33 @@ impl ChatSession {
                         tool_telemetry
                             .and_modify(|ev| ev.output_token_size = Some(TokenCounter::count_tokens(&result.as_str())));
                     }
+
+                    // Send telemetry for agent contribution
+                    if let Tool::FsWrite(w) = &tool.tool {
+                        let sanitized_path_str = w.path(os).to_string_lossy().to_string();
+                        let conversation_id = self.conversation.conversation_id().to_string();
+                        let message_id = self.conversation.message_id().map(|s| s.to_string());
+                        if let Some(tracker) = self.conversation.file_line_tracker.get_mut(&sanitized_path_str) {
+                            let lines_by_agent = tracker.lines_by_agent();
+                            let lines_by_user = tracker.lines_by_user();
+
+                            os.telemetry
+                                .send_agent_contribution_metric(
+                                    &os.database,
+                                    conversation_id,
+                                    message_id,
+                                    Some(tool.id.clone()),   // Already a String
+                                    Some(tool.name.clone()), // Already a String
+                                    Some(lines_by_agent),
+                                    Some(lines_by_user),
+                                )
+                                .await
+                                .ok();
+
+                            tracker.prev_fswrite_lines = tracker.after_fswrite_lines;
+                        }
+                    }
+
                     tool_results.push(ToolUseResult {
                         tool_use_id: tool.id.clone(),
                         content: vec![result.into()],