Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

fix: remove redundant system reminder wrappers

Browse Source
This commit is contained in:
Hare
2026-08-20 15:01:43 +09:00
parent 2315c69f0a
commit e66876249e
9 changed files with 35 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/protocol/src/lib.rs
+2 -2
View File
@@ -358,7 +358,7 @@ pub enum Event {
/// `Method::Run` (kind=`UserSend`), `Method::Notify` (kind=`Notify`),
/// `Method::WorkerEvent` re-injection (kind=`WorkerEvent`), and any other
/// IDLE-breaking trigger. Mid-run interrupts (e.g. hook output,
/// `<system-reminder>` injection that doesn't break IDLE) do not
/// typed system reminder insertion that doesn't break IDLE) do not
/// emit `InvokeStart` — they appear as `SystemItem` only.
///
/// Carries `kind` only; the payload (user text / notify message /
@@ -833,7 +833,7 @@ pub enum InvokeKind {
Notify,
/// `Method::WorkerEvent` — typed lifecycle report from a child Worker.
WorkerEvent,
/// `<system-reminder>` etc. that crosses an IDLE boundary (mid-run
/// A typed system reminder that crosses an IDLE boundary (mid-run
/// reminders that don't break IDLE are SystemItem-only and do not
/// open a new Invoke).
SystemReminder,
crates/session-store/src/system_item.rs
+17 -64
View File
@@ -2,8 +2,8 @@
//!
//! Items in worker history with `role:system` are never produced by the
//! LLM — they are always inserted by the Worker itself (notifications,
//! file ref resolutions, child-worker lifecycle events,
//! future `<system-reminder>` tags, …). [`SystemItem`] carries the
//! file ref resolutions, child-worker lifecycle events, reminders, …).
//! [`SystemItem`] carries the
//! typed shape of each such injection so clients can dispatch on
//! `kind` instead of parsing text prefixes like `[Notification] …` or
//! `[File: …]`.
@@ -22,10 +22,7 @@ use llm_engine::llm_client::types::Item;
use protocol::WorkerEvent;
use serde::{Deserialize, Serialize};
const SYSTEM_REMINDER_OPEN: &str = "<system-reminder>";
const SYSTEM_REMINDER_CLOSE: &str = "</system-reminder>";
/// Source policy that produced a durable `<system-reminder>` input.
/// Source policy that produced a durable system reminder input.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum SystemReminderSource {
@@ -52,57 +49,30 @@ pub struct SystemReminder {
}
impl SystemReminder {
/// Build a task-inactivity reminder from an unwrapped body.
/// Build a task-inactivity reminder from its plain system-message body.
pub fn task_inactivity(body: impl Into<String>) -> Self {
Self::new(SystemReminderSource::TaskInactivity, body)
}
/// Build a reminder from an unwrapped body. If a caller passes a body that
/// is already exactly wrapped in `<system-reminder>` tags, normalize it back
/// to the inner body so rendering still wraps exactly once.
/// Build a reminder whose body is committed verbatim as a system message.
pub fn new(source: SystemReminderSource, body: impl Into<String>) -> Self {
let body = normalize_unwrapped_system_reminder_body(body.into());
Self { source, body }
}
pub fn source(&self) -> SystemReminderSource {
self.source
}
pub fn body(&self) -> &str {
&self.body
}
pub fn rendered_body(&self) -> String {
render_system_reminder(&self.body)
Self {
source,
body: body.into(),
}
}
pub fn into_system_item(self) -> SystemItem {
match self.source {
SystemReminderSource::TaskInactivity => SystemItem::TaskReminder {
source: self.source,
body: self.rendered_body(),
body: self.body,
prompt_provenance: None,
},
}
}
}
fn normalize_unwrapped_system_reminder_body(body: String) -> String {
let trimmed = body.trim();
if let Some(inner) = trimmed
.strip_prefix(SYSTEM_REMINDER_OPEN)
.and_then(|rest| rest.strip_suffix(SYSTEM_REMINDER_CLOSE))
{
return inner.trim_matches('\n').to_string();
}
body
}
fn render_system_reminder(body: &str) -> String {
format!("{SYSTEM_REMINDER_OPEN}\n{body}\n{SYSTEM_REMINDER_CLOSE}")
}
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
pub struct PromptRenderProvenance {
#[serde(default, skip_serializing_if = "Option::is_none")]
@@ -178,7 +148,7 @@ pub enum SystemItem {
/// Task-management inactivity reminder inserted before an LLM request.
/// `source` is the policy that produced this durable reminder; `body` is
/// the exact LLM-context text wrapped in a `<system-reminder>` block.
/// the exact plain system-message text committed to LLM context.
TaskReminder {
#[serde(default = "default_task_reminder_source")]
source: SystemReminderSource,
@@ -324,21 +294,9 @@ mod tests {
}
#[test]
fn system_reminder_renders_body_once() {
let reminder = SystemReminder::task_inactivity("remember tasks");
assert_eq!(
reminder.rendered_body(),
"<system-reminder>\nremember tasks\n</system-reminder>"
);
let already_wrapped = SystemReminder::task_inactivity(
"<system-reminder>\nremember tasks\n</system-reminder>",
);
assert_eq!(already_wrapped.body(), "remember tasks");
assert_eq!(
already_wrapped.rendered_body(),
"<system-reminder>\nremember tasks\n</system-reminder>"
);
fn system_reminder_preserves_plain_body() {
let item = SystemReminder::task_inactivity("remember tasks").into_system_item();
assert_eq!(item.history_text(), "remember tasks");
}
#[test]
@@ -347,10 +305,7 @@ mod tests {
match item {
SystemItem::TaskReminder { source, body, .. } => {
assert_eq!(source, SystemReminderSource::TaskInactivity);
assert_eq!(
body,
"<system-reminder>\nremember tasks\n</system-reminder>"
);
assert_eq!(body, "remember tasks");
}
other => panic!("unexpected: {other:?}"),
}
@@ -358,10 +313,8 @@ mod tests {
#[test]
fn task_reminder_deserialization_defaults_legacy_source() {
let parsed: SystemItem = serde_json::from_str(
r#"{"kind":"task_reminder","body":"<system-reminder>\nbody\n</system-reminder>"}"#,
)
.unwrap();
let parsed: SystemItem =
serde_json::from_str(r#"{"kind":"task_reminder","body":"legacy body"}"#).unwrap();
match parsed {
SystemItem::TaskReminder { source, .. } => {
assert_eq!(source, SystemReminderSource::TaskInactivity);
crates/tui/src/dashboard/tests.rs
+6
View File
@@ -2980,6 +2980,12 @@ fn idle_orchestrator_gets_bounded_attention_for_new_queued_work() {
.expect("idle orchestrator should receive queued-work attention");
assert_eq!(request.worker_name, "test-orchestrator");
assert!(
request
.notice
.message
.starts_with("Workspace Dashboard observed")
);
assert!(request.notice.message.contains("00001QUEUE"));
assert!(request.notice.message.contains("new_queued"));
assert!(request.notice.message.contains("queued -> inprogress"));
crates/worker/src/feature/builtin/task/mod.rs
+4 -7
View File
@@ -312,8 +312,7 @@ mod tests {
let SystemItem::TaskReminder { body, .. } = &queued[0] else {
panic!("unexpected system item: {:?}", queued[0]);
};
assert_eq!(body.matches("<system-reminder>").count(), 1);
assert_eq!(body.matches("</system-reminder>").count(), 1);
assert!(body.starts_with("Current session steps are listed below."));
assert!(body.contains("taskid 1"));
assert!(body.contains("pending"));
assert!(body.contains("keep going"));
@@ -338,19 +337,17 @@ mod tests {
panic!("unexpected system item: {:?}", queued[0]);
};
assert_eq!(*source, SystemReminderSource::TaskInactivity);
assert_eq!(body.matches("<system-reminder>").count(), 1);
assert_eq!(body.matches("</system-reminder>").count(), 1);
assert!(body.starts_with("Current session steps are listed below."));
assert!(body.contains("typed"));
}
#[test]
fn render_task_reminder_body_is_unwrapped_for_system_reminder_helper() {
fn render_task_reminder_body_is_plain_system_text() {
let feature = TaskFeature::new();
let task = feature.task_store().create("body".into(), String::new());
let body = render_task_reminder_body(&[task]);
assert!(!body.contains("<system-reminder>"));
assert!(!body.contains("</system-reminder>"));
assert!(body.starts_with("Current session steps are listed below."));
assert!(body.contains("TaskUpdate"));
assert!(body.contains("taskid 1"));
}
crates/worker/src/hook.rs
+2 -5
View File
@@ -176,9 +176,7 @@ impl SystemItemAppendHandle {
/// Queue a task-inactivity reminder for durable model-visible append.
///
/// The body should be the unwrapped reminder text; the host-side
/// `SystemReminder` renderer wraps it exactly once in `<system-reminder>`
/// tags before commit.
/// The body is committed verbatim as the typed item's system-message text.
pub fn append_task_reminder(&self, body: impl Into<String>) {
let item = SystemReminder::task_inactivity(body).into_system_item();
self.pending
@@ -452,8 +450,7 @@ mod tests {
assert_eq!(queued.len(), 1);
match &queued[0] {
SystemItem::TaskReminder { body, .. } => {
assert_eq!(body.matches("<system-reminder>").count(), 1);
assert!(body.contains("remember tasks"));
assert_eq!(body, "remember tasks");
}
other => panic!("unexpected system item: {other:?}"),
}
crates/worker/src/ipc/notify_buffer.rs
+2 -2
View File
@@ -12,8 +12,8 @@
//!
//! This is the **single lane** for "system messages produced by Worker
//! state that should land in the next LLM request": Notify,
//! agent-visible WorkerEvent variants, and any future `<system-reminder>`
//! injection all ride this queue.
//! agent-visible WorkerEvent variants, and any future typed system reminder
//! insertion all ride this queue.
//! Per `tickets/notify-history-persist.md` and `AGENTS.md` (LLM
//! context の加工原則), there is **no** "transient, history-skipping"
//! lane — everything injected into a request is also committed to