feat(supervisor): let a server keep its stdin open

Stdio-first MCP servers exit the moment they see EOF on fd 0. Under the
launchd agent the daemon's stdin is /dev/null, so a server that also
speaks HTTP still shuts down seconds after binding its port, and there
was no way to ask xy for anything else.

Adds a per-server `stdin` mode: `inherit` (the default, unchanged),
`null`, or `keep-open`. Under `keep-open` the child gets a pipe whose
write end RealChild holds and never writes to, so a read blocks.

The handle has to live on RealChild rather than on the TokioChild:
`Child::wait()` opens with `drop(self.stdin.take())`, so leaving it
where tokio put it reproduces the original bug the instant supervision
starts.

Refs #2

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TWLFEoRaRafJm1SpdhWQ6F
This commit is contained in:
2026-09-07 09:50:42 +02:00
co-authored by Claude Opus 5
parent 7f605f361e
commit b500882257
5 changed files with 177 additions and 5 deletions
+15
View File
@@ -66,6 +66,19 @@ impl Default for StopConfig {
use std::collections::BTreeMap;
use std::path::PathBuf;
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum StdinMode {
/// The child inherits the daemon's stdin. Today's behaviour.
#[default]
Inherit,
/// The child gets `/dev/null`; a read sees EOF immediately.
Null,
/// The child gets a pipe that `xy` holds open and never writes to,
/// so a read blocks instead of seeing EOF.
KeepOpen,
}
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct ServerConfig {
pub name: String,
@@ -83,6 +96,8 @@ pub struct ServerConfig {
pub stop: StopConfig,
#[serde(default)]
pub wait_for: Option<WaitForConfig>,
#[serde(default)]
pub stdin: StdinMode,
}
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+78 -1
View File
@@ -1,5 +1,5 @@
use crate::{
ConfigError, RestartConfig, RestartPolicy, ServerConfig, StopConfig, WaitCondition,
ConfigError, RestartConfig, RestartPolicy, ServerConfig, StdinMode, StopConfig, WaitCondition,
WaitForConfig, default_wait_interval, default_wait_timeout,
};
use kdl::{KdlDocument, KdlNode};
@@ -31,6 +31,7 @@ pub fn parse_server_config(
let restart = parse_restart(&doc, source_path)?;
let stop = parse_stop(&doc, source_path)?;
let wait_for = parse_wait_for(&doc, source_path)?;
let stdin = parse_stdin(&doc, source_path)?;
Ok(ServerConfig {
name: name.to_string(),
@@ -42,6 +43,7 @@ pub fn parse_server_config(
restart,
stop,
wait_for,
stdin,
})
}
@@ -214,6 +216,27 @@ fn parse_restart(doc: &KdlDocument, path: &Path) -> Result<RestartConfig, Config
Ok(out)
}
fn parse_stdin(doc: &KdlDocument, path: &Path) -> Result<StdinMode, ConfigError> {
let Some(node) = find_node(doc, "stdin") else {
return Ok(StdinMode::default());
};
single_arg(node, "stdin", path)?;
let s = string_arg(node, "stdin", path)?;
match s.as_str() {
"inherit" => Ok(StdinMode::Inherit),
"null" => Ok(StdinMode::Null),
"keep-open" => Ok(StdinMode::KeepOpen),
other => Err(ConfigError::InvalidValue {
path: path.to_path_buf(),
field: "stdin",
message: format!("unknown stdin mode `{other}`"),
}),
}
}
fn parse_stop(doc: &KdlDocument, path: &Path) -> Result<StopConfig, ConfigError> {
let Some(node) = find_node(doc, "stop") else {
return Ok(StopConfig::default());
@@ -810,4 +833,58 @@ stop {
WaitCondition::Path(PathBuf::from("/x"))
);
}
#[test]
fn stdin_defaults_to_inherit() {
let text = "command \"/bin/x\"\nport 1";
let cfg = parse_server_config("foo", text, p()).unwrap();
assert_eq!(cfg.stdin, StdinMode::Inherit);
}
#[test]
fn parses_stdin_inherit() {
let text = "command \"/bin/x\"\nport 1\nstdin \"inherit\"";
let cfg = parse_server_config("foo", text, p()).unwrap();
assert_eq!(cfg.stdin, StdinMode::Inherit);
}
#[test]
fn parses_stdin_null() {
let text = "command \"/bin/x\"\nport 1\nstdin \"null\"";
let cfg = parse_server_config("foo", text, p()).unwrap();
assert_eq!(cfg.stdin, StdinMode::Null);
}
#[test]
fn parses_stdin_keep_open() {
let text = "command \"/bin/x\"\nport 1\nstdin \"keep-open\"";
let cfg = parse_server_config("foo", text, p()).unwrap();
assert_eq!(cfg.stdin, StdinMode::KeepOpen);
}
#[test]
fn unknown_stdin_mode_fails() {
let text = "command \"/bin/x\"\nport 1\nstdin \"maybe\"";
let err = parse_server_config("foo", text, p()).unwrap_err();
assert!(matches!(
err,
ConfigError::InvalidValue { field: "stdin", .. }
));
}
#[test]
fn stdin_with_two_args_fails() {
let text = "command \"/bin/x\"\nport 1\nstdin \"null\" \"keep-open\"";
let err = parse_server_config("foo", text, p()).unwrap_err();
assert!(matches!(
err,
ConfigError::InvalidValue { field: "stdin", .. }
));
}
}
+2 -2
View File
@@ -7,8 +7,8 @@ pub mod rpc;
pub mod state;
pub use config::{
RestartConfig, RestartPolicy, ServerConfig, StopConfig, WaitCondition, WaitForConfig,
default_wait_interval, default_wait_timeout,
RestartConfig, RestartPolicy, ServerConfig, StdinMode, StopConfig, WaitCondition,
WaitForConfig, default_wait_interval, default_wait_timeout,
};
pub use error::{ConfigError, RpcErrorCode};
pub use kdl_parse::{load_all_configs, parse_server_config};