WIP: feat(team): support manual teammate management

crates/aionui-ai-agent/src/agent_task.rs

@@ -529,9 +529,11 @@ mod aionrs_config_option_tests {
             compat_overrides: Default::default(),
             session_directory: std::env::temp_dir().join("aionrs-agent-task-test-sessions"),
             session_mode: None,
+            skills: Vec::new(),
             extra_mcp_servers: std::collections::HashMap::new(),
             bedrock_config: None,
             runtime_env: Vec::new(),
+            prompt_dump_dir: None,
         }
     }
 

crates/aionui-ai-agent/src/dev_prompt_dump.rs

@@ -3,6 +3,8 @@ use std::io;
 use std::path::{Path, PathBuf};
 use std::time::{SystemTime, UNIX_EPOCH};
 
+use serde_json::Value;
+
 pub(crate) struct PromptDump<'a> {
     pub kind: &'static str,
     pub backend: Option<&'a str>,
@@ -13,6 +15,17 @@ pub(crate) struct PromptDump<'a> {
     pub prompt: &'a str,
 }
 
+pub(crate) struct AgentFinalInputDump<'a> {
+    pub kind: &'static str,
+    pub backend: &'static str,
+    pub conversation_id: &'a str,
+    pub session_id: Option<&'a str>,
+    pub msg_id: Option<&'a str>,
+    pub turn_id: Option<&'a str>,
+    pub input: Value,
+    pub resolved_context: Value,
+}
+
 pub(crate) fn dump_dir_for_data_dir(data_dir: &Path, enabled: bool) -> Option<PathBuf> {
     if enabled {
         Some(data_dir.join("prompt-dumps"))
@@ -51,6 +64,36 @@ pub(crate) fn dump_prompt(dump_dir: &Path, dump: PromptDump<'_>) -> io::Result<P
     Ok(path)
 }
 
+pub(crate) fn dump_agent_final_input(dump_dir: &Path, dump: AgentFinalInputDump<'_>) -> io::Result<PathBuf> {
+    fs::create_dir_all(dump_dir)?;
+
+    let created_at_ms = current_time_ms();
+    let stamp = current_time_nanos();
+    let discriminator = dump.msg_id.or(dump.session_id).or(dump.turn_id).unwrap_or("none");
+    let file_name = format!(
+        "{}-{}-{}-{}.json",
+        stamp,
+        sanitize_segment(dump.kind),
+        sanitize_segment(dump.conversation_id),
+        sanitize_segment(discriminator)
+    );
+    let path = dump_dir.join(file_name);
+
+    let body = serde_json::to_vec_pretty(&serde_json::json!({
+        "kind": dump.kind,
+        "backend": dump.backend,
+        "conversation_id": dump.conversation_id,
+        "session_id": dump.session_id.unwrap_or("none"),
+        "msg_id": dump.msg_id.unwrap_or("none"),
+        "turn_id": dump.turn_id.unwrap_or("none"),
+        "created_at_ms": created_at_ms,
+        "input": dump.input,
+        "resolved_context": dump.resolved_context,
+    }))?;
+    fs::write(&path, body)?;
+    Ok(path)
+}
+
 fn current_time_ms() -> u128 {
     SystemTime::now()
         .duration_since(UNIX_EPOCH)
@@ -91,7 +134,7 @@ mod tests {
         let path = dump_prompt(
             temp.path(),
             PromptDump {
-                kind: "acp-first-prompt",
+                kind: "test-prompt",
                 backend: Some("claude"),
                 conversation_id: "conversation/123",
                 session_id: Some("session-1"),
@@ -104,12 +147,12 @@ mod tests {
 
         assert_eq!(path.parent(), Some(temp.path()));
         let file_name = path.file_name().unwrap().to_string_lossy();
-        assert!(file_name.contains("acp-first-prompt"));
+        assert!(file_name.contains("test-prompt"));
         assert!(file_name.contains("conversation_123"));
         assert!(file_name.contains("msg-1"));
 
         let content = std::fs::read_to_string(path).unwrap();
-        assert!(content.contains("kind: acp-first-prompt\n"));
+        assert!(content.contains("kind: test-prompt\n"));
         assert!(content.contains("backend: claude\n"));
         assert!(content.contains("conversation_id: conversation/123\n"));
         assert!(content.contains("session_id: session-1\n"));
@@ -118,6 +161,54 @@ mod tests {
         assert!(content.ends_with("---- prompt ----\nfinal prompt body\n"));
     }
 
+    #[test]
+    fn dump_agent_final_input_writes_json_with_raw_values() {
+        let temp = tempfile::tempdir().unwrap();
+
+        let path = dump_agent_final_input(
+            temp.path(),
+            AgentFinalInputDump {
+                kind: "acp-final-input",
+                backend: "acp",
+                conversation_id: "conversation/123",
+                session_id: Some("session-1"),
+                msg_id: Some("msg-1"),
+                turn_id: Some("turn-1"),
+                input: serde_json::json!({
+                    "content": "[Assistant Rules]\nraw secret\n[/Assistant Rules]\n\nhello"
+                }),
+                resolved_context: serde_json::json!({
+                    "mcp_servers": [{
+                        "name": "raw-mcp",
+                        "env": { "TOKEN": "raw-token-value" }
+                    }]
+                }),
+            },
+        )
+        .unwrap();
+
+        let file_name = path.file_name().unwrap().to_string_lossy();
+        assert!(file_name.contains("acp-final-input"));
+        assert!(file_name.contains("conversation_123"));
+        assert!(file_name.contains("msg-1"));
+
+        let dump: serde_json::Value = serde_json::from_str(&std::fs::read_to_string(path).unwrap()).unwrap();
+        assert_eq!(dump["kind"], "acp-final-input");
+        assert_eq!(dump["backend"], "acp");
+        assert_eq!(dump["conversation_id"], "conversation/123");
+        assert_eq!(dump["session_id"], "session-1");
+        assert_eq!(dump["msg_id"], "msg-1");
+        assert_eq!(dump["turn_id"], "turn-1");
+        assert_eq!(
+            dump["input"]["content"],
+            "[Assistant Rules]\nraw secret\n[/Assistant Rules]\n\nhello"
+        );
+        assert_eq!(
+            dump["resolved_context"]["mcp_servers"][0]["env"]["TOKEN"],
+            "raw-token-value"
+        );
+    }
+
     #[test]
     fn disabled_dump_prompts_returns_no_dump_dir() {
         let data_dir = Path::new("/Users/alice/.aionui-dev");

crates/aionui-ai-agent/src/factory/aionrs.rs

@@ -29,6 +29,7 @@ pub(super) async fn build(
     ctx: FactoryContext,
 ) -> Result<AgentInstance, AgentError> {
     let mut overrides = build_context.config;
+    let resolved_skills = overrides.skills.clone();
 
     // Merge preset assistant rules into system_prompt (used as custom_prompt
     // in aionrs's build_system_prompt). Mirrors the old architecture's
@@ -166,9 +167,11 @@ pub(super) async fn build(
         compat_overrides,
         session_directory,
         session_mode: overrides.session_mode,
+        skills: resolved_skills,
         extra_mcp_servers,
         bedrock_config,
         runtime_env: ctx.runtime_env,
+        prompt_dump_dir: crate::dev_prompt_dump::dump_dir_for_data_dir(&deps.data_dir, deps.dump_prompts),
     };
 
     if let Some(system_prompt) = config.system_prompt.as_deref()