Recover the MCP lane on top of current main

This resolves the stale-branch merge against origin/main, keeps the MCP runtime wiring, and preserves prompt-approved CLI tool execution after the mock parity harness additions landed upstream.

Constraint: Branch had to absorb origin/main changes through a contentful merge before more MCP work
Constraint: Prompt-approved runtime tool execution must continue working with new CLI/mock parity coverage
Rejected: Keep permission enforcer attached inside CliToolExecutor for conversation turns | caused prompt-approved bash parity flow to fail as a tool error
Rejected: Defer the merge and continue on stale history | would leave the lane red against current main
Confidence: high
Scope-risk: moderate
Reversibility: clean
Directive: Runtime permission policy and executor-side permission enforcement are separate layers; do not reapply executor enforcement to conversation turns without revalidating mock parity harness approval flows
Tested: cargo test -p rusty-claude-cli --test mock_parity_harness -- --nocapture; cargo test -p rusty-claude-cli -- --nocapture; cargo test --workspace -- --nocapture
Not-tested: Additional live remote/provider scenarios beyond the existing workspace suite
This commit is contained in:
Yeachan-Heo
2026-04-03 14:51:18 +00:00
64 changed files with 10374 additions and 585 deletions

View File

@@ -1,4 +1,5 @@
mod bash;
pub mod bash_validation;
mod bootstrap;
mod compact;
mod config;
@@ -6,16 +7,21 @@ mod conversation;
mod file_ops;
mod hooks;
mod json;
pub mod lsp_client;
mod mcp;
mod mcp_client;
mod mcp_stdio;
pub mod mcp_tool_bridge;
mod oauth;
pub mod permission_enforcer;
mod permissions;
mod prompt;
mod remote;
pub mod sandbox;
mod session;
mod sse;
pub mod task_registry;
pub mod team_cron_registry;
mod usage;
pub use bash::{execute_bash, BashCommandInput, BashCommandOutput};