alex/g3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add /project and /unproject commands for project-specific context

Browse Source 
- Add Project struct in crates/g3-cli/src/project.rs with file loading logic
- Load brief.md, contacts.yaml, status.md from project path
- Load projects.md from workspace root for cross-project context
- Project content appended to system message (survives compaction/dehydration)
- /project <path> loads project and auto-submits prompt asking about state
- /unproject clears project content and resets context
- Add set_project_content(), clear_project_content(), has_project_content() to Agent
- Add new_for_test_with_readme() for testing with custom README content
- Add 6 unit tests for Project struct
- Add 9 integration tests for project context behavior
This commit is contained in:
Dhanji R. Prasanna
2026-01-21 14:53:30 +05:30
parent a34a3b08e9
commit feb7c3e40d
6 changed files with 709 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
crates/g3-core/src/lib.rs
View File

@@ -238,6 +238,67 @@ impl<W: UiWriter> Agent<W> {
})
}
/// Create a new agent for testing with README content.
/// This allows tests to verify context window structure with combined content.
pub async fn new_for_test_with_readme(
config: Config,
ui_writer: W,
providers: ProviderRegistry,
readme_content: Option<String>,
) -> Result<Self> {
use crate::context_window::ContextWindow;
use crate::prompts::get_system_prompt_for_native;
use g3_providers::{Message, MessageRole};
let context_length = config.agent.max_context_length.unwrap_or(200_000);
let mut context_window = ContextWindow::new(context_length);
// Add system prompt
let system_prompt = get_system_prompt_for_native();
let system_message = Message::new(MessageRole::System, system_prompt);
context_window.add_message(system_message);
// Add README content if provided
if let Some(readme) = readme_content {
let readme_message = Message::new(MessageRole::System, readme);
context_window.add_message(readme_message);
}
Ok(Self {
providers,
context_window,
auto_compact: false,
pending_90_compaction: false,
thinning_events: Vec::new(),
compaction_events: Vec::new(),
first_token_times: Vec::new(),
config,
session_id: None,
tool_call_metrics: Vec::new(),
ui_writer,
todo_content: std::sync::Arc::new(tokio::sync::RwLock::new(String::new())),
is_autonomous: false,
quiet: true,
computer_controller: None,
webdriver_session: std::sync::Arc::new(tokio::sync::RwLock::new(None)),
webdriver_process: std::sync::Arc::new(tokio::sync::RwLock::new(None)),
tool_call_count: 0,
tool_calls_this_turn: Vec::new(),
requirements_sha: None,
working_dir: None,
background_process_manager: std::sync::Arc::new(
background_process::BackgroundProcessManager::new(
paths::get_background_processes_dir(),
),
),
pending_images: Vec::new(),
is_agent_mode: false,
agent_name: None,
auto_memory: false,
acd_enabled: false,
})
}
async fn new_with_mode(
config: Config,
ui_writer: W,
@@ -1285,6 +1346,52 @@ impl<W: UiWriter> Agent<W> {
}
}
/// Set or clear project content in the system message.
/// Project content is appended to the second system message (README/AGENTS content)
/// so it survives compaction and dehydration.
///
/// Pass `Some(content)` to set project content, `None` to clear it.
/// Returns true if the operation succeeded.
pub fn set_project_content(&mut self, content: Option<String>) -> bool {
// The second message (index 1) should be the README/AGENTS system message
if self.context_window.conversation_history.len() < 2 {
return false;
}
let second_msg = &mut self.context_window.conversation_history[1];
if !matches!(second_msg.role, MessageRole::System) {
return false;
}
// Remove any existing project content first
if let Some(start_idx) = second_msg.content.find("\n\n=== PROJECT INSTRUCTIONS ===") {
second_msg.content.truncate(start_idx);
} else if let Some(start_idx) = second_msg.content.find("\n\n=== ACTIVE PROJECT:") {
second_msg.content.truncate(start_idx);
}
// Add new project content if provided
if let Some(project_content) = content {
second_msg.content.push_str("\n\n");
second_msg.content.push_str(&project_content);
}
true
}
/// Clear project content from the system message.
/// This is equivalent to calling `set_project_content(None)`.
pub fn clear_project_content(&mut self) -> bool {
self.set_project_content(None)
}
/// Check if there is currently project content loaded.
pub fn has_project_content(&self) -> bool {
self.context_window.conversation_history.get(1)
.map(|m| m.content.contains("=== ACTIVE PROJECT:"))
.unwrap_or(false)
}
/// Get detailed context statistics
pub fn get_stats(&self) -> String {
use crate::stats::AgentStatsSnapshot;

324
crates/g3-core/tests/project_context_test.rs Normal file
View File

@@ -0,0 +1,324 @@
//! Integration tests for project context loading and ordering.
//!
//! Tests that the context window has the correct structure when projects are loaded.
use g3_core::{
ui_writer::NullUiWriter,
Agent,
};
use g3_config::Config;
use g3_providers::{mock::MockProvider, ProviderRegistry, MockResponse};
/// Helper to create a test agent with mock provider
async fn create_test_agent(readme_content: Option<String>) -> Agent<NullUiWriter> {
let config = Config::default();
let provider = MockProvider::new()
.with_response(MockResponse::text("Test response"));
let mut registry = ProviderRegistry::new();
registry.register(provider);
Agent::new_for_test_with_readme(config, NullUiWriter, registry, readme_content)
.await
.expect("Failed to create test agent")
}
#[tokio::test]
async fn test_context_window_initial_structure() {
// Create agent with README content
let readme = "📂 Working Directory: /test/workspace\n\n\
🤖 Agent Configuration (from AGENTS.md):\nTest agent config\n\n\
📚 Project README (from README.md):\n# Test Project\nA test project.".to_string();
let agent = create_test_agent(Some(readme)).await;
let context = agent.get_context_window();
// Should have exactly 2 messages: system prompt + README
assert_eq!(context.conversation_history.len(), 2,
"Expected 2 messages (system + README), got {}", context.conversation_history.len());
// First message should be system prompt
let system_msg = &context.conversation_history[0];
assert!(system_msg.content.contains("IMPORTANT: You must call tools to achieve goals"),
"First message should be system prompt with tool instructions");
// Second message should be README content
let readme_msg = &context.conversation_history[1];
assert!(readme_msg.content.contains("📂 Working Directory:"),
"Second message should start with working directory");
assert!(readme_msg.content.contains("🤖 Agent Configuration"),
"Second message should contain AGENTS.md");
assert!(readme_msg.content.contains("📚 Project README"),
"Second message should contain README");
}
#[tokio::test]
async fn test_context_window_order_agents_before_readme() {
let readme = "📂 Working Directory: /test\n\n\
🤖 Agent Configuration (from AGENTS.md):\nAgent stuff\n\n\
📚 Project README (from README.md):\nReadme stuff".to_string();
let agent = create_test_agent(Some(readme)).await;
let context = agent.get_context_window();
let content = &context.conversation_history[1].content;
let cwd_pos = content.find("📂 Working Directory").expect("CWD not found");
let agents_pos = content.find("🤖 Agent Configuration").expect("AGENTS not found");
let readme_pos = content.find("📚 Project README").expect("README not found");
assert!(cwd_pos < agents_pos, "Working directory should come before AGENTS.md");
assert!(agents_pos < readme_pos, "AGENTS.md should come before README");
}
#[tokio::test]
async fn test_set_project_content_appends_to_readme() {
let readme = "📂 Working Directory: /test\n\n\
📚 Project README (from README.md):\n# Test".to_string();
let mut agent = create_test_agent(Some(readme)).await;
// Set project content
let project_content = "=== PROJECT INSTRUCTIONS ===\nGlobal instructions\n=== END PROJECT INSTRUCTIONS ===\n\n\
=== ACTIVE PROJECT: /projects/myproject ===\n\
## Brief\nProject brief here\n\n\
## Status\nIn progress".to_string();
let success = agent.set_project_content(Some(project_content));
assert!(success, "set_project_content should succeed");
let context = agent.get_context_window();
let content = &context.conversation_history[1].content;
// Verify project content was appended
assert!(content.contains("=== PROJECT INSTRUCTIONS ==="),
"Should contain PROJECT INSTRUCTIONS marker");
assert!(content.contains("=== END PROJECT INSTRUCTIONS ==="),
"Should contain END PROJECT INSTRUCTIONS marker");
assert!(content.contains("=== ACTIVE PROJECT: /projects/myproject ==="),
"Should contain ACTIVE PROJECT marker");
assert!(content.contains("## Brief"),
"Should contain Brief section");
assert!(content.contains("## Status"),
"Should contain Status section");
// Verify order: README content comes before project content
let readme_pos = content.find("📚 Project README").expect("README not found");
let project_instructions_pos = content.find("=== PROJECT INSTRUCTIONS ===").expect("PROJECT INSTRUCTIONS not found");
let active_project_pos = content.find("=== ACTIVE PROJECT:").expect("ACTIVE PROJECT not found");
assert!(readme_pos < project_instructions_pos,
"README should come before PROJECT INSTRUCTIONS");
assert!(project_instructions_pos < active_project_pos,
"PROJECT INSTRUCTIONS should come before ACTIVE PROJECT");
}
#[tokio::test]
async fn test_set_project_content_without_instructions() {
let readme = "📂 Working Directory: /test\n\n📚 Project README:\n# Test".to_string();
let mut agent = create_test_agent(Some(readme)).await;
// Set project content without PROJECT INSTRUCTIONS (no projects.md in workspace)
let project_content = "=== ACTIVE PROJECT: /projects/myproject ===\n\
## Brief\nProject brief\n\n\
## Contacts\ncontacts: []\n\n\
## Status\nDone".to_string();
agent.set_project_content(Some(project_content));
let context = agent.get_context_window();
let content = &context.conversation_history[1].content;
// Should NOT contain PROJECT INSTRUCTIONS
assert!(!content.contains("=== PROJECT INSTRUCTIONS ==="),
"Should NOT contain PROJECT INSTRUCTIONS when not provided");
// Should contain ACTIVE PROJECT
assert!(content.contains("=== ACTIVE PROJECT: /projects/myproject ==="),
"Should contain ACTIVE PROJECT marker");
assert!(content.contains("## Brief"),
"Should contain Brief section");
assert!(content.contains("## Contacts"),
"Should contain Contacts section");
assert!(content.contains("## Status"),
"Should contain Status section");
}
#[tokio::test]
async fn test_clear_project_content() {
let readme = "📂 Working Directory: /test\n\n📚 Project README:\n# Test".to_string();
let mut agent = create_test_agent(Some(readme)).await;
// Set project content
let project_content = "=== ACTIVE PROJECT: /projects/test ===\n## Brief\nTest".to_string();
agent.set_project_content(Some(project_content));
// Verify it was set
assert!(agent.has_project_content(), "Project should be loaded");
// Clear project content
let success = agent.clear_project_content();
assert!(success, "clear_project_content should succeed");
// Verify it was cleared
assert!(!agent.has_project_content(), "Project should be unloaded");
let context = agent.get_context_window();
let content = &context.conversation_history[1].content;
assert!(!content.contains("=== ACTIVE PROJECT:"),
"Should NOT contain ACTIVE PROJECT after clearing");
assert!(content.contains("📚 Project README"),
"Should still contain README after clearing project");
}
#[tokio::test]
async fn test_set_project_content_replaces_existing() {
let readme = "📂 Working Directory: /test\n\n📚 Project README:\n# Test".to_string();
let mut agent = create_test_agent(Some(readme)).await;
// Set first project
let project1 = "=== ACTIVE PROJECT: /projects/first ===\n## Brief\nFirst project".to_string();
agent.set_project_content(Some(project1));
// Set second project (should replace first)
let project2 = "=== ACTIVE PROJECT: /projects/second ===\n## Brief\nSecond project".to_string();
agent.set_project_content(Some(project2));
let context = agent.get_context_window();
let content = &context.conversation_history[1].content;
// Should only contain second project
assert!(!content.contains("/projects/first"),
"Should NOT contain first project after replacement");
assert!(content.contains("/projects/second"),
"Should contain second project");
assert!(content.contains("Second project"),
"Should contain second project content");
// Should only have one ACTIVE PROJECT marker
let count = content.matches("=== ACTIVE PROJECT:").count();
assert_eq!(count, 1, "Should have exactly one ACTIVE PROJECT marker, got {}", count);
}
#[tokio::test]
async fn test_project_content_with_memory() {
// Simulate full content with memory at the end
let readme = "📂 Working Directory: /test\n\n\
🤖 Agent Configuration (from AGENTS.md):\nAgent config\n\n\
📚 Project README (from README.md):\n# Test\n\n\
=== Workspace Memory (read from analysis/memory.md, 1.2k chars) ===\n\
### Known Features\n- details\n\
=== End Workspace Memory ===".to_string();
let mut agent = create_test_agent(Some(readme)).await;
// Set project content
let project_content = "=== ACTIVE PROJECT: /projects/test ===\n## Brief\nTest brief".to_string();
agent.set_project_content(Some(project_content));
let context = agent.get_context_window();
let content = &context.conversation_history[1].content;
// Verify all sections are present
assert!(content.contains("📂 Working Directory"), "Should have CWD");
assert!(content.contains("🤖 Agent Configuration"), "Should have AGENTS");
assert!(content.contains("📚 Project README"), "Should have README");
assert!(content.contains("=== Workspace Memory"), "Should have Memory");
assert!(content.contains("=== ACTIVE PROJECT:"), "Should have Project");
// Verify order: Memory should come before Project (since project is appended at the end)
let memory_pos = content.find("=== Workspace Memory").expect("Memory not found");
let project_pos = content.find("=== ACTIVE PROJECT:").expect("Project not found");
assert!(memory_pos < project_pos,
"Memory should come before Project (project is appended to existing content)");
}
#[tokio::test]
async fn test_has_project_content() {
let readme = "📂 Working Directory: /test\n\n📚 Project README:\n# Test".to_string();
let mut agent = create_test_agent(Some(readme)).await;
// Initially no project
assert!(!agent.has_project_content(), "Should not have project initially");
// After setting project
let project = "=== ACTIVE PROJECT: /test ===\n## Brief\nTest".to_string();
agent.set_project_content(Some(project));
assert!(agent.has_project_content(), "Should have project after setting");
// After clearing
agent.clear_project_content();
assert!(!agent.has_project_content(), "Should not have project after clearing");
}
#[tokio::test]
async fn test_full_context_order() {
// This test verifies the complete expected order of context window content
let readme = "📂 Working Directory: /workspace\n\n\
🤖 Agent Configuration (from AGENTS.md):\n## Agent Rules\nBe helpful\n\n\
📚 Project README (from README.md):\n# My Project\nDescription here\n\n\
🔧 Language-Specific Guidance:\n## Rust\nUse cargo\n\n\
📎 Included Prompt (from prompt.md):\nCustom instructions\n\n\
=== Workspace Memory (read from analysis/memory.md, 500 chars) ===\n\
### Known Features\n- Feature A\n\
=== End Workspace Memory ===".to_string();
let mut agent = create_test_agent(Some(readme)).await;
// Add project content
let project = "=== PROJECT INSTRUCTIONS ===\n\
Global project rules\n\
=== END PROJECT INSTRUCTIONS ===\n\n\
=== ACTIVE PROJECT: /projects/current ===\n\
## Brief\nCurrent project brief\n\n\
## Contacts\nname: John\n\n\
## Status\nIn progress".to_string();
agent.set_project_content(Some(project));
let context = agent.get_context_window();
// Message 0: System prompt
let system = &context.conversation_history[0].content;
assert!(system.contains("IMPORTANT: You must call tools"),
"Message 0 should be system prompt");
// Message 1: Combined content with project appended
let combined = &context.conversation_history[1].content;
// Get positions of all sections
let cwd_pos = combined.find("📂 Working Directory").expect("CWD missing");
let agents_pos = combined.find("🤖 Agent Configuration").expect("AGENTS missing");
let readme_pos = combined.find("📚 Project README").expect("README missing");
let lang_pos = combined.find("🔧 Language-Specific").expect("Language missing");
let include_pos = combined.find("📎 Included Prompt").expect("Include missing");
let memory_pos = combined.find("=== Workspace Memory").expect("Memory missing");
let proj_instr_pos = combined.find("=== PROJECT INSTRUCTIONS ===").expect("Project instructions missing");
let active_proj_pos = combined.find("=== ACTIVE PROJECT:").expect("Active project missing");
// Verify complete order
assert!(cwd_pos < agents_pos, "CWD < AGENTS");
assert!(agents_pos < readme_pos, "AGENTS < README");
assert!(readme_pos < lang_pos, "README < Language");
assert!(lang_pos < include_pos, "Language < Include");
assert!(include_pos < memory_pos, "Include < Memory");
assert!(memory_pos < proj_instr_pos, "Memory < Project Instructions");
assert!(proj_instr_pos < active_proj_pos, "Project Instructions < Active Project");
// Verify project sections order
let brief_pos = combined.find("## Brief").expect("Brief missing");
let contacts_pos = combined.find("## Contacts").expect("Contacts missing");
let status_pos = combined.find("## Status").expect("Status missing");
assert!(active_proj_pos < brief_pos, "Active Project < Brief");
assert!(brief_pos < contacts_pos, "Brief < Contacts");
assert!(contacts_pos < status_pos, "Contacts < Status");
// Verify NO closing marker for ACTIVE PROJECT
assert!(!combined.contains("=== END ACTIVE PROJECT ==="),
"Should NOT have END ACTIVE PROJECT marker");
}