@team-agent/installer 0.5.77 → 0.5.78

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

@@ -20,7 +20,7 @@
 //! boundary:
 //!   - 不拷贝外部角色文件进 team 目录，就地读取编译
 //!   - 起席一律走 restart 的 start_agent_at_paths，本文件不直接 spawn
-//!   - start path 按 exact pane receipt 回收已 spawn pane；本文件恢复 spec/state，并删除新 Pi 席位的 exact wrapper
+//!   - 回滚只恢复 spec 字节与 runtime state，不回收已 spawn 的 pane
 //! maturity: wired
 //! ---
 use std::collections::{BTreeMap, BTreeSet};
@@ -93,51 +93,6 @@ impl Drop for AgentReservation {
     }
 }
 
-fn discover_pi_model_candidates(requested: &str) -> Result<Vec<String>, ()> {
-    crate::lifecycle::launch::pi_mcp::pi_model_candidates(requested).map_err(|_| ())
-}
-
-fn preflight_role_with_pi_model(
-    run_workspace: &Path,
-    team_dir: &Path,
-    agent_id: &AgentId,
-    role_file_path: &Path,
-    discover: &mut dyn FnMut(&str) -> Result<Vec<String>, ()>,
-) -> Result<(), LifecycleError> {
-    if !role_file_path.exists() {
-        return Err(LifecycleError::Compile(format!(
-            "role file not found: {}",
-            role_file_path.display()
-        )));
-    }
-    let (meta, _) = crate::compiler::read_front_matter(role_file_path)
-        .map_err(|error| LifecycleError::Compile(error.to_string()))?;
-    crate::compiler::preflight_pi_role_model_with(&meta, discover).map_err(|error| {
-        LifecycleError::PiModelPreflight {
-            requested: error.requested,
-            candidates: error.candidates,
-            action: error.action,
-            not_ready: error.not_ready,
-        }
-    })?;
-    let team_meta = crate::compiler::read_front_matter(&team_dir.join("TEAM.md"))
-        .map(|(meta, _)| meta)
-        .unwrap_or(Value::Null);
-    let compiled = crate::compiler::compile_role_agent(
-        role_file_path,
-        &team_meta,
-        &run_workspace.display().to_string(),
-    )
-    .map_err(|error| LifecycleError::Compile(error.to_string()))?;
-    if compiled.id != agent_id.as_str() {
-        return Err(LifecycleError::Compile(format!(
-            "role file declares name '{}' but add-agent id is '{}'",
-            compiled.id, agent_id
-        )));
-    }
-    Ok(())
-}
-
 fn reserve_agent_slot(
     workspace: &Path,
     team: Option<&str>,
@@ -254,25 +209,6 @@ pub fn add_agent(
     role_file_path: &Path,
     open_display: bool,
     team: Option<&str>,
-) -> Result<AddAgentReport, LifecycleError> {
-    let mut discover = discover_pi_model_candidates;
-    add_agent_with_pi_preflight(
-        workspace,
-        agent_id,
-        role_file_path,
-        open_display,
-        team,
-        &mut discover,
-    )
-}
-
-fn add_agent_with_pi_preflight(
-    workspace: &Path,
-    agent_id: &AgentId,
-    role_file_path: &Path,
-    open_display: bool,
-    team: Option<&str>,
-    discover: &mut dyn FnMut(&str) -> Result<Vec<String>, ()>,
 ) -> Result<AddAgentReport, LifecycleError> {
     let selected = match crate::state::selector::resolve_active_team(
         workspace,
@@ -281,22 +217,25 @@ fn add_agent_with_pi_preflight(
     ) {
         Ok(selected) => selected,
         Err(_) if workspace.join("TEAM.md").exists() => {
-            // The MCP server already passes the canonical run workspace here.
-            // Reapplying team_workspace() would strip the scratch root and bind
-            // the first dynamic worker to the parent workspace's tmux server.
+            // TEAM.md lives in the run workspace. `team_workspace()` always walks
+            // to the parent and would spawn on a hash socket of the scratch parent.
+            // Use the idempotent run-workspace so persisted `tmux_endpoint` wins.
+            let run_workspace = crate::model::paths::canonical_run_workspace(workspace)
+                .map_err(|e| LifecycleError::StatePersist(e.to_string()))?;
             let transport =
                 crate::lifecycle::restart::lifecycle_worker_tmux_backend_for_selected_state(
-                    workspace, team,
+                    &run_workspace, team,
                 )
-                .unwrap_or_else(|_| crate::tmux_backend::TmuxBackend::for_workspace(workspace));
-            return add_agent_with_transport_pi_preflight(
+                .unwrap_or_else(|_| {
+                    crate::tmux_backend::TmuxBackend::for_workspace(&run_workspace)
+                });
+            return add_agent_with_transport(
                 workspace,
                 agent_id,
                 role_file_path,
                 open_display,
                 team,
                 &transport,
-                discover,
             );
         }
         Err(error) => return Err(LifecycleError::TeamSelect(error.to_string())),
@@ -307,13 +246,6 @@ fn add_agent_with_pi_preflight(
         team: Some(selected.team_key.as_str()),
         agent_id: Some(agent_id),
     })?;
-    preflight_role_with_pi_model(
-        &selected.run_workspace,
-        &selected.team_dir,
-        agent_id,
-        role_file_path,
-        discover,
-    )?;
     let reservation = reserve_agent_slot(
         &selected.run_workspace,
         Some(selected.team_key.as_str()),
@@ -364,38 +296,9 @@ pub fn add_agent_force(
     open_display: bool,
     team: Option<&str>,
     force: bool,
-) -> Result<AddAgentReport, LifecycleError> {
-    let mut discover = discover_pi_model_candidates;
-    add_agent_force_with_pi_preflight(
-        workspace,
-        agent_id,
-        role_file_path,
-        open_display,
-        team,
-        force,
-        &mut discover,
-    )
-}
-
-#[allow(clippy::too_many_arguments)]
-fn add_agent_force_with_pi_preflight(
-    workspace: &Path,
-    agent_id: &AgentId,
-    role_file_path: &Path,
-    open_display: bool,
-    team: Option<&str>,
-    force: bool,
-    discover: &mut dyn FnMut(&str) -> Result<Vec<String>, ()>,
 ) -> Result<AddAgentReport, LifecycleError> {
     if !force {
-        return add_agent_with_pi_preflight(
-            workspace,
-            agent_id,
-            role_file_path,
-            open_display,
-            team,
-            discover,
-        );
+        return add_agent(workspace, agent_id, role_file_path, open_display, team);
     }
     let selected = crate::state::selector::resolve_active_team(
         workspace,
@@ -423,7 +326,6 @@ fn add_agent_force_with_pi_preflight(
         open_display,
         Some(canonical_team_key.as_str()),
         &transport,
-        discover,
     )
 }
 
@@ -442,28 +344,6 @@ pub(crate) fn add_agent_with_transport(
     open_display: bool,
     team: Option<&str>,
     transport: &dyn Transport,
-) -> Result<AddAgentReport, LifecycleError> {
-    let mut discover = discover_pi_model_candidates;
-    add_agent_with_transport_pi_preflight(
-        workspace,
-        agent_id,
-        role_file_path,
-        open_display,
-        team,
-        transport,
-        &mut discover,
-    )
-}
-
-#[allow(clippy::too_many_arguments)]
-pub(crate) fn add_agent_with_transport_pi_preflight(
-    workspace: &Path,
-    agent_id: &AgentId,
-    role_file_path: &Path,
-    open_display: bool,
-    team: Option<&str>,
-    transport: &dyn Transport,
-    discover: &mut dyn FnMut(&str) -> Result<Vec<String>, ()>,
 ) -> Result<AddAgentReport, LifecycleError> {
     let run_workspace = crate::model::paths::canonical_run_workspace(workspace)
         .map_err(|e| LifecycleError::StatePersist(e.to_string()))?;
@@ -473,13 +353,6 @@ pub(crate) fn add_agent_with_transport_pi_preflight(
         team,
         agent_id: Some(agent_id),
     })?;
-    preflight_role_with_pi_model(
-        &run_workspace,
-        workspace,
-        agent_id,
-        role_file_path,
-        discover,
-    )?;
     let reservation = reserve_agent_slot(&run_workspace, team, agent_id)?;
     drop(lifecycle_lock);
     add_agent_with_transport_at_paths_reserved(
@@ -511,40 +384,15 @@ pub(crate) fn add_agent_with_transport_force(
     team: Option<&str>,
     force: bool,
     transport: &dyn Transport,
-) -> Result<AddAgentReport, LifecycleError> {
-    let mut discover = discover_pi_model_candidates;
-    add_agent_with_transport_force_pi_preflight(
-        workspace,
-        agent_id,
-        role_file_path,
-        open_display,
-        team,
-        force,
-        transport,
-        &mut discover,
-    )
-}
-
-#[allow(clippy::too_many_arguments)]
-pub(crate) fn add_agent_with_transport_force_pi_preflight(
-    workspace: &Path,
-    agent_id: &AgentId,
-    role_file_path: &Path,
-    open_display: bool,
-    team: Option<&str>,
-    force: bool,
-    transport: &dyn Transport,
-    discover: &mut dyn FnMut(&str) -> Result<Vec<String>, ()>,
 ) -> Result<AddAgentReport, LifecycleError> {
     if !force {
-        return add_agent_with_transport_pi_preflight(
+        return add_agent_with_transport(
             workspace,
             agent_id,
             role_file_path,
             open_display,
             team,
             transport,
-            discover,
         );
     }
     let run_workspace = crate::model::paths::canonical_run_workspace(workspace)
@@ -563,7 +411,6 @@ pub(crate) fn add_agent_with_transport_force_pi_preflight(
         open_display,
         team,
         transport,
-        discover,
     )
 }
 
@@ -572,7 +419,6 @@ pub(crate) fn add_agent_with_transport_force_pi_preflight(
 /// returns: 新席报告；成功后还要过快照的一致性校验
 /// errors: 角色文件不存在先行返回 Compile；摘除、加回或一致性校验失败时按快照恢复并返回错误
 /// ---
-#[allow(clippy::too_many_arguments)]
 pub(super) fn force_recreate_with_transport_locked(
     run_workspace: &Path,
     team_dir: &Path,
@@ -581,16 +427,15 @@ pub(super) fn force_recreate_with_transport_locked(
     open_display: bool,
     team: Option<&str>,
     transport: &dyn Transport,
-    discover: &mut dyn FnMut(&str) -> Result<Vec<String>, ()>,
 ) -> Result<AddAgentReport, LifecycleError> {
     // Reject an unusable replacement source before consuming the old seat.
-    preflight_role_with_pi_model(
-        run_workspace,
-        team_dir,
-        agent_id,
-        role_file_path,
-        discover,
-    )?;
+    // Deeper compile/spawn failures remain covered by the transaction snapshot.
+    if !role_file_path.exists() {
+        return Err(LifecycleError::Compile(format!(
+            "role file not found: {}",
+            role_file_path.display()
+        )));
+    }
     let snapshot = crate::lifecycle::restart::remove::ForceRecreateSnapshot::capture(
         run_workspace,
         agent_id,
@@ -671,28 +516,6 @@ pub(super) fn maybe_fail_force_recreate_after_spawn() -> Result<(), LifecycleErr
     )))
 }
 
-fn rollback_added_pi_wrapper(
-    run_workspace: &Path,
-    team_key: &str,
-    agent_id: &AgentId,
-    role_meta: &Value,
-) -> Result<(), LifecycleError> {
-    if role_meta.get("provider").and_then(Value::as_str) != Some("pi") {
-        return Ok(());
-    }
-    let wrapper =
-        crate::lifecycle::launch::pi_mcp::pi_seat_paths(run_workspace, team_key, agent_id.as_str())
-            .wrapper;
-    match std::fs::remove_file(&wrapper) {
-        Ok(()) => Ok(()),
-        Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(()),
-        Err(error) => Err(LifecycleError::StatePersist(format!(
-            "failed to roll back added Pi wrapper {}: {error}",
-            wrapper.display()
-        ))),
-    }
-}
-
 /// ---
 /// purpose: 加席的实体实现，含 owner 门、重名拒绝、重编译 spec 原子写、席位 state upsert 与起席
 /// params:
@@ -878,8 +701,6 @@ fn add_agent_with_transport_at_paths_reserved(
     ) {
         Ok(started) => started,
         Err(error) => {
-            let wrapper_rollback =
-                rollback_added_pi_wrapper(run_workspace, &canonical_team_key, agent_id, &meta);
             rollback_add_agent_atomic(
                 run_workspace,
                 &spec_path,
@@ -888,12 +709,7 @@ fn add_agent_with_transport_at_paths_reserved(
                 agent_id,
                 "start_agent_failed",
             );
-            return match wrapper_rollback {
-                Ok(()) => Err(error),
-                Err(rollback_error) => Err(LifecycleError::StatePersist(format!(
-                    "{error}; {rollback_error}"
-                ))),
-            };
+            return Err(error);
         }
     };
     let (env, start_mode) = match started {
@@ -901,29 +717,19 @@ fn add_agent_with_transport_at_paths_reserved(
             env, start_mode, ..
         } => (env, start_mode),
         StartAgentOutcome::Noop { .. } => {
-            let wrapper_rollback =
-                rollback_added_pi_wrapper(run_workspace, &canonical_team_key, agent_id, &meta);
             rollback_add_agent_atomic(
                 run_workspace,
                 &spec_path,
                 pre_spec_text.as_deref(),
                 None,
                 agent_id,
-                "added_agent_noop",
+                "start_agent_noop",
             );
-            let error = LifecycleError::RequirementUnmet(format!(
-                "newly added agent {agent_id} returned start_agent.noop"
-            ));
-            return match wrapper_rollback {
-                Ok(()) => Err(error),
-                Err(rollback_error) => Err(LifecycleError::StatePersist(format!(
-                    "{error}; {rollback_error}"
-                ))),
-            };
+            return Err(LifecycleError::RequirementUnmet(format!(
+                "start_agent.noop: newly added agent {agent_id} must spawn, not reuse a live window"
+            )));
         }
         StartAgentOutcome::Paused { .. } => {
-            let wrapper_rollback =
-                rollback_added_pi_wrapper(run_workspace, &canonical_team_key, agent_id, &meta);
             rollback_add_agent_atomic(
                 run_workspace,
                 &spec_path,
@@ -932,14 +738,9 @@ fn add_agent_with_transport_at_paths_reserved(
                 agent_id,
                 "added_agent_paused",
             );
-            let error =
-                LifecycleError::RequirementUnmet(format!("added agent {agent_id} is paused"));
-            return match wrapper_rollback {
-                Ok(()) => Err(error),
-                Err(rollback_error) => Err(LifecycleError::StatePersist(format!(
-                    "{error}; {rollback_error}"
-                ))),
-            };
+            return Err(LifecycleError::RequirementUnmet(format!(
+                "added agent {agent_id} is paused"
+            )));
         }
     };
     if let Some(reservation) = reservation {

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

@@ -167,24 +167,6 @@ pub(super) fn upsert_agent_state_from_role(
             "runtime state root is not an object".to_string(),
         ));
     };
-    if !root
-        .get("session_name")
-        .and_then(serde_json::Value::as_str)
-        .is_some_and(|session| !session.is_empty())
-    {
-        if let Some(owner_session) = root
-            .get("leader_receiver")
-            .and_then(|receiver| receiver.get("session_name"))
-            .and_then(serde_json::Value::as_str)
-            .filter(|session| !session.is_empty())
-            .map(str::to_string)
-        {
-            root.insert(
-                "session_name".to_string(),
-                serde_json::Value::String(owner_session),
-            );
-        }
-    }
     let agents = root
         .entry("agents".to_string())
         .or_insert_with(|| serde_json::json!({}));