vinhnx
diff --git a/Collapse file
‎AGENTS.md‎
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
Display the source diff
Display the rich diff b/Collapse file
‎AGENTS.md‎
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎docs/project/TODO.md‎
Copy file name to clipboard
+4-7Lines changed: 4 additions & 7 deletions
Display the source diff
Display the rich diff b/Collapse file
‎docs/project/TODO.md‎
Copy file name to clipboard
+4-7Lines changed: 4 additions & 7 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎src/agent/runloop/unified/prompts.rs‎
Copy file name to clipboard
+32-15Lines changed: 32 additions & 15 deletions b/Collapse file
‎src/agent/runloop/unified/prompts.rs‎
Copy file name to clipboard
+32-15Lines changed: 32 additions & 15 deletions
diff --git a/Collapse file
‎vtcode-config/src/core/agent.rs‎
Copy file name to clipboard
+26Lines changed: 26 additions & 0 deletions b/Collapse file
‎vtcode-config/src/core/agent.rs‎
Copy file name to clipboard
+26Lines changed: 26 additions & 0 deletions
diff --git a/Collapse file
‎vtcode-core/src/core/agent/runner.rs‎
Copy file name to clipboard
+10-4Lines changed: 10 additions & 4 deletions b/Collapse file
‎vtcode-core/src/core/agent/runner.rs‎
Copy file name to clipboard
+10-4Lines changed: 10 additions & 4 deletions
diff --git a/Collapse file
‎vtcode-core/src/prompts/context.rs‎
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions b/Collapse file
‎vtcode-core/src/prompts/context.rs‎
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions
@@ -101,6 +101,19 @@ Understanding these patterns requires reading multiple files across the codebase
 -   **ACP** (Agent Client Protocol): `vtcode-acp-client/` - Zed IDE integration
 -   **MCP** (Model Context Protocol): `vtcode-core/src/mcp/` - Extensible tooling via `rmcp`
 
+## Communication Style
+
+### Response Guidelines
+
+-   **No emoji**: Never use emojis in responses. Keep output professional and text-based.
+-   **Minimize exclamation points**: Use them sparingly; let the content speak for itself.
+-   **Be concise**: Answer directly without unnecessary preamble, elaboration, or summaries.
+-   **Avoid flattery**: Don't call ideas "good," "great," "interesting," or other positive adjectives. Respond directly to the request.
+-   **Focus on the task**: Only address the user's specific query. Skip tangential information unless critical.
+-   **One-to-three sentences**: Aim for brevity whenever possible. One-word answers are preferred for simple questions.
+-   **No long introductions**: Get to the point immediately.
+-   **Clean markdown**: Format responses with GitHub-flavored Markdown where appropriate.
+
 ## Code Style & Conventions
 
 ### Critical Standards from .github/copilot-instructions.md
 
@@ -1,20 +1,17 @@
-Add LSP (Language Server Protocol) tool for code intelligence features like go-to-definition, find references, and hover documentation
+system prompt https://github.com/Piebald-AI/claude-code-system-prompts/blob/main/system-prompts/system-prompt-main-system-prompt.md
 
 --
 
-review and fix agent harness run, especially tool execution and output handling. sometime the agent stop in the middle of execution without completing the task
-
-eg: /Users/vinhnguyenxuan/.vtcode/sessions/session-vtcode-20251225T155341Z_067404-41496.json
+https://github.com/Piebald-AI/claude-code-system-prompts/
 
 --
 
----
 
-Improve memory usage for large conversations
 
 --
 
-improve responsiveness when executing commands, tools, pty, and file operations. add a placeholder response while processing is ongoing.
+Add LSP (Language Server Protocol) tool for code intelligence features like go-to-definition, find references, and hover documentation
+
 
 --
 
 
@@ -1,11 +1,35 @@
 use std::path::Path;
+use vtcode_core::config::loader::ConfigManager;
+use vtcode_core::prompts::system::compose_system_instruction_text;
+use vtcode_core::prompts::PromptContext;
 
 pub(crate) async fn read_system_prompt(workspace: &Path, session_addendum: Option<&str>) -> String {
-    let content = vtcode_core::prompts::generate_system_instruction(&Default::default()).await;
-    let mut prompt = if let Some(text) = content.parts.first().and_then(|p| p.as_text()) {
-        text.to_string()
-    } else {
-        r#"# VT Code - Rust Coding Assistant
+    // Build PromptContext with available information (workspace and current directory)
+    // Tool information will be added when tools are initialized
+    let mut prompt_context = PromptContext::default();
+    prompt_context.workspace = Some(workspace.to_path_buf());
+
+    // Set current working directory
+    if let Ok(cwd) = std::env::current_dir() {
+        prompt_context.set_current_directory(cwd);
+    }
+
+    // Load configuration
+    let vt_cfg = ConfigManager::load_from_workspace(workspace)
+        .ok()
+        .map(|manager| manager.config().clone());
+
+    // Use the new compose_system_instruction_text with enhancements
+    let mut prompt = compose_system_instruction_text(
+        workspace,
+        vt_cfg.as_ref(),
+        Some(&prompt_context),
+    )
+    .await;
+
+    // Fallback prompt if composition fails (should rarely happen)
+    if prompt.is_empty() {
+        prompt = r#"# VT Code - Rust Coding Assistant
 
 Use tools immediately. Stop when done or blocked.
 
@@ -28,18 +52,11 @@ Use tools immediately. Stop when done or blocked.
 ## Rust
 - Idiomatic code with proper ownership/borrowing
 - Use cargo, rustfmt, clippy. Handle errors with Result/anyhow."#
-            .to_string()
-    };
-
-    if let Some(overview) = vtcode_core::utils::common::build_project_overview(workspace).await {
-        prompt.push_str("\n\n## PROJECT OVERVIEW\n");
-        prompt.push_str(&overview.as_prompt_block());
+                .to_string();
     }
 
-    if let Some(guidelines) = vtcode_core::prompts::system::read_agent_guidelines(workspace).await {
-        prompt.push_str("\n\n## AGENTS.MD GUIDELINES\n");
-        prompt.push_str(&guidelines);
-    }
+    // Note: PROJECT OVERVIEW and AGENTS.MD are now handled by compose_system_instruction_text
+    // The old code duplicated AGENTS.MD loading - removed to avoid duplication
 
     if let Some(addendum) = session_addendum {
         let trimmed = addendum.trim();
 
@@ -167,6 +167,19 @@ pub struct AgentConfig {
     /// it will be retried up to this many times with exponential backoff
     #[serde(default = "default_max_task_retries")]
     pub max_task_retries: u32,
+
+    /// Include current date/time in system prompt for temporal awareness
+    /// Helps LLM understand context for time-sensitive tasks (default: true)
+    #[serde(default = "default_include_temporal_context")]
+    pub include_temporal_context: bool,
+
+    /// Use UTC instead of local time for temporal context (default: false)
+    #[serde(default)]
+    pub temporal_context_use_utc: bool,
+
+    /// Include current working directory in system prompt (default: true)
+    #[serde(default = "default_include_working_directory")]
+    pub include_working_directory: bool,
 }
 
 impl Default for AgentConfig {
@@ -203,6 +216,9 @@ impl Default for AgentConfig {
             checkpointing: AgentCheckpointingConfig::default(),
             vibe_coding: AgentVibeCodingConfig::default(),
             max_task_retries: default_max_task_retries(),
+            include_temporal_context: default_include_temporal_context(),
+            temporal_context_use_utc: false, // Default to local time
+            include_working_directory: default_include_working_directory(),
         }
     }
 }
@@ -339,6 +355,16 @@ const fn default_max_task_retries() -> u32 {
     2 // Retry twice on transient failures
 }
 
+#[inline]
+const fn default_include_temporal_context() -> bool {
+    true // Enable by default - minimal overhead (~20 tokens)
+}
+
+#[inline]
+const fn default_include_working_directory() -> bool {
+    true // Enable by default - minimal overhead (~10 tokens)
+}
+
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct AgentCustomPromptsConfig {
 
@@ -1212,13 +1212,15 @@ impl AgentRunner {
         let (config_value, system_prompt) = match ConfigManager::load_from_workspace(&workspace) {
             Ok(manager) => {
                 let cfg = manager.config().clone();
-                let prompt = compose_system_instruction_text(workspace.as_path(), Some(&cfg)).await;
+                let prompt =
+                    compose_system_instruction_text(workspace.as_path(), Some(&cfg), None).await;
                 (cfg, prompt)
             }
             Err(err) => {
                 warn!("Failed to load vtcode configuration for system prompt composition: {err:#}");
                 let cfg = VTCodeConfig::default();
-                let prompt = compose_system_instruction_text(workspace.as_path(), None).await;
+                let prompt =
+                    compose_system_instruction_text(workspace.as_path(), None, None).await;
                 (cfg, prompt)
             }
         };
@@ -1286,8 +1288,12 @@ impl AgentRunner {
         *self.loop_detector.borrow_mut() =
             LoopDetector::with_max_repeated_calls(self.config.tools.max_repeated_tool_calls.max(1));
 
-        self.system_prompt =
-            compose_system_instruction_text(self._workspace.as_path(), Some(self.config())).await;
+        self.system_prompt = compose_system_instruction_text(
+            self._workspace.as_path(),
+            Some(self.config()),
+            None, // No prompt_context
+        )
+        .await;
 
         self.tool_registry.apply_timeout_policy(&vt_cfg.timeouts);
         self.tool_registry.initialize_async().await?;
 
@@ -1,4 +1,5 @@
 use std::path::PathBuf;
+use crate::config::types::CapabilityLevel;
 
 /// Context information for prompt generation
 #[derive(Debug, Clone, Default)]
@@ -15,6 +16,10 @@ pub struct PromptContext {
     pub available_skills: Vec<(String, String)>,
     /// User preferences
     pub user_preferences: Option<UserPreferences>,
+    /// Capability level (inferred from tools or explicitly set)
+    pub capability_level: Option<CapabilityLevel>,
+    /// Current working directory (different from workspace root)
+    pub current_directory: Option<PathBuf>,
 }
 
 /// User preferences for prompt customization
@@ -69,4 +74,21 @@ impl PromptContext {
             self.add_skill(name, description);
         }
     }
+
+    /// Set capability level explicitly
+    pub fn set_capability_level(&mut self, level: CapabilityLevel) {
+        self.capability_level = Some(level);
+    }
+
+    /// Infer capability level from available tools
+    pub fn infer_capability_level(&mut self) {
+        self.capability_level = Some(crate::prompts::guidelines::infer_capability_level(
+            &self.available_tools,
+        ));
+    }
+
+    /// Set current working directory
+    pub fn set_current_directory(&mut self, dir: PathBuf) {
+        self.current_directory = Some(dir);
+    }
 }