mcp: delegate stdio framing and protocol constants to craft-mcp-server (refs storytold/craft-libs#778) (#2261)

This commit is contained in:
Dylan M. Taylor authored and GitHub committed 2026-11-19 16:41:43 -05:00
1 parent 824860631c
commit 55f903dc4c
5 files changed
+21 -54

No files matched your search

Generated
+9
View File
@@ -1017,6 +1017,14 @@ dependencies = [
"writeable",
]
[[package]]
name = "craft-mcp-server"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=bc186ca719958fcce3b6ee24794277eabed14609#bc186ca719958fcce3b6ee24794277eabed14609"
dependencies = [
"serde_json",
]
[[package]]
name = "craft-media"
version = "0.1.0"
@@ -1384,6 +1392,7 @@ dependencies = [
name = "deckcraft-mcp"
version = "0.19.0"
dependencies = [
"craft-mcp-server",
"deckcraft-engine",
"deckcraft-render",
"log",
+2
View File
@@ -21,6 +21,8 @@ craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "ea24422ae9
# Isolated table XML writer; existing DrawingML model/readers keep their revision.
craft-drawingml-table = { package = "craft-drawingml", git = "https://github.com/storytold/craft-libs", rev = "cff5af869dbf6926801c9ac63a927d155202ba3b" }
craft-drawingml = { git = "https://github.com/storytold/craft-libs", rev = "44d83fa8f635333dcb3c231f87381387a1f5631b", version = "0.1.0" }
# Shared MCP stdio framing and protocol constants (craft-libs#778).
craft-mcp-server = { git = "https://github.com/storytold/craft-libs", rev = "bc186ca719958fcce3b6ee24794277eabed14609", version = "0.1.0" }
# internal
deckcraft-geom = { path = "crates/geom" }
deckcraft-color = { path = "crates/color" }
+1
View File
@@ -9,6 +9,7 @@ description = "DeckCraft MCP server: JSON-RPC 2.0 over stdio, driving a running
workspace = true
[dependencies]
craft-mcp-server = { workspace = true }
deckcraft-engine = { workspace = true }
deckcraft-render = { workspace = true }
serde_json = { workspace = true }
+8 -53
View File
@@ -1,16 +1,14 @@
//! JSON-RPC 2.0 framing and the MCP lifecycle / tools / resources methods.
use std::io::{self, BufRead, Write};
use std::io::{BufRead, Write};
pub use craft_mcp_server::PROTOCOL_VERSION;
use craft_mcp_server::{Incoming, SUPPORTED_VERSIONS, read_message, response};
use serde_json::{Value, json};
use crate::backend::Backend;
use crate::tools::{call_tool, tool_definitions};
/// The MCP revision we implement.
pub const PROTOCOL_VERSION: &str = "2025-06-18";
const SUPPORTED_VERSIONS: &[&str] = &[PROTOCOL_VERSION, "2025-03-26", "2024-11-05"];
const PARSE_ERROR: i64 = -32700;
const INVALID_REQUEST: i64 = -32600;
const METHOD_NOT_FOUND: i64 = -32601;
@@ -45,10 +43,6 @@ pub struct Server {
initialized: bool,
}
fn response(id: Value, result: Value) -> Value {
json!({"jsonrpc": "2.0", "id": id, "result": result})
}
fn error(id: Value, code: i64, message: impl Into<String>) -> Value {
json!({"jsonrpc": "2.0", "id": id, "error": {"code": code, "message": message.into()}})
}
@@ -69,15 +63,11 @@ impl Server {
/// Serve newline-delimited JSON-RPC until `input` closes. Logs go to stderr only (stdout is
/// the protocol stream).
pub fn serve(&mut self, input: impl BufRead, mut output: impl Write) -> std::io::Result<()> {
let mut input = input;
while let Some(frame) = read_frame(&mut input)? {
let reply = match frame {
Frame::Complete(bytes) => match std::str::from_utf8(&bytes) {
Ok(line) => self.handle_line(line),
Err(_) => Some(error(Value::Null, PARSE_ERROR, "request frame is not valid UTF-8").to_string()),
},
Frame::TooLarge => Some(error(Value::Null, INVALID_REQUEST, "request frame exceeds 16 MiB").to_string()),
pub fn serve(&mut self, mut input: impl BufRead, mut output: impl Write) -> std::io::Result<()> {
while let Some(incoming) = read_message(&mut input, MAX_FRAME_BYTES)? {
let reply = match incoming {
Incoming::Line(line) => self.handle_line(&line),
Incoming::Refused(reply) => Some(reply),
};
if let Some(reply) = reply {
output.write_all(reply.as_bytes())?;
@@ -207,38 +197,3 @@ impl Server {
}
}
}
enum Frame {
Complete(Vec<u8>),
TooLarge,
}
/// Read through one newline while retaining no more than the documented frame budget.
fn read_frame(input: &mut impl BufRead) -> io::Result<Option<Frame>> {
let mut bytes = Vec::new();
let mut too_large = false;
loop {
let available = input.fill_buf()?;
if available.is_empty() {
if bytes.is_empty() && !too_large {
return Ok(None);
}
return Ok(Some(if too_large { Frame::TooLarge } else { Frame::Complete(bytes) }));
}
let count = available.iter().position(|byte| *byte == b'\n').map_or(available.len(), |i| i + 1);
if !too_large {
let remaining = MAX_FRAME_BYTES.saturating_sub(bytes.len());
if count > remaining {
too_large = true;
bytes.clear();
} else {
bytes.extend_from_slice(&available[..count]);
}
}
let ended = available[count - 1] == b'\n';
input.consume(count);
if ended {
return Ok(Some(if too_large { Frame::TooLarge } else { Frame::Complete(bytes) }));
}
}
}
+1 -1
View File
@@ -20,7 +20,7 @@ fn oversized_stdio_frame_is_drained_before_the_next_request() {
let replies: Vec<Value> = std::str::from_utf8(&output).unwrap().lines().map(|line| serde_json::from_str(line).unwrap()).collect();
assert_eq!(replies.len(), 2);
assert_eq!(replies[0]["error"]["code"], -32600);
assert!(replies[0]["error"]["message"].as_str().unwrap().contains("16 MiB"));
assert!(replies[0]["error"]["message"].as_str().unwrap().contains("too large"));
assert_eq!(replies[1]["id"], 1);
assert_eq!(replies[1]["result"]["serverInfo"]["name"], "deckcraft");
}