Skip to content

Commit 3ddb7a8

Browse files
nikomatsakisClaude
andcommitted
chore: upgrade sacp crates to alpha.4, sparkle-mcp to 0.4.1
- sacp, sacp-tokio, sacp-conductor, sacp-rmcp, sacp-tee, sacp-test: 10.0.0-alpha.3 -> 10.0.0-alpha.4 - yopo, elizacp: 10.0.0-alpha.3 -> 10.0.0-alpha.4 - sparkle-mcp: 0.4.0 -> 0.4.1 Breaking changes fixed in rust_researcher: - StopReason and PermissionOptionKind now non-exhaustive (added wildcard arms) - RequestPermissionOutcome::Selected now tuple variant with SelectedPermissionOutcome - PermissionOption.id renamed to option_id - Use constructor methods for non-exhaustive structs Co-authored-by: Claude <[email protected]>
1 parent 83073d3 commit 3ddb7a8

File tree

3 files changed

+58
-34
lines changed

3 files changed

+58
-34
lines changed

Cargo.lock

Lines changed: 38 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ members = [
1313
resolver = "2"
1414

1515
[workspace.dependencies]
16-
sacp = "10.0.0-alpha.3"
17-
sacp-tokio = "10.0.0-alpha.3"
18-
sacp-conductor = "10.0.0-alpha.3"
19-
sacp-rmcp = "10.0.0-alpha.3"
20-
sacp-tee = "10.0.0-alpha.3"
21-
sacp-test = "10.0.0-alpha.3"
22-
yopo = "10.0.0-alpha.3"
23-
elizacp = "10.0.0-alpha.3"
16+
sacp = "10.0.0-alpha.4"
17+
sacp-tokio = "10.0.0-alpha.4"
18+
sacp-conductor = "10.0.0-alpha.4"
19+
sacp-rmcp = "10.0.0-alpha.4"
20+
sacp-tee = "10.0.0-alpha.4"
21+
sacp-test = "10.0.0-alpha.4"
22+
yopo = "10.0.0-alpha.4"
23+
elizacp = "10.0.0-alpha.4"
2424
jsonrpcmsg = "0.1.2"
2525

2626
# Core async runtime
@@ -48,7 +48,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
4848
rmcp = { version = "0.12", features = ["server", "transport-io", "schemars"] }
4949

5050
# Sparkle integration
51-
sparkle = { package = "sparkle-mcp", version = "0.4.0" }
51+
sparkle = { package = "sparkle-mcp", version = "0.4.1" }
5252

5353
# CLI parsing
5454
clap = { version = "4.0", features = ["derive"] }

src/symposium-ferris/src/rust_researcher/mod.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ use sacp::{
1111
ProxyToConductor,
1212
mcp_server::{McpContext, McpServerBuilder},
1313
schema::{
14-
RequestPermissionOutcome, RequestPermissionRequest, RequestPermissionResponse, StopReason,
14+
RequestPermissionOutcome, RequestPermissionRequest, RequestPermissionResponse,
15+
SelectedPermissionOutcome, StopReason,
1516
},
1617
util::MatchMessage,
1718
};
@@ -166,7 +167,8 @@ async fn run_research(
166167
StopReason::MaxTokens
167168
| StopReason::MaxTurnRequests
168169
| StopReason::Refusal
169-
| StopReason::Cancelled => {
170+
| StopReason::Cancelled
171+
| _ => {
170172
return Err(sacp::util::internal_error(format!(
171173
"researcher stopped early: {stop_reason:?}"
172174
)));
@@ -192,15 +194,15 @@ fn approve_tool_request(
192194
sacp::schema::PermissionOptionKind::AllowOnce
193195
| sacp::schema::PermissionOptionKind::AllowAlways => true,
194196
sacp::schema::PermissionOptionKind::RejectOnce
195-
| sacp::schema::PermissionOptionKind::RejectAlways => false,
197+
| sacp::schema::PermissionOptionKind::RejectAlways
198+
| _ => false,
196199
})
197-
.map(|option| RequestPermissionOutcome::Selected {
198-
option_id: option.id.clone(),
200+
.map(|option| {
201+
RequestPermissionOutcome::Selected(SelectedPermissionOutcome::new(
202+
option.option_id.clone(),
203+
))
199204
})
200205
.unwrap_or(RequestPermissionOutcome::Cancelled);
201206

202-
request_cx.respond(RequestPermissionResponse {
203-
outcome,
204-
meta: None,
205-
})
207+
request_cx.respond(RequestPermissionResponse::new(outcome))
206208
}

0 commit comments

Comments
 (0)