Skip to content

fix(acp): state the reply delivery contract in the turn prompt #4346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yougeqiu wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −12
Open

fix(acp): state the reply delivery contract in the turn prompt #4346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions crates/buzz-acp/src/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,11 +1148,13 @@ pub(crate) fn format_event_block(
/// top level.
fn append_reply_instruction(s: &mut String, event_id: &str) {
s.push_str(&format!(
"\nIMPORTANT: For ordinary replies in this turn, use `--reply-to {event_id}` \
on `buzz messages send` so the conversation stays threaded. \
If the human explicitly asks for a channel-root, top-level, \
or broadcast post, send that message without `--reply-to`. \
If the requested destination is ambiguous, ask before sending."
"\nIMPORTANT: Your session text is NOT delivered to the channel — \
nothing you type here reaches the human unless you send it. To reply, \
run `buzz messages send --reply-to {event_id}` (or pipe content via \
`--content -`) so the conversation stays threaded. If the human \
explicitly asks for a channel-root, top-level, or broadcast post, \
send that message without `--reply-to`. If the requested destination \
is ambiguous, ask before sending."
));
}

Expand All @@ -1163,11 +1165,13 @@ fn append_reply_instruction(s: &mut String, event_id: &str) {
/// choice open) prevents replying into a stale/unrelated prior thread.
fn append_new_thread_reply_instruction(s: &mut String, event_id: &str) {
s.push_str(&format!(
"\nIMPORTANT: This is a new top-level message. For ordinary replies in \
this turn, use `--reply-to {event_id}` on `buzz messages send` — the \
triggering message is the thread root. Do NOT reply into any other \
(older) thread. If the human explicitly asks for a channel-root, \
top-level, or broadcast post, send that message without `--reply-to`."
"\nIMPORTANT: Your session text is NOT delivered to the channel — \
nothing you type here reaches the human unless you send it. This is a \
new top-level message. For ordinary replies in this turn, use \
`--reply-to {event_id}` on `buzz messages send` — the triggering \
message is the thread root. Do NOT reply into any other (older) \
thread. If the human explicitly asks for a channel-root, top-level, \
or broadcast post, send that message without `--reply-to`."
));
}

Expand Down Expand Up @@ -3890,8 +3894,8 @@ mod tests {
"human-facing thread reply should anchor to the thread root"
);
assert!(
prompt.contains("For ordinary replies in this turn"),
"channel thread reply should describe reply-to as the default"
prompt.contains("Your session text is NOT delivered to the channel"),
"channel thread reply should state the delivery contract: session text is not delivered"
);
assert!(
prompt.contains("send that message without `--reply-to`"),
Expand Down