Skip to content

Commit d8a4d63

Browse files
author
npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d
committed
Merge origin/main into max/tui-renderer
Pulls in main as a new commit on top per Tyler's instruction before the flicker fix and splash animation work. No rebase, no force. * origin/main: fix(desktop): stop the create-agent provider config probe from erasing keystrokes (#4411) fix(mobile): recover and pace live subscriptions (#3053) feat(acp): deliver system prompt via _meta.systemPrompt for claude-agent-acp (#4395) Co-authored-by: npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> Signed-off-by: npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz>
2 parents 252c049 + 2c0ac24 commit d8a4d63

22 files changed

Lines changed: 2643 additions & 135 deletions

‎crates/buzz-acp/src/acp.rs‎

Lines changed: 128 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -619,29 +619,46 @@ impl AcpClient {
619619
/// Send `session/new` and return the full response alongside the session ID.
620620
///
621621
/// `cwd` must be an absolute path. `mcp_servers` may be empty.
622-
/// `system_prompt` is included in the request when `Some` — agents that
623-
/// support the field will use it; others ignore unknown fields per JSON-RPC.
622+
///
623+
/// `system_prompt` controls how the prompt text is delivered:
624+
///
625+
/// - `None` — no system-prompt field in the request (legacy framing).
626+
/// - `Some(SystemPromptTransport::Field(text))` — bare `systemPrompt` field
627+
/// (ACP protocol v2, buzz-agent, goose unused).
628+
/// - `Some(SystemPromptTransport::ClaudeMeta(text))` — `_meta.systemPrompt`
629+
/// as `{"append": text}`, keeping claude-agent-acp's native preset intact.
630+
///
624631
/// `session_title` rides in `_meta.sessionTitle` when `Some`; `_meta` is
625632
/// omitted entirely otherwise, since adapters may distinguish an absent
626-
/// member from a null one.
633+
/// member from a null one. When both `ClaudeMeta` and `session_title` are
634+
/// present the two `_meta` members are merged into a single object.
635+
///
627636
/// Callers use [`extract_model_config_options`] and [`extract_model_state`]
628637
/// to pull model info from the raw result.
629638
pub async fn session_new_full(
630639
&mut self,
631640
cwd: &str,
632641
mcp_servers: Vec<McpServer>,
633-
system_prompt: Option<&str>,
642+
system_prompt: Option<SystemPromptTransport<'_>>,
634643
session_title: Option<&str>,
635644
) -> Result<SessionNewResponse, AcpError> {
636645
let mut params = serde_json::json!({
637646
"cwd": cwd,
638647
"mcpServers": mcp_servers,
639648
});
640-
if let Some(sp) = system_prompt {
641-
params["systemPrompt"] = serde_json::Value::String(sp.to_owned());
649+
match system_prompt {
650+
Some(SystemPromptTransport::Field(sp)) => {
651+
params["systemPrompt"] = serde_json::Value::String(sp.to_owned());
652+
}
653+
Some(SystemPromptTransport::ClaudeMeta(sp)) => {
654+
// Merge into _meta so sessionTitle (set below) is not clobbered.
655+
params["_meta"]["systemPrompt"] = serde_json::json!({ "append": sp });
656+
}
657+
None => {}
642658
}
643659
if let Some(title) = session_title {
644-
params["_meta"] = serde_json::json!({ "sessionTitle": title });
660+
// Merge — _meta may already carry systemPrompt from ClaudeMeta above.
661+
params["_meta"]["sessionTitle"] = serde_json::Value::String(title.to_owned());
645662
}
646663
let result = self.send_request("session/new", params).await?;
647664
let session_id = result["sessionId"]
@@ -663,7 +680,7 @@ impl AcpClient {
663680
&mut self,
664681
cwd: &str,
665682
mcp_servers: Vec<McpServer>,
666-
system_prompt: Option<&str>,
683+
system_prompt: Option<SystemPromptTransport<'_>>,
667684
session_title: Option<&str>,
668685
) -> Result<String, AcpError> {
669686
Ok(self
@@ -2038,6 +2055,22 @@ pub struct SessionNewResponse {
20382055
pub raw: serde_json::Value,
20392056
}
20402057

2058+
/// How to deliver a system prompt on `session/new`.
2059+
///
2060+
/// The two variants match the two mechanisms supported by current adapters:
2061+
///
2062+
/// - **`Field`** — bare `systemPrompt` field (ACP protocol v2, buzz-agent).
2063+
/// - **`ClaudeMeta`** — `_meta.systemPrompt: {"append": text}`, used by
2064+
/// `claude-agent-acp` to append to the adapter's own native system prompt
2065+
/// while keeping its tool-use preset intact.
2066+
#[derive(Debug, Clone, PartialEq)]
2067+
pub enum SystemPromptTransport<'a> {
2068+
/// Deliver as a bare top-level `systemPrompt` field.
2069+
Field(&'a str),
2070+
/// Deliver as `_meta.systemPrompt: {"append": text}`.
2071+
ClaudeMeta(&'a str),
2072+
}
2073+
20412074
/// How to switch to a particular model on a session.
20422075
#[derive(Debug, Clone, PartialEq, serde::Serialize)]
20432076
#[serde(tag = "type")]
@@ -3271,7 +3304,12 @@ mod tests {
32713304
.expect("initialize should succeed");
32723305

32733306
let resp = client
3274-
.session_new_full("/tmp", vec![], Some("Custom system prompt"), None)
3307+
.session_new_full(
3308+
"/tmp",
3309+
vec![],
3310+
Some(SystemPromptTransport::Field("Custom system prompt")),
3311+
None,
3312+
)
32753313
.await
32763314
.expect("session_new_full should succeed");
32773315

@@ -3423,6 +3461,87 @@ mod tests {
34233461
);
34243462
}
34253463

3464+
// ── claude-agent-acp _meta.systemPrompt transport ─────────────────────
3465+
3466+
#[tokio::test]
3467+
async fn session_new_full_sends_claude_meta_system_prompt_when_claude_meta_transport() {
3468+
// When ClaudeMeta transport is requested, the prompt must appear as
3469+
// _meta.systemPrompt: {"append": text} — never as a bare systemPrompt field.
3470+
let script = r#"
3471+
read -t 2 _init
3472+
echo '{"jsonrpc":"2.0","id":0,"result":{"protocolVersion":1,"agentCapabilities":{}}}'
3473+
read -t 2 REQ
3474+
echo '{"jsonrpc":"2.0","id":1,"result":{"sessionId":"ses_claude","_receivedRequest":'"$REQ"'}}'
3475+
sleep 1
3476+
"#;
3477+
let mut client = spawn_script(script).await;
3478+
client
3479+
.initialize()
3480+
.await
3481+
.expect("initialize should succeed");
3482+
3483+
let resp = client
3484+
.session_new_full(
3485+
"/tmp",
3486+
vec![],
3487+
Some(SystemPromptTransport::ClaudeMeta("Be concise")),
3488+
None,
3489+
)
3490+
.await
3491+
.expect("session_new_full should succeed");
3492+
3493+
let received = &resp.raw["_receivedRequest"];
3494+
assert!(
3495+
received["params"].get("systemPrompt").is_none(),
3496+
"bare systemPrompt must not be present for ClaudeMeta transport"
3497+
);
3498+
assert_eq!(
3499+
received["params"]["_meta"]["systemPrompt"]["append"].as_str(),
3500+
Some("Be concise"),
3501+
"_meta.systemPrompt.append must carry the prompt text"
3502+
);
3503+
}
3504+
3505+
#[tokio::test]
3506+
async fn session_new_full_merges_claude_meta_and_session_title_into_single_meta_object() {
3507+
// Both ClaudeMeta prompt and session_title must coexist under _meta —
3508+
// the prompt must not clobber sessionTitle or vice versa.
3509+
let script = r#"
3510+
read -t 2 _init
3511+
echo '{"jsonrpc":"2.0","id":0,"result":{"protocolVersion":1,"agentCapabilities":{}}}'
3512+
read -t 2 REQ
3513+
echo '{"jsonrpc":"2.0","id":1,"result":{"sessionId":"ses_merged","_receivedRequest":'"$REQ"'}}'
3514+
sleep 1
3515+
"#;
3516+
let mut client = spawn_script(script).await;
3517+
client
3518+
.initialize()
3519+
.await
3520+
.expect("initialize should succeed");
3521+
3522+
let resp = client
3523+
.session_new_full(
3524+
"/tmp",
3525+
vec![],
3526+
Some(SystemPromptTransport::ClaudeMeta("Be concise")),
3527+
Some("Fizz · #buzz-dev"),
3528+
)
3529+
.await
3530+
.expect("session_new_full should succeed");
3531+
3532+
let received = &resp.raw["_receivedRequest"];
3533+
assert_eq!(
3534+
received["params"]["_meta"]["systemPrompt"]["append"].as_str(),
3535+
Some("Be concise"),
3536+
"_meta.systemPrompt.append must be present"
3537+
);
3538+
assert_eq!(
3539+
received["params"]["_meta"]["sessionTitle"].as_str(),
3540+
Some("Fizz · #buzz-dev"),
3541+
"_meta.sessionTitle must be present alongside systemPrompt"
3542+
);
3543+
}
3544+
34263545
// ── Goose-native steer scaffold (PR follow-up to #1160) ──────────────
34273546

34283547
/// Helper: spawn an inert `cat` subprocess so we have a real AcpClient

‎crates/buzz-acp/src/pool.rs‎

Lines changed: 53 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ use uuid::Uuid;
3232
use crate::acp::{
3333
extract_model_config_options, extract_model_state, model_in_catalog,
3434
resolve_model_switch_method, AcpClient, AcpError, McpServer, ModelSwitchMethod, StopReason,
35+
SystemPromptTransport,
3536
};
3637
use crate::config::{compose_session_title, DedupMode, PermissionMode};
3738
use crate::observer;
@@ -171,27 +172,39 @@ pub struct OwnedAgent {
171172
pub protocol_version: u32,
172173
}
173174

175+
/// Package name reported by `claude-agent-acp` in its `initialize` response.
176+
/// Any adapter reporting this name supports `_meta.systemPrompt: {append: ...}`
177+
/// on `session/new` — the feature landed in v0.6.0 (Oct 2025), before the
178+
/// `@zed-industries/claude-code-acp` → `@agentclientprotocol/claude-agent-acp`
179+
/// rename, so the new name is a reliable capability gate.
180+
const CLAUDE_AGENT_ACP_NAME: &str = "@agentclientprotocol/claude-agent-acp";
181+
174182
fn has_system_prompt_support(
175183
protocol_version: u32,
176184
agent_name: &str,
177185
goose_system_prompt_supported: Option<bool>,
178186
) -> bool {
179187
if agent_name == "goose" {
180188
goose_system_prompt_supported == Some(true)
189+
} else if agent_name == CLAUDE_AGENT_ACP_NAME {
190+
true
181191
} else {
182192
protocol_version >= 2
183193
}
184194
}
185195

186-
fn session_new_system_prompt(
196+
fn session_new_system_prompt<'a>(
187197
is_goose: bool,
188198
protocol_version: u32,
189-
prompt: Option<&str>,
190-
) -> Option<&str> {
191-
if is_goose || protocol_version < 2 {
199+
agent_name: &str,
200+
prompt: Option<&'a str>,
201+
) -> Option<SystemPromptTransport<'a>> {
202+
if is_goose || (protocol_version < 2 && agent_name != CLAUDE_AGENT_ACP_NAME) {
192203
None
204+
} else if agent_name == CLAUDE_AGENT_ACP_NAME {
205+
prompt.map(SystemPromptTransport::ClaudeMeta)
193206
} else {
194-
prompt
207+
prompt.map(SystemPromptTransport::Field)
195208
}
196209
}
197210

@@ -907,6 +920,7 @@ async fn create_session_and_apply_model(
907920
session_new_system_prompt(
908921
is_goose,
909922
agent.protocol_version,
923+
&agent.agent_name,
910924
combined_system_prompt.as_deref(),
911925
),
912926
session_title.as_deref(),
@@ -4003,18 +4017,48 @@ mod tests {
40034017
assert!(has_system_prompt_support(2, "goose", Some(true)));
40044018
assert!(has_system_prompt_support(1, "goose", Some(true)));
40054019
assert!(has_system_prompt_support(2, "buzz-agent", None));
4020+
// Goose never receives system prompt via session/new (uses post-hoc method).
40064021
assert_eq!(
4007-
session_new_system_prompt(true, 2, Some("instructions")),
4022+
session_new_system_prompt(true, 2, "goose", Some("instructions")),
40084023
None
40094024
);
4025+
// Protocol-v2 non-goose gets Field transport.
40104026
assert_eq!(
4011-
session_new_system_prompt(false, 2, Some("instructions")),
4012-
Some("instructions")
4027+
session_new_system_prompt(false, 2, "buzz-agent", Some("instructions")),
4028+
Some(SystemPromptTransport::Field("instructions"))
40134029
);
4030+
// Protocol-v1 non-goose, non-claude gets None (legacy user-message framing).
40144031
assert_eq!(
4015-
session_new_system_prompt(false, 1, Some("instructions")),
4032+
session_new_system_prompt(false, 1, "codex", Some("instructions")),
40164033
None
40174034
);
4035+
// claude-agent-acp gets ClaudeMeta transport regardless of protocol version.
4036+
assert_eq!(
4037+
session_new_system_prompt(false, 1, CLAUDE_AGENT_ACP_NAME, Some("instructions")),
4038+
Some(SystemPromptTransport::ClaudeMeta("instructions"))
4039+
);
4040+
assert_eq!(
4041+
session_new_system_prompt(true, 1, CLAUDE_AGENT_ACP_NAME, Some("instructions")),
4042+
None,
4043+
"goose path must never produce a transport even when agent_name matches"
4044+
);
4045+
}
4046+
4047+
#[test]
4048+
fn claude_agent_acp_has_system_prompt_support_regardless_of_protocol_version() {
4049+
// claude-agent-acp declares protocolVersion:1 but supports _meta.systemPrompt;
4050+
// has_system_prompt_support must return true so user-message framing is suppressed.
4051+
assert!(has_system_prompt_support(1, CLAUDE_AGENT_ACP_NAME, None));
4052+
assert!(has_system_prompt_support(2, CLAUDE_AGENT_ACP_NAME, None));
4053+
}
4054+
4055+
#[test]
4056+
fn old_zed_adapter_name_falls_through_to_protocol_version_gate() {
4057+
// The renamed @zed-industries package predates the _meta.systemPrompt support,
4058+
// so it must not be treated as capable and stays on legacy user-message framing.
4059+
let old_name = "@zed-industries/claude-code-acp";
4060+
assert!(!has_system_prompt_support(1, old_name, None));
4061+
assert!(has_system_prompt_support(2, old_name, None));
40184062
}
40194063

40204064
#[test]

‎desktop/playwright.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ export default defineConfig({
133133
"**/harness-management.spec.ts",
134134
"**/harness-catalog-screenshots.spec.ts",
135135
"**/inline-custom-harness.spec.ts",
136+
"**/where-to-run-config.spec.ts",
136137
"**/huddle-transcription.spec.ts",
137138
],
138139
use: {

‎desktop/src/features/agents/ui/WhereToRunSection.tsx‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ import { useBackendProvidersQuery } from "@/features/agents/hooks";
55
import { probeBackendProvider } from "@/shared/api/tauri";
66

77
import { ProviderConfigFields } from "./ProviderConfigFields";
8-
import { emptyWhereToRunDraft, type WhereToRunDraft } from "./whereToRunIntent";
8+
import {
9+
applyProbeResult,
10+
emptyWhereToRunDraft,
11+
type WhereToRunDraft,
12+
} from "./whereToRunIntent";
913

1014
/** Optional remote-backend selector. Buzz shared compute is an LLM provider, not a run destination. */
1115
export function WhereToRunSection({
@@ -26,32 +30,37 @@ export function WhereToRunSection({
2630
[backendProviders, draft.runOn],
2731
);
2832

33+
// Latest-state seam for probe resolution: an Effect Event always sees the
34+
// draft as it is *now*. Without this, the probe promise closes over the
35+
// draft from probe start, and anything typed while the probe was in flight
36+
// gets thrown away when it resolves (a second, subtler Typewriter Eraser).
37+
const applyProbe = React.useEffectEvent(
38+
(result: Awaited<ReturnType<typeof probeBackendProvider>>) => {
39+
onDraftChange(applyProbeResult(draft, result));
40+
},
41+
);
42+
43+
// Probe once per provider *selection*, keyed on the provider's stable
44+
// path — never on the draft. Depending on the draft made every keystroke
45+
// refire the probe, and each resolution reset providerConfig to schema
46+
// defaults, which erased what the user was typing (the Typewriter Eraser)
47+
// and spawned the provider binary in a loop for as long as the dialog was
48+
// open. Keying on the path (not the provider object) also keeps a
49+
// providers-query refresh from reprobing an unchanged selection.
50+
const selectedBinaryPath = isProviderMode
51+
? (selectedBackendProvider?.binaryPath ?? null)
52+
: null;
2953
React.useEffect(() => {
30-
if (!isProviderMode || !selectedBackendProvider) {
54+
if (!selectedBinaryPath) {
3155
setProbeError(null);
3256
return;
3357
}
3458
let cancelled = false;
3559
setProbeError(null);
36-
void probeBackendProvider(selectedBackendProvider.binaryPath)
60+
void probeBackendProvider(selectedBinaryPath)
3761
.then((result) => {
3862
if (cancelled) return;
39-
const defaults: Record<string, string> = {};
40-
const properties =
41-
(result.config_schema as Record<string, unknown> | undefined)
42-
?.properties ?? {};
43-
for (const [key, property] of Object.entries(properties) as [
44-
string,
45-
Record<string, unknown>,
46-
][]) {
47-
if (property.default != null)
48-
defaults[key] = String(property.default);
49-
}
50-
onDraftChange({
51-
...draft,
52-
probedProvider: result,
53-
providerConfig: defaults,
54-
});
63+
applyProbe(result);
5564
})
5665
.catch((error: unknown) => {
5766
if (!cancelled) {
@@ -61,7 +70,7 @@ export function WhereToRunSection({
6170
return () => {
6271
cancelled = true;
6372
};
64-
}, [draft, isProviderMode, onDraftChange, selectedBackendProvider]);
73+
}, [selectedBinaryPath]);
6574

6675
if (backendProviders.length === 0) return null;
6776

0 commit comments

Comments
 (0)