Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions code-rs/core/src/client_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ impl Prompt {
"prepended developer message",
1,
trimmed.len(),
Some(format!("developer:prepend:{:016x}", stable_hash(trimmed))),
duplicate_key_for_prepend_developer_message(trimmed),
);
input_with_instructions.push(ResponseItem::Message {
id: None,
Expand Down Expand Up @@ -351,13 +351,23 @@ impl Prompt {
}

fn classify_prepend_developer_message(text: &str) -> ContextSourceKind {
if text.contains("<memory") || text.to_ascii_lowercase().contains("memory") {
if text.contains("<auto_review_ledger") {
ContextSourceKind::AutoReviewLedger
} else if text.contains("<memory") || text.to_ascii_lowercase().contains("memory") {
ContextSourceKind::MemoryInstructions
} else {
ContextSourceKind::DeveloperInstructions
}
}

fn duplicate_key_for_prepend_developer_message(text: &str) -> Option<String> {
if classify_prepend_developer_message(text) == ContextSourceKind::AutoReviewLedger {
Some("developer:prepend:auto_review_ledger".to_string())
} else {
Some(format!("developer:prepend:{:016x}", stable_hash(text)))
}
}

fn add_response_item_to_ledger(ledger: &mut ContextLedger, item: &ResponseItem) {
if let ResponseItem::Message { role, content, .. } = item {
if role == "user" && UserInstructions::is_user_instructions(content) {
Expand Down Expand Up @@ -488,6 +498,7 @@ fn label_for_input_item(item: &ResponseItem) -> &'static str {
ContextSourceKind::ExplicitSkill => "explicit skill",
ContextSourceKind::EnvironmentContext => "environment context",
ContextSourceKind::BrowserStatus => "browser/status context",
ContextSourceKind::AutoReviewLedger => "auto review ledger",
ContextSourceKind::ToolOutput => "tool output",
ContextSourceKind::DeveloperInstructions => "developer message",
ContextSourceKind::UserInstructions => "user/project instructions",
Expand Down Expand Up @@ -1228,6 +1239,25 @@ mod tests {
}
}

#[test]
fn auto_review_ledger_developer_message_has_distinct_context_source() {
let mut prompt = Prompt::default();
prompt.prepend_developer_messages.push(
"<auto_review_ledger schema_version=\"1\">\nrun id=abc status=Reviewing\n</auto_review_ledger>"
.to_string(),
);

let (_input, ledger) = prompt.get_formatted_input_with_ledger();
let entry = ledger
.entries()
.iter()
.find(|entry| entry.source == ContextSourceKind::AutoReviewLedger)
.expect("auto review ledger entry");
assert_eq!(entry.label, "prepended developer message");
assert_eq!(entry.persistence, ContextPersistence::RequestOnly);
assert_eq!(entry.duplicate_key.as_deref(), Some("developer:prepend:auto_review_ledger"));
}

#[test]
fn serializes_text_verbosity_when_set() {
let input: Vec<ResponseItem> = vec![];
Expand Down
21 changes: 21 additions & 0 deletions code-rs/core/src/codex/streaming.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use crate::protocol::McpListToolsResponseEvent;
use crate::protocol::TaskLifecycleEvent;
use crate::protocol::TaskLifecyclePhase;
use crate::protocol::TaskOriginKind;
use crate::review_store::{AutoReviewLedgerOptions, AutoReviewRunStore};
use code_app_server_protocol::AuthMode as AppAuthMode;
use code_protocol::models::ContentItem;
use code_protocol::models::ResponseItem;
Expand All @@ -39,6 +40,7 @@ use code_protocol::models::FunctionCallOutputPayload;
use code_protocol::models::ShellCommandToolCallParams;
use code_protocol::models::ShellToolCallParams;
use std::collections::HashMap;
use std::time::{SystemTime, UNIX_EPOCH};

#[derive(Clone, Debug, Eq, PartialEq)]
enum AgentTaskKind {
Expand Down Expand Up @@ -1538,6 +1540,21 @@ fn build_prepend_developer_messages(
messages
}

fn build_auto_review_ledger_message(cwd: &Path) -> Option<String> {
let now = SystemTime::now()
.duration_since(UNIX_EPOCH)
.map(|duration| duration.as_secs())
.unwrap_or(0);
match AutoReviewRunStore::open_existing(cwd) {
Ok(Some(store)) => store.compact_ledger(AutoReviewLedgerOptions::new(now)),
Ok(None) => None,
Err(err) => {
tracing::warn!(?err, "failed to open auto-review run store for request ledger");
None
}
}
}

fn active_session_model_notice_for_request(
sess: &Session,
submission_id: &str,
Expand Down Expand Up @@ -3074,6 +3091,7 @@ async fn run_turn(
let mut did_context_model_fallback = false;
let mut forced_model_override: Option<String> = None;
let mut fallback_metadata_warning_sent = false;
let auto_review_ledger_message = build_auto_review_ledger_message(&tc.cwd);
// Attempt input starts as the provided input, and may be augmented with
// items from a previous dropped stream attempt so we don't lose progress.
let mut attempt_input: Vec<ResponseItem> = input.clone();
Expand Down Expand Up @@ -3106,6 +3124,9 @@ async fn run_turn(
prepend_developer_messages.push(memory_prompt);
}
}
if let Some(auto_review_ledger) = auto_review_ledger_message.clone() {
prepend_developer_messages.push(auto_review_ledger);
}

let mut prompt = Prompt {
input: attempt_input.clone(),
Expand Down
1 change: 1 addition & 0 deletions code-rs/core/src/context_ledger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pub enum ContextSourceKind {
ExplicitSkill,
EnvironmentContext,
BrowserStatus,
AutoReviewLedger,
StatusItem,
ConversationHistory,
PendingInput,
Expand Down
Loading