Skip to content

feat: add explicit plugin config file override #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bbednarski9 wants to merge 1 commit into
base: main
Choose a base branch
from
+299 −9
Open

feat: add explicit plugin config file override #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 101 additions & 5 deletions crates/cli/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ pub(crate) struct ServerArgs {
/// Generic plugin configuration JSON for process-level gateway plugin activation.
#[arg(long, env = "NEMO_RELAY_PLUGIN_CONFIG")]
pub(crate) plugin_config: Option<String>,
/// Path to plugin configuration TOML for process-level gateway plugin activation.
#[arg(long, env = "NEMO_RELAY_PLUGIN_CONFIG_FILE")]
pub(crate) plugin_config_file: Option<PathBuf>,
Comment on lines +202 to +203
Copy link
Copy Markdown
Member

@willkill07 willkill07 Jun 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#[arg(long, env = "NEMO_RELAY_PLUGIN_CONFIG_FILE")]
pub(crate) plugin_config_file: Option<PathBuf>,
#[arg(long, env = "NEMO_RELAY_PLUGIN_OVERRIDE_CONFIG_FILE")]
pub(crate) plugin_override_config_file: Option<PathBuf>,

I would have the name be more descriptive indicating that it overrides rather than layers.

}

impl ServerArgs {
Expand All @@ -211,6 +214,7 @@ impl ServerArgs {
|| self.openai_base_url.is_some()
|| self.anthropic_base_url.is_some()
|| self.plugin_config.is_some()
|| self.plugin_config_file.is_some()
|| self.config.is_some()
}
}
Expand Down Expand Up @@ -269,6 +273,8 @@ pub(crate) struct RunCommand {
#[arg(long)]
pub(crate) plugin_config: Option<String>,
#[arg(long)]
pub(crate) plugin_config_file: Option<PathBuf>,
#[arg(long)]
pub(crate) dry_run: bool,
#[arg(long)]
pub(crate) print: bool,
Expand Down Expand Up @@ -432,7 +438,12 @@ impl Default for GatewayConfig {
/// File discovery and merge behavior live in `load_shared_config`; this function only applies the
/// server-facing command-line layer so launcher-only settings cannot leak into daemon mode.
pub(crate) fn resolve_server_config(args: &ServerArgs) -> Result<ResolvedConfig, CliError> {
let mut resolved = load_shared_config(args.config.as_ref())?;
validate_cli_plugin_config_sources(
args.plugin_config.as_ref(),
args.plugin_config_file.as_ref(),
)?;
let plugin_toml_override = load_plugin_config_file_override(args.plugin_config_file.as_ref())?;
let mut resolved = load_shared_config(args.config.as_ref(), plugin_toml_override)?;
apply_server_overrides(&mut resolved.gateway, args)?;
Ok(resolved)
}
Expand All @@ -450,14 +461,23 @@ pub(crate) fn resolve_run_config(
.config
.as_ref()
.or_else(|| inherited.and_then(|args| args.config.as_ref()));
let mut resolved = load_shared_config(config)?;
validate_run_plugin_config_sources(command, inherited)?;
let plugin_config_file = command
.plugin_config_file
.as_ref()
.or_else(|| inherited.and_then(|args| args.plugin_config_file.as_ref()));
let plugin_toml_override = load_plugin_config_file_override(plugin_config_file)?;
let mut resolved = load_shared_config(config, plugin_toml_override)?;
if let Some(args) = inherited {
// Run-subcommand plugin config has higher precedence than inherited top-level plugin
// config. Skip only that inherited field so file/plugins.toml conflicts are still caught
// when the run-level override is applied below.
if command.plugin_config.is_some() && args.plugin_config.is_some() {
if command.plugin_config.is_some() && args.plugin_config.is_some()
|| command.plugin_config_file.is_some() && args.plugin_config_file.is_some()
{
let mut inherited = args.clone();
inherited.plugin_config = None;
inherited.plugin_config_file = None;
apply_server_overrides(&mut resolved.gateway, &inherited)?;
} else {
apply_server_overrides(&mut resolved.gateway, args)?;
Expand Down Expand Up @@ -528,7 +548,10 @@ const PLUGINS_TOML: &str = "plugins.toml";
// shape onto runtime structs, applies a sibling/discovered plugins.toml when present, then lets
// environment variables override file values. Invalid TOML or typed shapes fail closed because
// they indicate an operator configuration error.
fn load_shared_config(explicit: Option<&PathBuf>) -> Result<ResolvedConfig, CliError> {
fn load_shared_config(
explicit: Option<&PathBuf>,
plugin_toml_override: Option<PluginTomlConfig>,
) -> Result<ResolvedConfig, CliError> {
let mut merged = toml::Value::Table(toml::map::Map::new());
let mut config_toml_plugin_sources = Vec::new();
for path in config_paths(explicit) {
Expand Down Expand Up @@ -562,7 +585,10 @@ fn load_shared_config(explicit: Option<&PathBuf>) -> Result<ResolvedConfig, CliE
format_paths(&config_toml_plugin_sources)
)));
}
let plugin_toml = load_plugin_toml_config(explicit)?;
let plugin_toml = match plugin_toml_override {
Some(plugin_toml) => Some(plugin_toml),
None => load_plugin_toml_config(explicit)?,
};
let mut resolved = ResolvedConfig {
gateway: GatewayConfig::default(),
..ResolvedConfig::default()
Expand Down Expand Up @@ -740,6 +766,38 @@ fn load_plugin_toml_config(
load_plugin_toml_config_from_paths(plugin_config_paths(explicit))
}

fn load_plugin_config_file_override(
path: Option<&PathBuf>,
) -> Result<Option<PluginTomlConfig>, CliError> {
path.map(|path| load_plugin_toml_config_from_path(path))
.transpose()
}

fn load_plugin_toml_config_from_path(path: &Path) -> Result<PluginTomlConfig, CliError> {
let raw = std::fs::read_to_string(path).map_err(|error| {
CliError::Config(format!(
"could not read plugin config file {}: {error}",
path.display()
))
})?;
let parsed = raw
.parse::<toml::Table>()
.map(toml::Value::Table)
.map_err(|error| {
CliError::Config(format!(
"invalid plugin TOML in {}: {error}",
path.display()
))
})?;
validate_plugin_toml_component_kinds(path, &parsed)?;
let value = serde_json::to_value(parsed)
.map_err(|error| CliError::Config(format!("invalid plugin TOML shape: {error}")))?;
Ok(PluginTomlConfig {
value,
sources: vec![path.to_path_buf()],
})
}
Comment on lines +769 to +799
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Jun 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial | 💤 Low value

Error message at line 794 could be more precise.

TOML parsing succeeds before this point; the error is from serde_json::to_value. "invalid plugin TOML shape" is slightly misleading since the issue is JSON conversion, not TOML structure. This failure path is extremely rare in practice, so low priority.

Optional: clarify error source 
     let value = serde_json::to_value(parsed)
-        .map_err(|error| CliError::Config(format!("invalid plugin TOML shape: {error}")))?;
+        .map_err(|error| CliError::Config(format!("could not convert plugin TOML to JSON: {error}")))?;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
fn load_plugin_config_file_override(
path: Option<&PathBuf>,
) -> Result<Option<PluginTomlConfig>, CliError> {
path.map(|path| load_plugin_toml_config_from_path(path))
.transpose()
}
fn load_plugin_toml_config_from_path(path: &Path) -> Result<PluginTomlConfig, CliError> {
let raw = std::fs::read_to_string(path).map_err(|error| {
CliError::Config(format!(
"could not read plugin config file {}: {error}",
path.display()
))
})?;
let parsed = raw
.parse::<toml::Table>()
.map(toml::Value::Table)
.map_err(|error| {
CliError::Config(format!(
"invalid plugin TOML in {}: {error}",
path.display()
))
})?;
validate_plugin_toml_component_kinds(path, &parsed)?;
let value = serde_json::to_value(parsed)
.map_err(|error| CliError::Config(format!("invalid plugin TOML shape: {error}")))?;
Ok(PluginTomlConfig {
value,
sources: vec![path.to_path_buf()],
})
}
fn load_plugin_config_file_override(
path: Option<&PathBuf>,
) -> Result<Option<PluginTomlConfig>, CliError> {
path.map(|path| load_plugin_toml_config_from_path(path))
.transpose()
}
fn load_plugin_toml_config_from_path(path: &Path) -> Result<PluginTomlConfig, CliError> {
let raw = std::fs::read_to_string(path).map_err(|error| {
CliError::Config(format!(
"could not read plugin config file {}: {error}",
path.display()
))
})?;
let parsed = raw
.parse::<toml::Table>()
.map(toml::Value::Table)
.map_err(|error| {
CliError::Config(format!(
"invalid plugin TOML in {}: {error}",
path.display()
))
})?;
validate_plugin_toml_component_kinds(path, &parsed)?;
let value = serde_json::to_value(parsed)
.map_err(|error| CliError::Config(format!("could not convert plugin TOML to JSON: {error}")))?;
Ok(PluginTomlConfig {
value,
sources: vec![path.to_path_buf()],
})
}
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@crates/cli/src/config.rs` around lines 769 - 799, The error text "invalid
plugin TOML shape" in load_plugin_toml_config_from_path is misleading because
the failure comes from serde_json::to_value (JSON conversion) rather than TOML
parsing; update the CliError message produced around the serde_json::to_value
call to clearly state it's a JSON serialization/conversion error (e.g., "failed
converting plugin TOML to JSON" or "plugin TOML could not be converted to
JSON"), keeping the same error interpolation of {error} and leaving the rest of
the function flow unchanged.


fn load_plugin_toml_config_from_paths<I>(paths: I) -> Result<Option<PluginTomlConfig>, CliError>
where
I: IntoIterator<Item = PathBuf>,
Expand Down Expand Up @@ -800,6 +858,44 @@ fn apply_cli_plugin_config(config: &mut GatewayConfig, value: &str) -> Result<()
Ok(())
}

fn validate_cli_plugin_config_sources(
plugin_config: Option<&String>,
plugin_config_file: Option<&PathBuf>,
) -> Result<(), CliError> {
if plugin_config.is_some() && plugin_config_file.is_some() {
return Err(CliError::Config(
"choose only one of --plugin-config or --plugin-config-file".into(),
));
}
Ok(())
}

fn validate_run_plugin_config_sources(
command: &RunCommand,
inherited: Option<&ServerArgs>,
) -> Result<(), CliError> {
validate_cli_plugin_config_sources(
command.plugin_config.as_ref(),
command.plugin_config_file.as_ref(),
)?;
if let Some(inherited) = inherited {
validate_cli_plugin_config_sources(
inherited.plugin_config.as_ref(),
inherited.plugin_config_file.as_ref(),
)?;
}
let inline_present = command.plugin_config.is_some()
|| inherited.is_some_and(|args| args.plugin_config.is_some());
let file_present = command.plugin_config_file.is_some()
|| inherited.is_some_and(|args| args.plugin_config_file.is_some());
if inline_present && file_present {
return Err(CliError::Config(
"choose only one of --plugin-config or --plugin-config-file".into(),
));
}
Ok(())
}

// Applies configured agent commands and Cursor's temporary-hook behavior. Cursor's
// `patch_restore_hooks` flag is intentionally tri-state in file config so omitted values preserve
// the safe default while explicit `false` disables temporary hook mutation.
Expand Down
1 change: 1 addition & 0 deletions crates/cli/src/launcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ pub(crate) async fn easy_path(
anthropic_base_url: None,
session_metadata: None,
plugin_config: None,
plugin_config_file: None,
dry_run: false,
print: false,
command: command.command,
Expand Down
Loading
Loading