Skip to content

Commit 3c8d6ea

Browse files
committed
Merge remote-tracking branch 'origin/codex-fix-on-v0.1.13' into approval-destrand
# Conflicts: # animus-plugin-runtime/Cargo.toml # animus-plugin-runtime/src/lib.rs # animus-provider-protocol/Cargo.toml
2 parents e234eca + 5403f17 commit 3c8d6ea

18 files changed

Lines changed: 4376 additions & 26 deletions

File tree

animus-plugin-runtime/src/lib.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,12 @@ async fn handle_agent_run<P: ProviderBackend>(
522522
metadata.push(json!({ "artifact_id": artifact_id, "metadata": m }));
523523
}
524524
SessionEvent::Metadata { metadata: m } => metadata.push(m),
525+
// Native interaction channel (agent/respond) is handled by the
526+
// session-provider runtime, not this provider runtime; the approval
527+
// gate uses the transport-level hook (claude --permission-prompt-tool
528+
// / prompt preamble), so these events are inert here.
529+
SessionEvent::InteractionRequested { .. }
530+
| SessionEvent::InteractionResolved { .. } => {}
525531
SessionEvent::Error {
526532
message,
527533
recoverable,
@@ -600,9 +606,6 @@ fn build_session_request(info: &ProviderInfo, params: AgentRunParams) -> Session
600606
if let Some(profile) = params.claude_profile {
601607
extras.insert("claude_profile".to_string(), Value::String(profile));
602608
}
603-
if let Some(mcp) = params.mcp_servers {
604-
extras.insert("mcp_servers".to_string(), mcp);
605-
}
606609
if let Some(tools) = params.tools {
607610
extras.insert("tools".to_string(), tools);
608611
}
@@ -625,6 +628,7 @@ fn build_session_request(info: &ProviderInfo, params: AgentRunParams) -> Session
625628
cwd: params.cwd,
626629
project_root: params.project_root,
627630
mcp_endpoint: None,
631+
mcp_servers: params.mcp_servers,
628632
permission_mode: params.permission_mode,
629633
timeout_secs: params.timeout_secs,
630634
env_vars: params.env.into_iter().collect(),

0 commit comments

Comments
 (0)