@team-agent/installer 0.5.103 → 0.5.105

package/Cargo.lock

@@ -581,7 +581,7 @@ dependencies = [
 
 [[package]]
 name = "team-agent"
-version = "0.5.103"
+version = "0.5.105"
 dependencies = [
  "anyhow",
  "chrono",

package/Cargo.toml

@@ -9,7 +9,7 @@ members = ["crates/team-agent", "crates/win-conpty-phase0", "crates/conpty-trans
 
 [workspace.package]
 edition = "2021"
-version = "0.5.103"
+version = "0.5.105"
 license = "AGPL-3.0"
 rust-version = "1.95"
 

package/crates/team-agent/src/cli/adapters.rs

@@ -1100,6 +1100,7 @@ pub fn cmd_start_agent(args: &StartAgentArgs) -> Result<CmdResult, CliError> {
         args.force,
         args.allow_fresh,
         args.team.as_deref(),
+        &args.role_config,
     )?;
     if value.get("agent_ids").is_none() {
         if let Some(object) = value.as_object_mut() {
@@ -1142,6 +1143,7 @@ pub fn cmd_add_agent(args: &AddAgentArgs) -> Result<CmdResult, CliError> {
         &args.role_file,
         args.team.as_deref(),
         args.force,
+        &args.role_config,
     )?;
     if value.get("agent_ids").is_none() {
         if let Some(object) = value.as_object_mut() {

package/crates/team-agent/src/cli/emit.rs

@@ -1430,9 +1430,107 @@ fn restart_args(args: &[String], cwd: &Path) -> Result<RestartArgs, CliError> {
     })
 }
 
+// Keep strict role CLI parsing separate from the legacy shared parser.
+fn role_agent_args(args: &[String], add: bool) -> Result<(ParsedArgs, crate::lifecycle::role_config::RoleConfigPatch), CliError> {
+    let mut role = crate::lifecycle::role_config::RoleConfigPatch::default();
+    let mut forwarded = Vec::new();
+    let mut seen = std::collections::BTreeSet::new();
+    let mut index = 0;
+    while index < args.len() {
+        let argument = &args[index];
+        if !argument.starts_with('-') {
+            forwarded.push(argument.clone());
+            index += 1;
+            continue;
+        }
+        let (flag, inline) = argument.split_once('=').map_or((argument.as_str(), None), |(key, value)| (key, Some(value)));
+        if !seen.insert(flag.to_string()) { return Err(CliError::Usage(format!("duplicate {flag}"))); }
+        if matches!(flag, "--json" | "--allow-fresh" | "--force") {
+            if inline.is_some() || (add && flag == "--allow-fresh") {
+                return Err(CliError::Usage(format!("unsupported option: {argument}")));
+            }
+            forwarded.push(flag.to_string());
+            index += 1;
+            continue;
+        }
+        if !matches!(flag, "--provider" | "--model" | "--effort" | "--bypass" | "--prompt" | "--profile" | "--workspace" | "--team" | "--role-file")
+            || (!add && flag == "--role-file") {
+            return Err(CliError::Usage(format!("unknown option: {flag}")));
+        }
+        let value = if let Some(value) = inline { value.to_string() } else {
+            index += 1;
+            args.get(index).filter(|value| !value.starts_with("--"))
+                .ok_or_else(|| CliError::Usage(format!("missing value for {flag}")))?.clone()
+        };
+        if value.trim().is_empty() { return Err(CliError::Usage(format!("empty value for {flag}"))); }
+        match flag {
+            "--provider" => {
+                let provider = crate::provider::wire::parse_provider(&value)
+                    .ok_or_else(|| CliError::Usage(format!("unknown provider: {value}")))?;
+                role.provider = Some(crate::provider::wire::provider_wire(provider).to_string());
+            }
+            "--bypass" => role.bypass = Some(match value.as_str() {
+                "true" => true, "false" => false,
+                _ => return Err(CliError::Usage("--bypass requires true or false".into())),
+            }),
+            "--model" => role.model = Some(value),
+            "--effort" => {
+                if crate::model::enums::ProviderEffort::parse(&value).is_none() {
+                    return Err(CliError::Usage(format!("unknown effort: {value}")));
+                }
+                role.effort = Some(value);
+            }
+            "--prompt" => role.prompt = Some(value),
+            "--profile" => role.profile = Some(value),
+            _ => { forwarded.push(flag.to_string()); forwarded.push(value); }
+        }
+        index += 1;
+    }
+    let parsed = parse_args(&forwarded);
+    if add && parsed.role_file.is_none() {
+        if role.provider.is_none() { return Err(CliError::Usage("add-agent requires --provider <name>".into())); }
+        if role.bypass.is_none() { return Err(CliError::Usage("add-agent requires --bypass <true|false>".into())); }
+    }
+    if parsed.positionals.len() != 1 { return Err(CliError::Usage("expected exactly one agent id".into())); }
+    Ok((parsed, role))
+}
+
+#[cfg(test)]
+mod role_cli_tests {
+    use super::*;
+    fn strings(values: &[&str]) -> Vec<String> { values.iter().map(|value| (*value).to_string()).collect() }
+
+    #[test]
+    fn add_requires_decisions_without_a_template_but_accepts_file_input() {
+        for args in [vec!["w"], vec!["w", "--provider", "pi"], vec!["w", "--bypass", "false"]] {
+            assert!(role_agent_args(&strings(&args), true).is_err());
+        }
+        assert!(role_agent_args(&strings(&["w", "--role-file", "w.md"]), true).is_ok());
+        let (parsed, _) = role_agent_args(&strings(&["w", "--role-file", "w.md", "--force"]), true).unwrap();
+        assert!(parsed.force);
+        assert!(role_agent_args(&strings(&["w", "--role-file", "w.md", "--force=true"]), true).is_err());
+        assert!(role_agent_args(&strings(&["w", "--role-file", "w.md", "--allow-fresh"]), true).is_err());
+        let (_, patch) = role_agent_args(&strings(&["w", "--provider=pi", "--bypass=false"]), true).unwrap();
+        assert_eq!(patch.provider.as_deref(), Some("pi"));
+        assert_eq!(patch.bypass, Some(false));
+    }
+
+    #[test]
+    fn strict_role_options_reject_ambiguous_values() {
+        for args in [
+            vec!["w", "--bypass"], vec!["w", "--bypass", "yes"],
+            vec!["w", "--no-bypass"], vec!["w", "--bypass", "true", "--bypass=false"],
+            vec!["w", "--unknown", "x"], vec!["w", "extra"],
+        ] { assert!(role_agent_args(&strings(&args), false).is_err()); }
+        let (_, patch) = role_agent_args(&strings(&["w"]), false).unwrap();
+        assert_eq!(patch, crate::lifecycle::role_config::RoleConfigPatch::default());
+    }
+}
+
 fn start_agent_args(args: &[String], cwd: &Path) -> Result<StartAgentArgs, CliError> {
-    let parsed = parse_args(args);
+    let (parsed, role_config) = role_agent_args(args, false)?;
     Ok(StartAgentArgs {
+        role_config,
         agent: required_pos(&parsed, 0, "agent")?,
         workspace: workspace(&parsed, cwd),
         team: parsed.team,
@@ -1466,14 +1564,13 @@ fn reset_agent_args(args: &[String], cwd: &Path) -> Result<ResetAgentArgs, CliEr
 }
 
 fn add_agent_args(args: &[String], cwd: &Path) -> Result<AddAgentArgs, CliError> {
-    let parsed = parse_args(args);
+    let (parsed, role_config) = role_agent_args(args, true)?;
     Ok(AddAgentArgs {
+        role_config,
         agent: required_pos(&parsed, 0, "agent")?,
         workspace: workspace(&parsed, cwd),
         team: parsed.team,
-        role_file: parsed
-            .role_file
-            .ok_or_else(|| CliError::Usage("missing --role-file".to_string()))?,
+        role_file: parsed.role_file.unwrap_or_default(),
         force: parsed.force,
         json: parsed.json,
     })

package/crates/team-agent/src/cli/mod.rs

@@ -2750,15 +2750,12 @@ pub mod lifecycle_port {
         force: bool,
         allow_fresh: bool,
         team: Option<&str>,
+        role_config: &crate::lifecycle::role_config::RoleConfigPatch,
     ) -> Result<Value, CliError> {
+        let _ = force; // Never grants authority to stop an already-running seat.
         let agent_id = crate::model::ids::AgentId::new(agent);
-        match crate::lifecycle::start_agent(
-            workspace,
-            &agent_id,
-            force,
-            true,
-            allow_fresh,
-            team,
+        match crate::lifecycle::role_config::start_agent_from_role(
+            workspace, &agent_id, role_config, allow_fresh, team,
         ) {
             Ok(crate::lifecycle::StartAgentOutcome::Running {
                 env,
@@ -2876,15 +2873,12 @@ pub mod lifecycle_port {
         role_file: &str,
         team: Option<&str>,
         force: bool,
+        role_config: &crate::lifecycle::role_config::RoleConfigPatch,
     ) -> Result<Value, CliError> {
         let agent_id = crate::model::ids::AgentId::new(agent);
-        match crate::lifecycle::add_agent_force(
-            workspace,
-            &agent_id,
-            Path::new(role_file),
-            true,
-            team,
-            force,
+        let source = (!role_file.is_empty()).then(|| Path::new(role_file));
+        match crate::lifecycle::role_config::add_agent_from_role(
+            workspace, &agent_id, source, role_config, force, team,
         ) {
             Ok(report) => Ok(agent_action_value(
                 agent,

package/crates/team-agent/src/cli/spec.rs

@@ -152,8 +152,8 @@ pub(crate) const COMMAND_SPECS: &[CommandSpec] = &[
     CommandSpec { name: "wait", tier: CommandTier::Core, category: CommandCategory::Daily, kind: CommandKind::Dispatch(DispatchKind::Wait), summary: "block until a task result is stored", usage: "usage: team-agent wait --task TASK [--workspace WORKSPACE] [--json]", default_help: false, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
     CommandSpec { name: "restart", tier: CommandTier::Core, category: CommandCategory::TeamLifecycle, kind: CommandKind::Dispatch(DispatchKind::Restart), summary: "restart the selected team", usage: "usage: team-agent restart [WORKSPACE] [--team TEAM] [--allow-fresh] [--session-converge-deadline SECONDS] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, sunset: None, action: None, governance: None },
     CommandSpec { name: "shutdown", tier: CommandTier::Core, category: CommandCategory::TeamLifecycle, kind: CommandKind::Dispatch(DispatchKind::Shutdown), summary: "stop the selected team", usage: "usage: team-agent shutdown [--workspace WORKSPACE] [--team TEAM] [--keep-logs] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
-    CommandSpec { name: "add-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::AddAgent), summary: "add or force-recreate a worker", usage: "usage: team-agent add-agent AGENT --role-file FILE [--force] [--workspace WORKSPACE] [--team TEAM] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, sunset: None, action: None, governance: None },
-    CommandSpec { name: "start-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::StartAgent), summary: "start an existing worker", usage: "usage: team-agent start-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--force] [--allow-fresh] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, sunset: None, action: None, governance: None },
+    CommandSpec { name: "add-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::AddAgent), summary: "create and start a new worker", usage: "usage: team-agent add-agent AGENT [--role-file FILE] [--provider NAME] [--bypass true|false] [--model SLUG] [--effort LEVEL] [--prompt TEXT] [--profile NAME] [--force] [--workspace WORKSPACE] [--team TEAM] [--json] (provider/bypass required from CLI or role file; conflicting values rejected; force only recreates a confirmed dead registered pane)", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, sunset: None, action: None, governance: None },
+    CommandSpec { name: "start-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::StartAgent), summary: "update and start a stopped worker (stop first if running)", usage: "usage: team-agent start-agent AGENT [--model SLUG] [--effort LEVEL] [--bypass true|false] [--prompt TEXT] [--profile NAME] [--provider NAME] [--workspace WORKSPACE] [--team TEAM] [--allow-fresh] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, sunset: None, action: None, governance: None },
     CommandSpec { name: "stop-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::StopAgent), summary: "stop a worker", usage: "usage: team-agent stop-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
     CommandSpec { name: "reset-agent", tier: CommandTier::Core, category: CommandCategory::WorkerLifecycle, kind: CommandKind::Dispatch(DispatchKind::ResetAgent), summary: "reset a worker session", usage: "usage: team-agent reset-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--discard-session] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, sunset: None, action: None, governance: None },
     CommandSpec { name: "claim-leader", tier: CommandTier::Guided, category: CommandCategory::GuidedRecovery, kind: CommandKind::Dispatch(DispatchKind::ClaimLeader), summary: "bind this pane when doctor reports rebind_required", usage: "usage: team-agent claim-leader [--workspace WORKSPACE] [--team TEAM] [--confirm] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
@@ -165,7 +165,7 @@ pub(crate) const COMMAND_SPECS: &[CommandSpec] = &[
     CommandSpec { name: "copilot", tier: CommandTier::Core, category: CommandCategory::Start, kind: CommandKind::LeaderPassthrough { provider: "copilot" }, summary: "launch a Copilot leader", usage: "usage: team-agent copilot [provider args...]", default_help: false, command_help: true, suggestion_index: true, token_usage: TokenUsage::Yes, sunset: None, action: None, governance: None },
     CommandSpec { name: "grok", tier: CommandTier::Core, category: CommandCategory::Start, kind: CommandKind::LeaderPassthrough { provider: "grok" }, summary: "launch a Grok leader", usage: "usage: team-agent grok [provider args...]", default_help: false, command_help: true, suggestion_index: true, token_usage: TokenUsage::Yes, sunset: None, action: None, governance: None },
     CommandSpec { name: "cursor", tier: CommandTier::Core, category: CommandCategory::Start, kind: CommandKind::LeaderPassthrough { provider: "cursor" }, summary: "launch a Cursor leader", usage: "usage: team-agent cursor [provider args...]", default_help: false, command_help: true, suggestion_index: true, token_usage: TokenUsage::Yes, sunset: None, action: None, governance: None },
-    CommandSpec { name: "pi", tier: CommandTier::Core, category: CommandCategory::Start, kind: CommandKind::LeaderPassthrough { provider: "pi" }, summary: "launch a Pi leader", usage: "usage: team-agent pi -- --model <exact> --thinking <effort>", default_help: false, command_help: true, suggestion_index: true, token_usage: TokenUsage::Yes, sunset: None, action: None, governance: None },
+    CommandSpec { name: "pi", tier: CommandTier::Core, category: CommandCategory::Start, kind: CommandKind::LeaderPassthrough { provider: "pi" }, summary: "launch a Pi leader", usage: "usage: team-agent pi [provider args...]", default_help: false, command_help: true, suggestion_index: true, token_usage: TokenUsage::Yes, sunset: None, action: None, governance: None },
 
     CommandSpec { name: "leaders", tier: CommandTier::Secondary, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::Leaders), summary: "list live, stale, or ambiguous host leaders", usage: "usage: team-agent leaders [QUERY|--search TEXT] [--all|--stale] [--json] | --prune [--dry-run] [--json]", default_help: false, command_help: true, suggestion_index: false, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },
     CommandSpec { name: "doctor", tier: CommandTier::Core, category: CommandCategory::Observe, kind: CommandKind::Dispatch(DispatchKind::Doctor), summary: "inspect environment and Team runtime health", usage: "usage: team-agent doctor [SPEC] [--workspace WORKSPACE] [--team TEAM] [--gate orphans|comms] [--comms] [--fix] [--fix-schema] [--cleanup-orphans] [--confirm] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, sunset: None, action: None, governance: None },

package/crates/team-agent/src/cli/tests/run_delegation.rs

@@ -317,6 +317,7 @@ fn cli_add_agent_duplicate_id_surfaces_real_error() {
     let dup_role = team.join("dup-role.md");
     std::fs::write(&dup_role, DELEG_VALID_ROLE).unwrap(); // role file must exist
     let args = AddAgentArgs {
+        role_config: Default::default(),
         agent: "implementer".to_string(),
         workspace: team,
         team: None,

package/crates/team-agent/src/cli/types.rs

@@ -475,6 +475,7 @@ pub struct RestartArgs {
 /// `start-agent`(`parser.py:369`)。
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct StartAgentArgs {
+    pub role_config: crate::lifecycle::role_config::RoleConfigPatch,
     pub agent: String,
     pub workspace: PathBuf,
     pub team: Option<String>,
@@ -502,9 +503,10 @@ pub struct ResetAgentArgs {
     pub json: bool,
 }
 
-/// `add-agent`(`parser.py:395`)。`--role-file` 必需。
+/// `add-agent`: provider and bypass are explicit CLI or role-file decisions.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct AddAgentArgs {
+    pub role_config: crate::lifecycle::role_config::RoleConfigPatch,
     pub agent: String,
     pub workspace: PathBuf,
     pub team: Option<String>,

package/crates/team-agent/src/compiler/tests.rs

@@ -221,9 +221,8 @@ fn compile_subscription_without_profile_is_thin_manifest() {
     );
 }
 
-// Runtime front-matter defaults: every knob from TEAM.md flows through without
-// per-role repetition; thin role inherits default_model; leader.model is null
-// (TEAM.md has no `model:` key, only `default_model:`).
+// Runtime front-matter defaults: TEAM.md runtime settings remain available,
+// but its default_model does not fill an omitted role model; leader.model is null.
 const RUNTIME_DEFAULTS_TEAM: &str = "\
 ---
 name: doc-team
@@ -256,7 +255,7 @@ dangerously_skip_permissions: false
 Implement bounded tasks.
 ";
 
-const RUNTIME_DEFAULTS_JSON: &str = r#"{"version":1,"team":{"name":"doc-team","mode":"supervisor_worker","objective":"Compile role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"codex","model":"gpt-5.4","auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Implement bounded tasks.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["implementer","Implementation Engineer"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"implementer","rules":[{"id":"route-implementer","match":{"assignee":["implementer"]},"assign_to":"implementer","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-doc-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["implementer"],"fast":true,"tick_interval_sec":1,"push_min_interval_sec":3,"stuck_timeout_sec":5},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"implementer","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
+const RUNTIME_DEFAULTS_JSON: &str = r#"{"version":1,"team":{"name":"doc-team","mode":"supervisor_worker","objective":"Compile role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"codex","model":null,"auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Implement bounded tasks.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["implementer","Implementation Engineer"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"implementer","rules":[{"id":"route-implementer","match":{"assignee":["implementer"]},"assign_to":"implementer","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-doc-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["implementer"],"fast":true,"tick_interval_sec":1,"push_min_interval_sec":3,"stuck_timeout_sec":5},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"implementer","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
 
 #[test]
 fn compile_runtime_front_matter_defaults_match_python() {
@@ -269,8 +268,7 @@ fn compile_runtime_front_matter_defaults_match_python() {
     assert_eq!(templated_compact_json(&spec), RUNTIME_DEFAULTS_JSON);
 }
 
-// provider_models alias ladder: role provider `claude_code` with NO `claude_code`
-// key in provider_models falls back to the `claude` key (compiler.py:317-318).
+// TEAM provider_models do not fill a role whose model is omitted.
 const ALIAS_TEAM: &str = "\
 ---
 name: debate-team
@@ -296,16 +294,16 @@ dangerously_skip_permissions: false
 Edit and defend the argument.
 ";
 
-const ALIAS_JSON: &str = r#"{"version":1,"team":{"name":"debate-team","mode":"supervisor_worker","objective":"Compile thin role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"editor","role":"Editor and Defender","provider":"claude_code","model":"claude-sonnet-4-6","auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Edit and defend the argument.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["editor","Editor and Defender"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"editor","rules":[{"id":"route-editor","match":{"assignee":["editor"]},"assign_to":"editor","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-debate-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["editor"],"fast":false,"tick_interval_sec":2,"push_min_interval_sec":60,"stuck_timeout_sec":300},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"editor","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
+const ALIAS_JSON: &str = r#"{"version":1,"team":{"name":"debate-team","mode":"supervisor_worker","objective":"Compile thin role docs.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"editor","role":"Editor and Defender","provider":"claude_code","model":null,"auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Edit and defend the argument.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["editor","Editor and Defender"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"editor","rules":[{"id":"route-editor","match":{"assignee":["editor"]},"assign_to":"editor","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-debate-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["editor"],"fast":false,"tick_interval_sec":2,"push_min_interval_sec":60,"stuck_timeout_sec":300},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"editor","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
 
 #[test]
-fn compile_provider_models_claude_code_falls_back_to_claude_alias() {
+fn compile_provider_models_do_not_fill_claude_code_role_model() {
     let team = build_team(ALIAS_TEAM, &[("implementer.md", ALIAS_ROLE)], &[]);
     let spec = compile_team(&team).unwrap();
     assert_eq!(templated_compact_json(&spec), ALIAS_JSON);
 }
 
-// Builtin provider default: no model anywhere → DEFAULT_PROVIDER_MODELS[codex] = gpt-5.5.
+// Omitted role model remains null; the provider supplies its native default.
 const BUILTIN_TEAM: &str = "\
 ---
 name: default-model-team
@@ -329,10 +327,10 @@ tools:
 Implement bounded tasks.
 ";
 
-const BUILTIN_JSON: &str = r#"{"version":1,"team":{"name":"default-model-team","mode":"supervisor_worker","objective":"Compile role docs without model fields.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"codex","model":"gpt-5.5","auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Implement bounded tasks.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["implementer","Implementation Engineer"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"implementer","rules":[{"id":"route-implementer","match":{"assignee":["implementer"]},"assign_to":"implementer","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-default-model-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["implementer"],"fast":false,"tick_interval_sec":2,"push_min_interval_sec":60,"stuck_timeout_sec":300},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"implementer","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
+const BUILTIN_JSON: &str = r#"{"version":1,"team":{"name":"default-model-team","mode":"supervisor_worker","objective":"Compile role docs without model fields.","workspace":"__WS__"},"leader":{"id":"leader","role":"leader","provider":"codex","model":null,"context_policy":{"keep_user_thread":true,"receive_worker_outputs":"business_messages_and_short_summaries","max_worker_result_tokens":2000}},"agents":[{"id":"implementer","role":"Implementation Engineer","provider":"codex","model":null,"auth_mode":"subscription","working_directory":"__WS__","system_prompt":{"inline":"Implement bounded tasks.","file":null},"dangerously_skip_permissions":false,"communication_mode":"leader_centric","preferred_for":["implementer","Implementation Engineer"],"avoid_for":[],"output_contract":{"format":"result_envelope_v1","required_fields":["task_id","status","summary","artifacts"]}}],"routing":{"default_assignee":"implementer","rules":[{"id":"route-implementer","match":{"assignee":["implementer"]},"assign_to":"implementer","priority":10}]},"communication":{"protocol":"mcp_inbox","topology":"leader_centered","worker_to_worker":true,"ack_timeout_sec":60,"result_format":"result_envelope_v1","message_store":{"sqlite":".team/runtime/team.db","mirror_files":".team/messages"}},"runtime":{"backend":"tmux","session_name":"team-default-model-team","auto_launch":true,"require_user_approval_before_launch":true,"max_active_agents":1,"startup_order":["implementer"],"fast":false,"tick_interval_sec":2,"push_min_interval_sec":60,"stuck_timeout_sec":300},"context":{"state_file":"team_state.md","artifact_dir":".team/artifacts","log_dir":".team/logs","summarization":{"worker_full_logs":"retain_outside_leader_context","state_update":"after_each_result"}},"tasks":[{"id":"task_initial","title":"Initial document-driven team task","type":"implementation","assignee":"implementer","deps":[],"acceptance":["Worker reports valid result_envelope_v1"],"status":"pending","requires_tools":["mcp_team"],"files":[],"risk":"low"}]}"#;
 
 #[test]
-fn compile_subscription_without_model_uses_builtin_provider_default() {
+fn compile_subscription_without_model_keeps_provider_native_default() {
     let team = build_team(BUILTIN_TEAM, &[("implementer.md", BUILTIN_ROLE)], &[]);
     let spec = compile_team(&team).unwrap();
     assert_eq!(templated_compact_json(&spec), BUILTIN_JSON);
@@ -504,38 +502,32 @@ fn build_layout(parent: &str, leaf: &str, team_md: Option<&str>, agents: AgentsD
 // ── A1 model resolution ──
 
 #[test]
-fn fix_a1_provider_models_precede_default_model() {
-    // precedence: provider_models[provider] BEFORE default_model (current swaps them).
+fn team_model_defaults_do_not_fill_role_model() {
+    // TEAM default_model and provider_models are not implicit role settings.
     let tm = "---\nname: T\nprovider: codex\ndefault_model: team-y\nprovider_models:\n  codex: pm-z\n---\nx\n";
     let team = build_team(tm, &[("w.md", &role_nomodel("codex"))], &[]);
     let spec = compile_team(&team).unwrap();
-    assert_eq!(
-        agent0(&spec).get("model").and_then(Value::as_str),
-        Some("pm-z")
-    );
+    assert_eq!(agent0(&spec).get("model"), Some(&Value::Null));
 }
 
 #[test]
-fn fix_a1_claude_aliases_to_claude_code_provider_models() {
-    // TWO-WAY alias: provider `claude` consumes `provider_models[claude_code]`.
+fn team_provider_model_aliases_do_not_fill_role_model() {
+    // TEAM provider-model aliases do not affect an omitted role model.
     let tm = "---\nname: T\nprovider: codex\nprovider_models:\n  claude_code: cc-v\n---\nx\n";
     let team = build_team(tm, &[("w.md", &role_nomodel("claude"))], &[]);
     let spec = compile_team(&team).unwrap();
-    assert_eq!(
-        agent0(&spec).get("model").and_then(Value::as_str),
-        Some("cc-v")
-    );
+    assert_eq!(agent0(&spec).get("model"), Some(&Value::Null));
 }
 
 #[test]
-fn fix_a1_builtin_claude_default_is_sonnet_4_6() {
-    // DEFAULT_PROVIDER_MODELS: claude / claude_code → "claude-sonnet-4-6" (not -4-5).
+fn claude_role_without_model_keeps_provider_native_default() {
+    // A missing explicit model stays null for both Claude provider names.
     for prov in ["claude", "claude_code"] {
         let team = build_team(TM_CODEX, &[("w.md", &role_nomodel(prov))], &[]);
         let spec = compile_team(&team).unwrap();
         assert_eq!(
-            agent0(&spec).get("model").and_then(Value::as_str),
-            Some("claude-sonnet-4-6"),
+            agent0(&spec).get("model"),
+            Some(&Value::Null),
             "provider {prov}"
         );
     }

package/crates/team-agent/src/compiler.rs

@@ -15,11 +15,8 @@
 //! comparing byte-for-byte to Python golden. The absolute `workspace` path (env-
 //! dependent) is templated to `__WS__` on both sides so every other byte is pinned.
 //!
-//! SCOPE (this wave): no-profile `subscription` role docs only. The `.env`
-//! profile machinery (`profiles/`, `_profile_model`/`load_profile`) and the
-//! `rust_core` inline-secret *detection* (`contains_inline_secret` / the secret-
-//! lint rejection test) are DEFERRED to a follow-on — the compile path here only
-//! needs `contains_inline_secret` to return `false` for clean (non-secret) input.
+//! Profile references are carried as role metadata; profile files and secrets are
+//! handled by lifecycle/profile_launch, not loaded or inspected by this compiler.
 //!
 //! §10: pure lib layer — no panic on malformed input; every parse/validate path
 //! returns `Result<_, ModelError>` (mirrors Python `ValidationError`).
@@ -31,10 +28,7 @@ use crate::communication_mode::CommunicationMode;
 use crate::model::enums::{Provider, ProviderEffort};
 use crate::model::yaml::Value;
 use crate::model::{paths, spec, yaml, ModelError};
-use crate::provider::wire::{
-    builtin_provider_model as wire_builtin_provider_model, parse_canonical_provider,
-    provider_model_keys,
-};
+use crate::provider::wire::parse_canonical_provider;
 
 pub const IGNORED_OWNER_TEAM_ID_FIELD: &str = "owner_team_id";
 
@@ -494,18 +488,12 @@ fn compile_role_agent_with_mode(
     let provider = string_field(&meta, "provider")
         .filter(|provider| !provider.trim().is_empty())
         .unwrap_or_else(|| "pi".to_string());
-    require_explicit_grok_role_model(&meta, role_path, &provider)?;
-    require_explicit_cursor_role_model(&meta, role_path, &provider)?;
-    validate_pi_role_fields(&meta, role_path, &provider)?;
     let is_pi = parse_canonical_provider(&provider) == Some(Provider::Pi);
-    let model = if is_pi {
-        string_field(&meta, "model")
-            .filter(|value| !value.trim().is_empty())
-            .map(Value::Str)
-            .unwrap_or_else(|| Value::Str("openai-codex/gpt-6-luna".to_string()))
-    } else {
-        resolve_model(&meta, team_meta, &provider)
-    };
+    validate_pi_role_fields(&meta, role_path, &provider)?;
+    let model = string_field(&meta, "model")
+        .filter(|value| !value.trim().is_empty())
+        .map(Value::Str)
+        .unwrap_or(Value::Null);
     let auth_mode = string_field(&meta, "auth_mode")
         .or_else(|| string_field(team_meta, "default_auth_mode"))
         .unwrap_or_else(|| "subscription".to_string());
@@ -557,15 +545,11 @@ fn compile_role_agent_with_mode(
             ]),
         ),
     ];
-    if let Some(label) = string_field(&meta, "label") {
-        agent_items.insert(1, ("label", Value::Str(label)));
-    }
     if let Some(profile) = string_field(&meta, "profile") {
         agent_items.push(("profile", Value::Str(profile)));
     }
-    // 0.4.x provider effort MVP step 3: resolve effort with role > team > none
-    // (Pi uses only explicit role effort). Validate syntax and provider support
-    // here so unsupported combinations fail at compile, not at runtime.
+    // Role effort wins; Pi uses only an explicit role value. Other providers may
+    // inherit TEAM provider_effort for Issue #238 compatibility.
     let role_effort = match string_field(&meta, "effort") {
         Some(raw) if !raw.trim().is_empty() => {
             let value = raw.trim();
@@ -577,7 +561,6 @@ fn compile_role_agent_with_mode(
             })?;
             Some(parsed)
         }
-        _ if is_pi => Some(ProviderEffort::Max),
         _ => None,
     };
     let team_effort = match string_field(team_meta, "provider_effort") {
@@ -674,54 +657,6 @@ fn string_field(meta: &Value, key: &str) -> Option<String> {
         .map(ToString::to_string)
 }
 
-/// 缺 model 时框架会填内建默认（grok 上是 grok-4），席位因此静默拿到
-/// 与角色文件无关的模型和上下文窗口，而 argv 看起来完全正常。
-/// 角色文件必须自己写死；内建默认、team 级默认、CLI 全局默认都是隐式来源。
-fn require_explicit_grok_role_model(
-    meta: &Value,
-    path: &Path,
-    provider: &str,
-) -> Result<(), ModelError> {
-    if parse_canonical_provider(provider) != Some(Provider::Grok) {
-        return Ok(());
-    }
-    if string_field(meta, "model").is_some_and(|value| !value.trim().is_empty()) {
-        return Ok(());
-    }
-    Err(ModelError::Validation(format!(
-        "{}: missing front matter field model. \
-Without an explicit model the framework fills a built-in default (grok-4 for grok), \
-so the seat silently gets a model and context window that are not in the role file, \
-while argv still looks normal. The role file must name the model itself; \
-built-in defaults, team-level defaults, and the Grok CLI global default are all implicit sources. Example:\n\
-model: grok-4.6",
-        path.display()
-    )))
-}
-
-/// 缺 model 时框架曾填 builtin `sonnet-4-thinking`，本机 shim 还会剥掉该默认。
-/// 角色必须自己写死；内建默认、team 级默认、CLI 全局默认都是隐式来源。
-fn require_explicit_cursor_role_model(
-    meta: &Value,
-    path: &Path,
-    provider: &str,
-) -> Result<(), ModelError> {
-    if parse_canonical_provider(provider) != Some(Provider::CursorAgent) {
-        return Ok(());
-    }
-    if string_field(meta, "model").is_some_and(|value| !value.trim().is_empty()) {
-        return Ok(());
-    }
-    Err(ModelError::Validation(format!(
-        "{}: missing front matter field model. \
-Without an explicit model the framework fills a built-in default (sonnet-4-thinking for cursor_agent), \
-so the seat silently gets a model that is not in the role file, while argv still looks normal. \
-The role file must name the model itself; built-in defaults, team-level defaults, and the Cursor CLI default are all implicit sources. Example:\n\
-model: sonnet-4-thinking",
-        path.display()
-    )))
-}
-
 fn validate_pi_role_fields(meta: &Value, path: &Path, provider: &str) -> Result<(), ModelError> {
     if parse_canonical_provider(provider) != Some(Provider::Pi) {
         return Ok(());
@@ -746,7 +681,7 @@ fn validate_pi_role_fields(meta: &Value, path: &Path, provider: &str) -> Result<
 fn optional_dangerously_skip_permissions(meta: &Value) -> bool {
     match meta.get("dangerously_skip_permissions") {
         Some(Value::Bool(value)) => *value,
-        _ => true,
+        _ => false,
     }
 }
 
@@ -830,35 +765,6 @@ fn py_int_value(value: &Value) -> Option<i64> {
     }
 }
 
-fn resolve_model(role_meta: &Value, team_meta: &Value, provider: &str) -> Value {
-    if let Some(model) = string_field(role_meta, "model") {
-        return Value::Str(model);
-    }
-    if let Some(model) =
-        provider_model(team_meta, provider).or_else(|| string_field(team_meta, "default_model"))
-    {
-        return Value::Str(model);
-    }
-    if role_meta.get("profile").is_some() {
-        return Value::Null;
-    }
-    builtin_provider_model(provider)
-        .map(|m| Value::Str(m.to_string()))
-        .unwrap_or(Value::Null)
-}
-
-fn provider_model(team_meta: &Value, provider: &str) -> Option<String> {
-    let models = team_meta.get("provider_models")?;
-    let provider = parse_canonical_provider(provider)?;
-    provider_model_keys(provider)
-        .iter()
-        .find_map(|key| string_field(models, key))
-}
-
-fn builtin_provider_model(provider: &str) -> Option<&'static str> {
-    parse_canonical_provider(provider).and_then(wire_builtin_provider_model)
-}
-
 fn non_empty_trimmed(text: &str) -> Option<String> {
     let trimmed = text.trim();
     if trimmed.is_empty() {

package/crates/team-agent/src/lifecycle/launch/add_agent.rs

@@ -418,7 +418,7 @@ pub(crate) fn add_agent_with_transport_force(
 /// returns: 新席报告；成功后还要过快照的一致性校验
 /// errors: 角色文件不存在先行返回 Compile；摘除、加回或一致性校验失败时按快照恢复并返回错误
 /// ---
-pub(super) fn force_recreate_with_transport_locked(
+pub(crate) fn force_recreate_with_transport_locked(
     run_workspace: &Path,
     team_dir: &Path,
     agent_id: &AgentId,
@@ -546,7 +546,7 @@ pub(super) fn add_agent_with_transport_at_paths(
 }
 
 #[allow(clippy::too_many_arguments)]
-fn add_agent_with_transport_at_paths_locked(
+pub(crate) fn add_agent_with_transport_at_paths_locked(
     run_workspace: &Path,
     team_dir: &Path,
     agent_id: &AgentId,
@@ -683,6 +683,7 @@ fn add_agent_with_transport_at_paths_reserved(
             &spec_path,
             pre_spec_text.as_deref(),
             None,
+            Some(&canonical_team_key),
             agent_id,
             "state_upsert_failed",
         );
@@ -705,6 +706,7 @@ fn add_agent_with_transport_at_paths_reserved(
                 &spec_path,
                 pre_spec_text.as_deref(),
                 None,
+                Some(&canonical_team_key),
                 agent_id,
                 "start_agent_failed",
             );
@@ -721,6 +723,7 @@ fn add_agent_with_transport_at_paths_reserved(
                 &spec_path,
                 pre_spec_text.as_deref(),
                 None,
+                Some(&canonical_team_key),
                 agent_id,
                 "start_agent_noop",
             );
@@ -734,6 +737,7 @@ fn add_agent_with_transport_at_paths_reserved(
                 &spec_path,
                 pre_spec_text.as_deref(),
                 None,
+                Some(&canonical_team_key),
                 agent_id,
                 "added_agent_paused",
             );