Skip to content

An agent-managed museum exhibit, built in Rust with Gajae-Code / LazyCodex — developed and maintained with no human intervention.

Rust

Recover the MCP lane on top of current main

Yeachan-Heobf5eb8785eb7
diff --cc rust/crates/rusty-claude-cli/src/main.rs
index 40edf0ee,b986fa79..d151a88f
--- a/rust/crates/rusty-claude-cli/src/main.rs
+++ b/rust/crates/rusty-claude-cli/src/main.rs
@@@ -40,16 -40,16 +40,17 @@@ use plugins::{PluginHooks, PluginManage
use render::{MarkdownStreamState, Spinner, TerminalRenderer};
use runtime::{
clear_oauth_credentials, generate_pkce_pair, generate_state, load_system_prompt,
- parse_oauth_callback_request_target, resolve_sandbox_status, save_oauth_credentials, ApiClient,
- ApiRequest, AssistantEvent, CompactionConfig, ConfigLoader, ConfigSource, ContentBlock,
- ConversationMessage, ConversationRuntime, McpServerManager, McpTool, MessageRole,
- OAuthAuthorizationRequest, OAuthConfig, OAuthTokenExchangeRequest, PermissionMode,
- PermissionPolicy, ProjectContext, PromptCacheEvent, RuntimeError, Session, TokenUsage,
- ToolError, ToolExecutor, UsageTracker,
+ parse_oauth_callback_request_target, resolve_sandbox_status, save_oauth_credentials,
- ApiClient, ApiRequest, AssistantEvent,
- CompactionConfig, ConfigLoader, ConfigSource, ContentBlock, ConversationMessage,
- ConversationRuntime, MessageRole, OAuthAuthorizationRequest, OAuthConfig,
- OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, PromptCacheEvent,
- ResolvedPermissionMode, RuntimeError, Session, TokenUsage, ToolError, ToolExecutor,
- UsageTracker, ModelPricing, format_usd, pricing_for_model,
++ ApiClient, ApiRequest, AssistantEvent, CompactionConfig, ConfigLoader, ConfigSource,
++ ContentBlock, ConversationMessage, ConversationRuntime, McpServerManager, McpTool,
++ MessageRole, ModelPricing, OAuthAuthorizationRequest, OAuthConfig,
++ OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext,
++ PromptCacheEvent, ResolvedPermissionMode, RuntimeError, Session, TokenUsage, ToolError,
++ ToolExecutor, UsageTracker, format_usd, pricing_for_model,
};
+use serde::Deserialize;
use serde_json::json;
-use tools::GlobalToolRegistry;
+use tools::{GlobalToolRegistry, RuntimeToolDefinition, ToolSearchOutput};
const DEFAULT_MODEL: &str = "claude-opus-4-6";
fn max_tokens_for_model(model: &str) -> u32 {
@@@ -4111,9 -3987,10 +4296,11 @@@ fn build_runtime_with_plugin_state
feature_config,
tool_registry,
plugin_registry,
+ mcp_state,
} = runtime_plugin_state;
plugin_registry.initialize()?;
+ let policy = permission_policy(permission_mode, &feature_config, &tool_registry)
+ .map_err(std::io::Error::other)?;
let mut runtime = ConversationRuntime::new_with_features(
session,
AnthropicRuntimeClient::new(
@@@ -4125,14 -4002,8 +4312,13 @@@
tool_registry.clone(),
progress_reporter,
)?,
- CliToolExecutor::new(allowed_tools.clone(), emit_output, tool_registry),
+ CliToolExecutor::new(
+ allowed_tools.clone(),
+ emit_output,
+ tool_registry.clone(),
+ mcp_state.clone(),
+ ),
- permission_policy(permission_mode, &feature_config, &tool_registry)
- .map_err(std::io::Error::other)?,
+ policy,
system_prompt,
&feature_config,
);
diff --cc rust/crates/tools/src/lib.rs
index 81e41218,610ab6c6..4a956132
--- a/rust/crates/tools/src/lib.rs
+++ b/rust/crates/tools/src/lib.rs
@@@ -56,26 -93,18 +93,28 @@@ pub struct ToolSpec
pub required_permission: PermissionMode,
}
- #[derive(Debug, Clone, PartialEq)]
+ #[derive(Debug, Clone)]
pub struct GlobalToolRegistry {
plugin_tools: Vec<PluginTool>,
+ runtime_tools: Vec<RuntimeToolDefinition>,
+ enforcer: Option<PermissionEnforcer>,
}
+#[derive(Debug, Clone, PartialEq)]
+pub struct RuntimeToolDefinition {
+ pub name: String,
+ pub description: Option<String>,
+ pub input_schema: Value,
+ pub required_permission: PermissionMode,
+}
+
impl GlobalToolRegistry {
#[must_use]
pub fn builtin() -> Self {
Self {
plugin_tools: Vec::new(),
+ runtime_tools: Vec::new(),
+ enforcer: None,
}
}
@@@ -98,39 -127,15 +137,46 @@@
}
}
- Ok(Self { plugin_tools, enforcer: None })
+ Ok(Self {
+ plugin_tools,
+ runtime_tools: Vec::new(),
++ enforcer: None,
+ })
+ }
+
+ pub fn with_runtime_tools(
+ mut self,
+ runtime_tools: Vec<RuntimeToolDefinition>,
+ ) -> Result<Self, String> {
+ let mut seen_names = mvp_tool_specs()
+ .into_iter()
+ .map(|spec| spec.name.to_string())
+ .chain(
+ self.plugin_tools
+ .iter()
+ .map(|tool| tool.definition().name.clone()),
+ )
+ .collect::<BTreeSet<_>>();
+
+ for tool in &runtime_tools {
+ if !seen_names.insert(tool.name.clone()) {
+ return Err(format!(
+ "runtime tool `{}` conflicts with an existing tool name",
+ tool.name
+ ));
+ }
+ }
+
+ self.runtime_tools = runtime_tools;
+ Ok(self)
}
+ #[must_use]
+ pub fn with_enforcer(mut self, enforcer: PermissionEnforcer) -> Self {
+ self.set_enforcer(enforcer);
+ self
+ }
+
pub fn normalize_allowed_tools(
&self,
values: &[String],
@@@ -244,37 -234,16 +290,41 @@@
.map(|permission| (tool.definition().name.clone(), permission))
})
.collect::<Result<Vec<_>, _>>()?;
- Ok(builtin.chain(plugin).collect())
+ Ok(builtin.chain(runtime).chain(plugin).collect())
+ }
+
+ #[must_use]
+ pub fn has_runtime_tool(&self, name: &str) -> bool {
+ self.runtime_tools.iter().any(|tool| tool.name == name)
+ }
+
+ #[must_use]
+ pub fn search(
+ &self,
+ query: &str,
+ max_results: usize,
+ pending_mcp_servers: Option<Vec<String>>,
+ ) -> ToolSearchOutput {
+ let query = query.trim().to_string();
+ let normalized_query = normalize_tool_search_query(&query);
+ let matches = search_tool_specs(&query, max_results.max(1), &self.searchable_tool_specs());
+
+ ToolSearchOutput {
+ matches,
+ query,
+ normalized_query,
+ total_deferred_tools: self.searchable_tool_specs().len(),
+ pending_mcp_servers,
+ }
}
+ pub fn set_enforcer(&mut self, enforcer: PermissionEnforcer) {
+ self.enforcer = Some(enforcer);
+ }
+
pub fn execute(&self, name: &str, input: &Value) -> Result<String, String> {
if mvp_tool_specs().iter().any(|spec| spec.name == name) {
- return execute_tool(name, input);
+ return execute_tool_with_enforcer(self.enforcer.as_ref(), name, input);
}
self.plugin_tools
.iter()
@@@ -3516,11 -4332,14 +4425,14 @@@ mod tests
use super::{
agent_permission_policy, allowed_tools_for_subagent, execute_agent_with_spawn,
execute_tool, final_assistant_text, mvp_tool_specs, permission_mode_from_plugin,
- persist_agent_terminal_state, push_output_block, AgentInput, AgentJob,
- GlobalToolRegistry, SubagentToolExecutor,
+ persist_agent_terminal_state, push_output_block, AgentInput, AgentJob, GlobalToolRegistry,
+ SubagentToolExecutor,
};
use api::OutputContentBlock;
- use runtime::{ApiRequest, AssistantEvent, ConversationRuntime, RuntimeError, Session};
+ use runtime::{
+ permission_enforcer::PermissionEnforcer, ApiRequest, AssistantEvent, ConversationRuntime,
+ PermissionMode, PermissionPolicy, RuntimeError, Session, ToolExecutor,
+ };
use serde_json::json;
fn env_lock() -> &'static Mutex<()> {