Skip to content

Commit 9166c2c

Browse files
wpfleger96npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7
andauthored
refactor(desktop): remove vestigial MCP toolsets config (#1776)
Signed-off-by: Will Pfleger <[email protected]> Co-authored-by: npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7 <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@sprout-oss.stage.blox.sqprod.co>
1 parent 8363016 commit 9166c2c

55 files changed

Lines changed: 56 additions & 395 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎VISION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ See [VISION_PROJECTS.md](VISION_PROJECTS.md) for the full forge vision: the proj
166166

167167
## Agent Personas & Teams
168168

169-
Agents aren't monolithic. A persona bundles a model, a system prompt, and a set of MCP toolsets. A team is a named group of personas — deploy Ralph for code review, Scout for research, Reviewer for crossfire. Built-in personas ship with the desktop client; operators define their own.
169+
Agents aren't monolithic. A persona bundles a model and a system prompt. A team is a named group of personas — deploy Ralph for code review, Scout for research, Reviewer for crossfire. Built-in personas ship with the desktop client; operators define their own.
170170

171171
---
172172

‎crates/buzz-relay/src/handlers/ingest.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3194,8 +3194,8 @@ mod tests {
31943194

31953195
#[test]
31963196
fn persona_envelope_accepts_behavioral_fields() {
3197-
// Widened content (respond_to / mcp_toolsets / parallelism) is opaque
3198-
// to the relay — unknown-field tolerance is the contract.
3197+
// Unknown legacy fields in persona content remain relay-opaque;
3198+
// unknown-field tolerance is the contract.
31993199
let ev = make_event_with_tags(
32003200
KIND_PERSONA,
32013201
r#"{"display_name":"x","respond_to":"owner-only","respond_to_allowlist":[],"mcp_toolsets":"default","parallelism":2}"#,

‎crates/buzz-test-client/tests/e2e_managed_agent.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ fn agent_projection_content(name: &str) -> String {
5252
"system_prompt": "You are a test agent.",
5353
"model": "claude-opus-4",
5454
"provider": "anthropic",
55-
"mcp_toolsets": "default",
5655
"parallelism": 24,
5756
"respond_to": "allowlist",
5857
"respond_to_allowlist": ["79be667e"]
@@ -70,7 +69,6 @@ fn legacy_fat_agent_projection_content(name: &str) -> String {
7069
"system_prompt": "You are a test agent.",
7170
"model": "claude-opus-4",
7271
"provider": "anthropic",
73-
"mcp_toolsets": "default",
7472
"persona_source_version": "abc123",
7573
"parallelism": 24,
7674
"respond_to": "allowlist",

‎crates/buzz-test-client/tests/e2e_persona.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ async fn test_behavioral_fields_persona_ingests_and_round_trips() {
146146
"system_prompt": "p",
147147
"respond_to": "owner-only",
148148
"respond_to_allowlist": [],
149-
"mcp_toolsets": "default",
150149
"parallelism": 2
151150
})
152151
.to_string();

‎desktop/src-tauri/src/commands/agent_config.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,6 @@ mod tests {
623623
parallelism: 1,
624624
system_prompt: None,
625625
model: None,
626-
mcp_toolsets: None,
627626
env_vars: BTreeMap::new(),
628627
start_on_app_launch: false,
629628
auto_restart_on_config_change: true,
@@ -652,7 +651,6 @@ mod tests {
652651
source_team_persona_slug: None,
653652
definition_respond_to: None,
654653
definition_respond_to_allowlist: Vec::new(),
655-
definition_mcp_toolsets: None,
656654
definition_parallelism: None,
657655
relay_mesh: None,
658656
agent_command_override: None,
@@ -678,7 +676,6 @@ mod tests {
678676
env_vars: BTreeMap::new(),
679677
respond_to: None,
680678
respond_to_allowlist: Vec::new(),
681-
mcp_toolsets: None,
682679
parallelism: None,
683680
created_at: "".to_string(),
684681
updated_at: "".to_string(),

‎desktop/src-tauri/src/commands/agent_models.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -829,13 +829,6 @@ pub async fn update_managed_agent(
829829
if let Some(prompt_update) = input.system_prompt {
830830
record.system_prompt = prompt_update;
831831
}
832-
if let Some(toolsets_update) = input.mcp_toolsets {
833-
record.mcp_toolsets = toolsets_update
834-
.as_deref()
835-
.map(str::trim)
836-
.filter(|v| !v.is_empty())
837-
.map(str::to_string);
838-
}
839832
if let Some(parallelism) = input.parallelism {
840833
record.parallelism = parallelism;
841834
}

‎desktop/src-tauri/src/commands/agents.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -648,12 +648,6 @@ pub async fn create_managed_agent(
648648
let minted = crate::managed_agents::resolve_mint_behavioral_defaults(
649649
input.respond_to,
650650
respond_to_allowlist.clone(),
651-
input
652-
.mcp_toolsets
653-
.as_deref()
654-
.map(str::trim)
655-
.filter(|value| !value.is_empty())
656-
.map(str::to_string),
657651
input.parallelism,
658652
linked_persona.as_ref(),
659653
)?;
@@ -710,7 +704,6 @@ pub async fn create_managed_agent(
710704
.map(str::to_string)
711705
}),
712706
persona_source_version: snapshot_source_version,
713-
mcp_toolsets: minted.mcp_toolsets.clone(),
714707
// Provider agents are managed externally — force false.
715708
start_on_app_launch: if input.backend != BackendKind::Local {
716709
false
@@ -747,7 +740,6 @@ pub async fn create_managed_agent(
747740
source_team_persona_slug: None,
748741
definition_respond_to: None,
749742
definition_respond_to_allowlist: Vec::new(),
750-
definition_mcp_toolsets: None,
751743
definition_parallelism: None,
752744
relay_mesh: relay_mesh.clone(),
753745
};

‎desktop/src-tauri/src/commands/agents_deploy.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ pub(super) fn deploy_payload_json(
142142
// to the harness default (`owner-only`) — no protocol break.
143143
"respond_to": record.respond_to,
144144
"respond_to_allowlist": &record.respond_to_allowlist,
145-
// MCP toolset filter (BUZZ_TOOLSETS on the local spawn path).
146-
// Providers that don't yet read this fall back to their default.
147-
"mcp_toolsets": &record.mcp_toolsets,
148145
// Merged persona + agent env vars. Providers that don't read this
149146
// field will simply ignore it — no protocol break.
150147
"env_vars": merged_env,

‎desktop/src-tauri/src/commands/agents_tests.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ fn bare_agent_record(
2929
model: model.map(str::to_string),
3030
provider: provider.map(str::to_string),
3131
persona_source_version: None,
32-
mcp_toolsets: None,
3332
env_vars: BTreeMap::new(),
3433
start_on_app_launch: false,
3534
runtime_pid: None,
@@ -59,7 +58,6 @@ fn bare_agent_record(
5958
auto_restart_on_config_change: false,
6059
definition_respond_to: None,
6160
definition_respond_to_allowlist: vec![],
62-
definition_mcp_toolsets: None,
6361
definition_parallelism: None,
6462
}
6563
}
@@ -81,7 +79,6 @@ fn persona_record(id: &str, model: Option<&str>, provider: Option<&str>) -> Pers
8179
env_vars: BTreeMap::new(),
8280
respond_to: None,
8381
respond_to_allowlist: vec![],
84-
mcp_toolsets: None,
8582
parallelism: None,
8683
created_at: "".to_string(),
8784
updated_at: "".to_string(),
@@ -349,7 +346,6 @@ fn deploy_payload_carries_the_full_behavioral_quad() {
349346
"turn_timeout_seconds": 320,
350347
"system_prompt": null,
351348
"parallelism": 4,
352-
"mcp_toolsets": "developer,search",
353349
"respond_to": "allowlist",
354350
"respond_to_allowlist": ["{allow}"],
355351
"created_at": "2026-01-01T00:00:00Z",
@@ -371,7 +367,6 @@ fn deploy_payload_carries_the_full_behavioral_quad() {
371367
);
372368

373369
assert_eq!(payload["parallelism"], 4);
374-
assert_eq!(payload["mcp_toolsets"], "developer,search");
375370
assert_eq!(payload["respond_to"], "allowlist");
376371
assert_eq!(payload["respond_to_allowlist"][0], "a".repeat(64));
377372
assert_eq!(payload["model"], "gpt-x");

‎desktop/src-tauri/src/commands/personas/delete_cascade_tests.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ fn make_agent(
3737
model: None,
3838
provider: None,
3939
persona_source_version: None,
40-
mcp_toolsets: None,
4140
env_vars: BTreeMap::new(),
4241
start_on_app_launch: false,
4342
runtime_pid,
@@ -67,7 +66,6 @@ fn make_agent(
6766
auto_restart_on_config_change: false,
6867
definition_respond_to: None,
6968
definition_respond_to_allowlist: vec![],
70-
definition_mcp_toolsets: None,
7169
definition_parallelism: None,
7270
}
7371
}

0 commit comments

Comments
 (0)