@team-agent/installer 0.5.103 → 0.5.105

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

@@ -55,6 +55,7 @@ pub(super) fn rollback_add_agent_atomic(
     spec_path: &Path,
     pre_spec_text: Option<&str>,
     pre_runtime_state: Option<&serde_json::Value>,
+    team_key: Option<&str>,
     agent_id: &AgentId,
     reason: &str,
 ) {
@@ -86,7 +87,7 @@ pub(super) fn rollback_add_agent_atomic(
         crate::state::repository::StateRepository::new(run_workspace)
             .save(
                 crate::state::repository::StateWriteIntent::AgentRollback {
-                    team_key: None,
+                    team_key,
                     agent_id: agent_id.as_str(),
                 },
                 state,
@@ -94,7 +95,7 @@ pub(super) fn rollback_add_agent_atomic(
             .is_ok()
     } else {
         // No prior runtime state — drop just the agent we added (load → strip → save).
-        if let Ok(mut state) = crate::state::persist::load_runtime_state(run_workspace) {
+        if let Ok(mut state) = crate::state::projection::select_runtime_state(run_workspace, team_key) {
             if let Some(agents) = state
                 .get_mut("agents")
                 .and_then(serde_json::Value::as_object_mut)
@@ -105,7 +106,8 @@ pub(super) fn rollback_add_agent_atomic(
                 .get_mut("teams")
                 .and_then(serde_json::Value::as_object_mut)
             {
-                for team in teams.values_mut() {
+                for (key, team) in teams.iter_mut() {
+                    if team_key.is_some_and(|selected| selected != key) { continue; }
                     if let Some(agents) = team
                         .get_mut("agents")
                         .and_then(serde_json::Value::as_object_mut)
@@ -117,7 +119,7 @@ pub(super) fn rollback_add_agent_atomic(
             crate::state::repository::StateRepository::new(run_workspace)
                 .save(
                     crate::state::repository::StateWriteIntent::AgentRollback {
-                        team_key: None,
+                        team_key,
                         agent_id: agent_id.as_str(),
                     },
                     &state,
@@ -390,7 +392,8 @@ fn starting_agent_entry(
     let provider = meta
         .get("provider")
         .and_then(Value::as_str)
-        .unwrap_or("codex");
+        .filter(|provider| !provider.trim().is_empty())
+        .unwrap_or("pi");
     let auth_mode = meta
         .get("auth_mode")
         .and_then(Value::as_str)
@@ -438,8 +441,9 @@ fn starting_agent_entry(
         let meta_provider = meta
             .get("provider")
             .and_then(Value::as_str)
+            .filter(|provider| !provider.trim().is_empty())
             .and_then(crate::provider::wire::parse_provider)
-            .unwrap_or(Provider::Codex);
+            .unwrap_or(Provider::Pi);
         persist_effective_approval_policy_from_yaml_agent(obj, meta, meta_provider);
     }
     entry

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

@@ -59,12 +59,9 @@ pub fn clone_agent(
         source_agent_id,
         as_agent_id,
         label,
-        None,
     )?;
-    // The materialized role carries the source role's DECLARED tools verbatim —
-    // a clone must preserve the source seat's full tools set (add-agent does
-    // the same; no leader-ceiling clamp). See role_source.rs for the removed
-    // clamp_materialized_role_to_leader.
+    // Materialization preserves the role body and legacy metadata; the compiler
+    // only maps supported fields, so ignored header keys remain behaviorally inert.
     let added = add_agent(
         &selected.run_workspace,
         as_agent_id,

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

@@ -168,25 +168,21 @@ pub(crate) fn provider_effort_event_payload(
 }
 
 /// ---
-/// purpose: 对 claude 系 provider 兜底确保 CLAUDE_EFFORT 进入待清除环境变量表
+/// purpose: 仅在存在显式 effort override 时清除继承的 CLAUDE_EFFORT
 /// params:
 ///   base: 已有的待清除变量名列表
-/// returns: 非 claude 系原样返回；claude 系在缺失时补上 CLAUDE_EFFORT
-/// ---
-/// 0.4.x provider effort MVP step 9: defensive guarantee that `CLAUDE_EFFORT`
-/// is unset in the Claude/ClaudeCode worker spawn env. As of the
-/// `profile_launch::provider_env_unsets` update, the base list already
-/// includes `CLAUDE_EFFORT` for Claude — so this function is idempotent
-/// (returns input unchanged). Kept as a belt-and-braces guard so a future
-/// refactor that bypasses provider_env_unsets cannot silently drop the
-/// scrub. The structural win is in `tmux_backend::shell_command` which now
-/// filters env exports by env_unset (preventing inherited values from
-/// re-introducing keys we just unset).
+///   has_effort_override: 本次启动是否实际施加 effort
+/// returns: 无显式 override 或非 claude 系时原样返回
+/// ---
+/// Preserve provider-native `CLAUDE_EFFORT` unless a supported explicit role
+/// effort is applied; in that case prevent the inherited environment from
+/// overriding the requested value.
 pub(crate) fn extend_worker_env_unset_for_effort(
     base: Vec<String>,
     provider: Provider,
+    has_effort_override: bool,
 ) -> Vec<String> {
-    if !matches!(provider, Provider::Claude | Provider::ClaudeCode) {
+    if !has_effort_override || !matches!(provider, Provider::Claude | Provider::ClaudeCode) {
         return base;
     }
     let mut out = base;

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

@@ -39,7 +39,7 @@ fn set_yaml_map_value(value: &mut Value, key: &str, next: Value) -> Result<(), L
     Ok(())
 }
 
-fn dump_role_frontmatter(meta: &Value) -> String {
+pub(crate) fn dump_role_frontmatter(meta: &Value) -> String {
     let Value::Map(pairs) = meta else {
         return yaml::dumps(meta);
     };
@@ -132,9 +132,8 @@ impl Drop for MaterializedRole {
 ///   state: 用于找源席的 dynamic_role_file，找不到时退到 team 目录下的同名 md
 ///   as_agent_id: 新席位名，写进 front matter 的 name
 ///   label: 非空时覆盖 front matter 的 role
-///   agent_label: 非空时写入 front matter 的 label
 /// returns: 物化结果，未调用 keep 时 Drop 会删掉该文件
-/// errors: 源文件缺失、未声明 name 或声明与源席不符时返回 Compile；目标已存在返回 RequirementUnmet；建目录或写盘失败返回 StatePersist
+/// errors: 源文件缺失时返回 Compile；目标已存在返回 RequirementUnmet；建目录或写盘失败返回 StatePersist
 /// ---
 pub(crate) fn materialize_latest_role(
     run_workspace: &Path,
@@ -143,27 +142,10 @@ pub(crate) fn materialize_latest_role(
     source_agent_id: &AgentId,
     as_agent_id: &AgentId,
     label: Option<&str>,
-    agent_label: Option<&str>,
 ) -> Result<MaterializedRole, LifecycleError> {
     let source_path = resolve_role_source(run_workspace, team_dir, state, source_agent_id)?;
     let (mut meta, body) = crate::compiler::read_front_matter(&source_path)
         .map_err(|error| LifecycleError::Compile(error.to_string()))?;
-    let declared = meta
-        .get("name")
-        .and_then(Value::as_str)
-        .filter(|name| !name.is_empty())
-        .ok_or_else(|| {
-            LifecycleError::Compile(format!(
-                "source role file does not declare name: {}",
-                source_path.display()
-            ))
-        })?;
-    if declared != source_agent_id.as_str() {
-        return Err(LifecycleError::Compile(format!(
-            "source role file declares name '{}' but source agent is '{}'",
-            declared, source_agent_id
-        )));
-    }
     set_yaml_map_value(
         &mut meta,
         "name",
@@ -175,12 +157,6 @@ pub(crate) fn materialize_latest_role(
     {
         set_yaml_map_value(&mut meta, "role", Value::Str(label.to_string()))?;
     }
-    if let Some(agent_label) = agent_label
-        .map(strip_label_quotes)
-        .filter(|value| !value.is_empty())
-    {
-        set_yaml_map_value(&mut meta, "label", Value::Str(agent_label.to_string()))?;
-    }
     if let Some(role) = meta.get("role").and_then(Value::as_str).map(str::to_string) {
         let role_without_quotes = strip_label_quotes(&role);
         if !role_without_quotes.is_empty() && role_without_quotes != role {

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

@@ -255,6 +255,7 @@ pub(super) fn spawn_agents(
             extend_worker_env_unset_for_effort(
                 profile_launch.env_unset.iter().cloned().collect(),
                 provider,
+                agent_effort.is_some(),
             ),
         );
         // The provider is the final typed value after profile overlays. Keep it

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

@@ -327,8 +327,13 @@ pub(crate) fn write_spec_atomic(spec_path: &Path, spec: &Value) -> Result<(), Li
             .map_err(|e| LifecycleError::StatePersist(format!("{}: {e}", parent.display())))?;
     }
     let tmp = spec_path.with_extension(format!("tmp-{}", std::process::id()));
-    std::fs::write(&tmp, yaml::dumps(spec))
-        .map_err(|e| LifecycleError::StatePersist(format!("{}: {e}", tmp.display())))?;
+    if let Err(e) = std::fs::write(&tmp, yaml::dumps(spec)) {
+        let _ = std::fs::remove_file(&tmp);
+        return Err(LifecycleError::StatePersist(format!(
+            "{}: {e}",
+            tmp.display()
+        )));
+    }
     if let Err(e) = std::fs::rename(&tmp, spec_path) {
         let _ = std::fs::remove_file(&tmp);
         return Err(LifecycleError::StatePersist(format!(

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

@@ -402,7 +402,10 @@ pub(super) use readiness::*;
 mod add_agent;
 pub(super) use add_agent::*;
 pub use add_agent::{add_agent, add_agent_force};
-pub(crate) use add_agent::{add_agent_with_transport, add_agent_with_transport_force};
+pub(crate) use add_agent::{
+    add_agent_with_transport, add_agent_with_transport_force,
+    add_agent_with_transport_at_paths_locked, force_recreate_with_transport_locked,
+};
 
 pub(crate) mod add_agent_state;
 pub(super) use add_agent_state::*;

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

@@ -57,6 +57,7 @@ pub(crate) mod pane_input_lock;
 pub(crate) mod profile_launch;
 pub(crate) mod profile_smoke;
 pub mod restart;
+pub mod role_config;
 pub mod types;
 pub(crate) mod worker_command_context;
 

package/crates/team-agent/src/lifecycle/profile_launch.rs

@@ -578,18 +578,6 @@ pub(crate) fn provider_env_unsets(provider: Provider, auth_mode: AuthMode) -> BT
             unsets.insert("CLAUDE_CODE_ENTRYPOINT".to_string());
             unsets.insert("CLAUDE_CODE_EXECPATH".to_string());
             unsets.insert("CLAUDECODE".to_string());
-            // 0.4.x provider effort MVP step 9: CLAUDE_EFFORT carried from the
-            // launching shell would silently override the framework's effort
-            // decision (or, when no spec effort is configured, override the
-            // documented "provider default"). Scrubbing here is the single
-            // source — `extend_worker_env_unset_for_effort` is a thin alias
-            // that calls into this list. Applies to BOTH worker spawn AND
-            // leader spawn (leader_env_unset_for_provider also reads this).
-            // MVP scope: leader-effort is not configured yet, but if a
-            // launching shell already carries CLAUDE_EFFORT, the leader
-            // inheriting it would conflict with future leader-effort
-            // semantics. Scrub uniformly for predictability.
-            unsets.insert("CLAUDE_EFFORT".to_string());
             if auth_mode == AuthMode::CompatibleApi {
                 unsets.insert("ANTHROPIC_API_KEY".to_string());
             }

package/crates/team-agent/src/lifecycle/restart/agent.rs

@@ -37,6 +37,37 @@ use super::team_state::write_team_state;
 use super::*;
 use crate::lifecycle::lock::{acquire_agent_lifecycle_lock, LifecycleLockRequest};
 
+/// CLI start is orthogonal to stop: refuse any live target before editing its role.
+/// Transport uncertainty is a refusal, not permission to spawn a duplicate.
+pub(crate) fn ensure_agent_not_running(
+    state: &serde_json::Value,
+    agent_id: &AgentId,
+    transport: &dyn crate::transport::Transport,
+) -> Result<(), LifecycleError> {
+    let agent = state.get("agents").and_then(|agents| agents.get(agent_id.as_str()))
+        .ok_or_else(|| LifecycleError::RequirementUnmet(format!("agent {agent_id} not found")))?;
+    let session = state_session_name(state);
+    let window = agent_window(agent, agent_id);
+    let pane = agent.get("pane_id").and_then(serde_json::Value::as_str);
+    let targets = transport.list_targets()
+        .map_err(|error| LifecycleError::Transport(error.to_string()))?;
+    let live = targets.iter().find(|target| {
+        target.session == session
+            && target.window_name.as_ref().is_some_and(|name| name.as_str() == window)
+            && (pane == Some(target.pane_id.as_str())
+                || !crate::lifecycle::launch::state_uses_adaptive_layout(state))
+            && agent_pane_live_by_id(transport, &target.pane_id)
+    });
+    if let Some(target) = live {
+        Err(LifecycleError::RequirementUnmet(format!(
+            "agent {agent_id} is already running (duplicate / active cohort); use stop-agent first; cohort proof: session={} window={window} pane={}",
+            session.as_str(), target.pane_id.as_str(),
+        )))
+    } else {
+        Ok(())
+    }
+}
+
 /// ---
 /// purpose: 起或复活一席的对外入口
 /// params:

package/crates/team-agent/src/lifecycle/restart/avatar.rs

@@ -315,7 +315,6 @@ pub(crate) fn fork_pi_new_seat_locked(
             source_agent_id,
             target_agent_id,
             label,
-            Some(target_agent_id.as_str()),
         )?;
         role = Some(target_role);
         let target_role_path = role

package/crates/team-agent/src/lifecycle/restart/common.rs

@@ -510,6 +510,7 @@ pub(super) fn spawn_agent_window(
         crate::lifecycle::launch::extend_worker_env_unset_for_effort(
             profile_launch.env_unset.iter().cloned().collect(),
             provider,
+            restart_effort.is_some(),
         ),
     );
     // Keep the launcher-known typed provider independent from inherited
@@ -748,7 +749,6 @@ fn merge_command_context_fields(
         "auth_mode",
         "effort",
         "profile",
-        "permission_mode",
         // 0.5.66 bypass 单源:rehydrate 同步合入,restart 的 safety 构造读到新值。
         "dangerously_skip_permissions",
     ] {

package/crates/team-agent/src/lifecycle/restart.rs

@@ -77,7 +77,7 @@ pub(crate) mod remove;
 mod selection;
 mod team_state;
 
-pub(crate) use agent::start_agent_at_paths;
+pub(crate) use agent::{start_agent_at_paths, ensure_agent_not_running};
 pub use agent::{reset_agent, start_agent, stop_agent};
 pub(crate) use agent::{
     reset_agent_with_transport, start_agent_with_transport, stop_agent_with_transport,