feat(mcp,plugins): MCP startup retry backoff, tool timeout override, plugin disable enforcement#4568
Merged
Merged
Conversation
…de, and plugin disable enforcement
MCP startup retry backoff (zeph-mcp, zeph-config):
- `McpConfig.startup_retry_backoff_ms: u64` (default 1000 ms) configures
exponential backoff between connection attempts
- `connect_retry_backoff(attempt, base_ms)` uses caller-supplied base
instead of hardcoded 500 ms
- `retry_loop` accepts `retry_backoff_base_ms` wired from `spawn_non_oauth_connections`
- Config migration step 50 adds commented keys to existing configs
MCP per-call tool timeout override (zeph-mcp, zeph-config):
- `McpClient::call_tool_with_timeout(name, args, timeout)` — new method
with caller-supplied duration; `call_tool` delegates to it for backward compat
- `McpConfig.tool_timeout_secs: Option<u64>` (default None) — only overrides
per-server timeout when explicitly set; existing per-server timeouts respected
- `validate_tool_timeout_secs` deserializer rejects values > 3600 s
- `with_tool_timeout_secs` clamps 0 to 1 to prevent instant timeouts
- Bootstrap wires both new fields into `McpManager`
Plugin disable dependency enforcement (zeph-plugins):
- `DisableResult { forced_over_dependents: Vec<String> }` — returned on success
- `disable(name, force: bool)` — `force=false` refuses with `DependencyRequired`
when enabled plugins depend on target; `force=true` proceeds with WARN log
BREAKING: `PluginManager::disable(name)` → `disable(name, force: bool)`;
pass `force: false` to preserve prior behavior.
Closes #4039, #4004
github-actions
Bot
added
documentation
…ation_suboptimal_units)
This was referenced May 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Claude Code parity gaps from #4039 and #4004: three features implemented across
zeph-mcpandzeph-plugins.MCP startup retry backoff (
zeph-mcp,zeph-config)McpConfig.startup_retry_backoff_ms: u64(default 1000 ms) configures exponential backoff between connection attemptsconnect_retry_backoff(attempt, base_ms)uses caller-supplied base instead of hardcoded 500 msMCP per-call tool timeout override (
zeph-mcp,zeph-config)McpClient::call_tool_with_timeout(name, args, timeout)— new method with caller-suppliedDurationMcpConfig.tool_timeout_secs: Option<u64>(defaultNone) — only overrides per-server timeout when explicitly set; existing per-server timeouts are respected when this is absentvalidate_tool_timeout_secsdeserializer rejects values > 3600 swith_tool_timeout_secs(0)clamped to 1 to prevent instant timeoutsPlugin disable dependency enforcement (
zeph-plugins)DisableResult { forced_over_dependents: Vec<String> }returned on successdisable(name, force: bool)—force=falserefuses withDependencyRequiredwhen enabled plugins depend on target;force=trueproceeds with WARN logenable_recursiveemitstracing::warn!when a transitive dependency re-enables an explicitly-disabled pluginTest plan
cargo +nightly fmt --check— cleancargo clippy --workspace -- -D warnings— cleanRUSTFLAGS="-D warnings" cargo check --workspace --all-targets --features desktop,ide,server,chat,pdf,scheduler --locked— cleancargo nextest run --workspace --lib --bins— 10163/10163 passedcall_tool_uses_tool_timeout_branch_when_configuredcovers theSome(tool_timeout_secs)dispatch path--forcetestsBreaking change
PluginManager::disable(name)→disable(name, force: bool)— passforce: falseto preserve prior behavior. Documented in CHANGELOG.md.Closes #4039, #4004