@team-agent/installer 0.5.97 → 0.5.99

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

@@ -26,7 +26,7 @@ use std::time::{Duration, Instant};
 
 use sha2::{Digest, Sha256};
 
-use crate::model::enums::ProviderEffort;
+use crate::model::enums::{Provider, ProviderEffort};
 use crate::provider::adapters::pi::{build_pi_command_argv, PiCommandRequest, PiSessionSelector};
 use crate::provider::{CommandPlan, McpConfig, ProviderError, SessionId};
 
@@ -559,12 +559,12 @@ pub(crate) fn parse_pi_leader_args(args: &[String]) -> Result<PiLeaderArgs, Prov
         match flag {
             "--model" if model.is_none() => model = Some(value.clone()),
             "--thinking" if effort.is_none() => {
-                effort = ProviderEffort::parse(value);
-                if effort.is_none() {
-                    return Err(ProviderError::Command(format!(
-                        "unknown Pi thinking effort {value:?}"
-                    )));
-                }
+                let parsed = ProviderEffort::parse(value).ok_or_else(|| {
+                    ProviderError::Command(format!("unknown Pi thinking effort {value:?}"))
+                })?;
+                effort = parsed
+                    .resolve_for_provider(Provider::Pi)
+                    .map_err(|reason| ProviderError::Command(reason.to_string()))?;
             }
             _ => {
                 return Err(ProviderError::Command(format!(

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

@@ -4,9 +4,9 @@
 //!   provides:
 //!     - name: quick_start
 //!       what: 由角色目录一键起队
-//!     - name: quick_start_in_workspace_with_display_and_backend
-//!       what: 带显示开关与后端选择的起队入口
-//!     - name: quick_start_with_transport_in_workspace_with_display
+//!     - name: quick_start_in_workspace_with_backend
+//!       what: 带 transport 后端选择的起队入口
+//!     - name: quick_start_with_transport_in_workspace
 //!       what: 起队的实体实现，含 leader pane 校验、层级门与已有 runtime 的早退
 //!   depends:
 //!     - crate::compiler
@@ -29,7 +29,7 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use crate::lifecycle::*;
-use crate::model::enums::{AuthMode, DisplayBackend, PaneLiveness, Provider, ProviderEffort};
+use crate::model::enums::{AuthMode, PaneLiveness, Provider, ProviderEffort};
 use crate::model::ids::AgentId;
 use crate::model::yaml::{self, Value};
 use crate::state::persist::load_runtime_state;
@@ -1042,9 +1042,8 @@ pub(crate) fn quick_start_in_workspace(
 }
 
 /// ---
-/// purpose: 带显示开关与后端字面量的起队入口
+/// purpose: 带后端字面量的起队入口
 /// params:
-///   open_display: 为假时把 spec 的显示后端改成 none
 ///   backend: 未给或为 tmux 时走既有 tmux 路径，其余字面量经 transport 工厂解析
 /// returns: 起队报告
 /// errors: 后端字面量不认识时返回 TeamSelect；工厂拒绝或后端不可用时如实报错，不退回 tmux
@@ -1061,13 +1060,12 @@ pub(crate) fn quick_start_in_workspace(
 /// its spawn/inject/capture calls to `TransportError::MuxUnavailable`
 /// honestly — MUST-NOT-13 + CR C-1 ①. Users see a real "conpty
 /// unavailable" error rather than a silent tmux fallback.
-pub fn quick_start_in_workspace_with_display_and_backend(
+pub fn quick_start_in_workspace_with_backend(
     workspace: &Path,
     agents_dir: &Path,
     name: Option<&str>,
     yes: bool,
     team_id: Option<&str>,
-    open_display: bool,
     backend: Option<&str>,
 ) -> Result<QuickStartReport, LifecycleError> {
     let workspace = explicit_quick_start_workspace(workspace);
@@ -1079,14 +1077,13 @@ pub fn quick_start_in_workspace_with_display_and_backend(
     let is_tmux_or_default = matches!(literal, None | Some("") | Some("tmux") | Some("TMUX"));
     if is_tmux_or_default {
         let transport = quick_start_tmux_backend(&workspace);
-        return quick_start_with_transport_in_workspace_with_display(
+        return quick_start_with_transport_in_workspace(
             &workspace,
             agents_dir,
             name,
             yes,
             team_id,
             &transport,
-            open_display,
         );
     }
     // Explicit non-tmux backend: route through the factory. Parse the
@@ -1181,14 +1178,13 @@ pub fn quick_start_in_workspace_with_display_and_backend(
     let resolved = crate::transport_factory::resolve_transport(input)
         .map_err(|e| LifecycleError::TeamSelect(e.to_string()))?;
     // Hand the boxed backend down as `&dyn Transport`.
-    quick_start_with_transport_in_workspace_with_display(
+    quick_start_with_transport_in_workspace(
         &workspace,
         agents_dir,
         name,
         yes,
         team_id,
         &*resolved.backend,
-        open_display,
     )
 }
 
@@ -1209,64 +1205,40 @@ pub(crate) fn quick_start_with_transport(
     quick_start_with_transport_in_workspace(&workspace, agents_dir, name, yes, team_id, transport)
 }
 
-/// ---
-/// purpose: 带注入 transport 与显式 workspace 的起队入口，默认开显示
-/// returns: 起队报告
-/// errors: 透传实体实现的错误
-/// contract_id: lifecycle.quick_start.entry
-/// ---
-pub(crate) fn quick_start_with_transport_in_workspace(
-    workspace: &Path,
-    agents_dir: &Path,
-    name: Option<&str>,
-    yes: bool,
-    team_id: Option<&str>,
-    transport: &dyn Transport,
-) -> Result<QuickStartReport, LifecycleError> {
-    quick_start_with_transport_in_workspace_with_display(
-        workspace, agents_dir, name, yes, team_id, transport, true,
-    )
-}
-
 /// ---
 /// purpose: 起队的实体实现，校验 leader pane、编译 spec、定团队键、判层级、必要时早退，然后起队并给 attach 指引
-/// params:
-///   open_display: 为假时把显示后端改成 none
 /// returns: 起队报告，含 session 名与 attach 命令
 /// errors: leader pane 环境无效返回 RequirementUnmet；角色目录不存在或编译失败返回 Compile；嵌套层级超限返回 RequirementUnmet；读 state 失败返回 StatePersist
 /// ---
-pub(crate) fn quick_start_with_transport_in_workspace_with_display(
+pub(crate) fn quick_start_with_transport_in_workspace(
     workspace: &Path,
     agents_dir: &Path,
     name: Option<&str>,
     yes: bool,
     team_id: Option<&str>,
     transport: &dyn Transport,
-    open_display: bool,
 ) -> Result<QuickStartReport, LifecycleError> {
     let mut discover = |requested: &str| {
         crate::lifecycle::launch::pi_mcp::pi_model_candidates(requested).map_err(|_| ())
     };
-    quick_start_with_transport_in_workspace_with_display_pi_preflight(
+    quick_start_with_transport_in_workspace_pi_preflight(
         workspace,
         agents_dir,
         name,
         yes,
         team_id,
         transport,
-        open_display,
         &mut discover,
     )
 }
 
-pub(crate) fn quick_start_with_transport_in_workspace_with_display_pi_preflight(
+pub(crate) fn quick_start_with_transport_in_workspace_pi_preflight(
     workspace: &Path,
     agents_dir: &Path,
     name: Option<&str>,
     yes: bool,
     team_id: Option<&str>,
     transport: &dyn Transport,
-    open_display: bool,
     discover: &mut dyn FnMut(&str) -> Result<Vec<String>, ()>,
 ) -> Result<QuickStartReport, LifecycleError> {
     // B-7 / 036b N38 三行 fail-fast — TEAM_AGENT_LEADER_PANE_ID 主动路径在 quick-start
@@ -1288,9 +1260,6 @@ pub(crate) fn quick_start_with_transport_in_workspace_with_display_pi_preflight(
     let mut spec = crate::compiler::compile_team(agents_dir)
         .map_err(|e| LifecycleError::Compile(e.to_string()))?;
     override_spec_workspace(&mut spec, &workspace);
-    if !open_display {
-        override_spec_display_backend(&mut spec, "none");
-    }
     let explicit_team_key = quick_start_requested_team_key(team_id, name).map(str::to_string);
     let canonical_team_key = explicit_team_key
         .clone()
@@ -1487,7 +1456,7 @@ pub(crate) fn quick_start_with_transport_in_workspace_with_display_pi_preflight(
         team_depth.team_depth,
     )?;
     // Fresh initialization owns this one fail-closed bind attempt. It is
-    // independent of display layout, so --no-display never suppresses receiver
+    // independent of worker layout, so receiver binding is always attempted
     // binding. Readiness receives true only after canonical registry readback.
     let _ = take_fresh_bind_refusal();
     launch.leader_receiver_attached = bind_fresh_quick_start_leader(
@@ -1562,18 +1531,12 @@ pub(crate) fn quick_start_with_transport_in_workspace_with_display_pi_preflight(
         ));
     }
     next_actions.extend(attach_commands.iter().cloned());
-    let display_backend = state
-        .get("display_backend")
-        .and_then(serde_json::Value::as_str)
-        .unwrap_or("none")
-        .to_string();
     quick_start_phase_timer.emit(&workspace, "launch.phase", "completed");
     Ok(QuickStartReport::Ready {
         session_name,
         launch: Box::new(launch),
         next_actions,
         attach_commands,
-        display_backend,
         worker_readiness,
         team: state_team_key,
     })

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

@@ -26,7 +26,7 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use crate::lifecycle::*;
-use crate::model::enums::{AuthMode, DisplayBackend, PaneLiveness, Provider, ProviderEffort};
+use crate::model::enums::{AuthMode, PaneLiveness, Provider, ProviderEffort};
 use crate::model::ids::AgentId;
 use crate::model::yaml::{self, Value};
 use crate::state::persist::load_runtime_state;
@@ -270,18 +270,12 @@ pub(super) fn attach_commands_for_runtime_windows<'a>(
 
 /// ---
 /// purpose: 由本次起的席位推出窗口名
-/// returns: 排序去重后的窗口名，席位没有布局窗口时用 agent id
+/// returns: 排序去重后的窗口名，按席位名分配独立窗口
 /// ---
 pub(super) fn started_attach_window_names(started: &[StartedAgent]) -> Vec<String> {
     let mut windows = started
         .iter()
-        .map(|started| {
-            started
-                .layout_window
-                .as_ref()
-                .map(|window| window.as_str().to_string())
-                .unwrap_or_else(|| started.agent_id.as_str().to_string())
-        })
+        .map(|started| started.agent_id.as_str().to_string())
         .collect::<Vec<_>>();
     windows.sort();
     windows.dedup();

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

@@ -28,7 +28,7 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use crate::lifecycle::*;
-use crate::model::enums::{AuthMode, DisplayBackend, PaneLiveness, Provider, ProviderEffort};
+use crate::model::enums::{AuthMode, PaneLiveness, Provider, ProviderEffort};
 use crate::model::ids::AgentId;
 use crate::model::yaml::{self, Value};
 use crate::state::persist::load_runtime_state;

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

@@ -30,7 +30,7 @@ use std::process::Command;
 
 use crate::lifecycle::profile_launch::parse_provider;
 use crate::lifecycle::*;
-use crate::model::enums::{AuthMode, DisplayBackend, PaneLiveness, Provider, ProviderEffort};
+use crate::model::enums::{AuthMode, PaneLiveness, Provider, ProviderEffort};
 use crate::model::ids::AgentId;
 use crate::model::yaml::{self, Value};
 use crate::state::persist::load_runtime_state;
@@ -73,22 +73,6 @@ pub(super) fn spawn_agents(
         spec.get("runtime").and_then(|v| v.get("fast")),
         Some(Value::Bool(true))
     );
-    let display_backend = spec_display_backend(spec);
-    let active_agent_ids = spec_agent_values(spec)
-        .into_iter()
-        .filter_map(|agent| {
-            if agent_is_paused(agent) {
-                None
-            } else {
-                agent.get("id").and_then(Value::as_str).map(AgentId::new)
-            }
-        })
-        .collect::<Vec<_>>();
-    let layout_plan = if display_backend == DisplayBackend::Adaptive {
-        adaptive_layout_plan(&active_agent_ids, ADAPTIVE_LAYOUT_MAX_PER_WINDOW)
-    } else {
-        Vec::new()
-    };
     let mut started = Vec::new();
     for agent in spec_agent_values(spec) {
         let Some(agent_id_raw) = agent.get("id").and_then(Value::as_str) else {
@@ -392,15 +376,7 @@ pub(super) fn spawn_agents(
                 );
             }
         }
-        // 0.3.28 Step 4b: replaced the `adaptive_layout_plan` 3-pane tiling
-        // with Python-parity 1-window-per-agent placement. Window name =
-        // `agent_id`; first worker creates the session via spawn_first,
-        // subsequent workers each get a new window via spawn_into. No splits
-        // in the worker session — Step 8's `assert_overlay_call_site` would
-        // catch any drift if a split call snuck back in. The `placement`
-        // variable is set to None to signal "no adaptive layout" to all
-        // downstream consumers (display dict, layout_window persistence).
-        let placement: Option<LayoutPlacement> = None;
+        // One independent tmux window per worker; no GUI/display layout.
         let window = WindowName::new(agent_id_raw);
         let spawn = if started.is_empty() {
             transport.spawn_first_with_env_unset(
@@ -436,35 +412,6 @@ pub(super) fn spawn_agents(
         if matches!(transport.liveness(&spawn.pane_id), Ok(PaneLiveness::Dead)) {
             continue;
         }
-        if placement.is_some() {
-            configure_adaptive_pane_title(
-                workspace,
-                transport,
-                session_name,
-                &window,
-                &spawn.pane_id,
-                agent_id_raw,
-            );
-        }
-        let display = if placement.is_some() {
-            WorkerDisplay::Adaptive {
-                status: DisplayStatus::Opened,
-                window: Some(spawn.window.clone()),
-                workspace_window: None,
-                pane_id: Some(spawn.pane_id.clone()),
-                pane_title: Some(agent_id_raw.to_string()),
-                target: Some(spawn.pane_id.as_str().to_string()),
-                target_worker_session: Some(session_name.as_str().to_string()),
-                linked_session: None,
-                leader_session: Some(session_name.clone()),
-                display_session: None,
-                fallback: None,
-            }
-        } else {
-            WorkerDisplay::Blocked {
-                reason: AdaptiveBlockReason::NotImplementedThisPlatform,
-            }
-        };
         started.push(StartedAgent {
             agent_id,
             start_mode: StartMode::Fresh,
@@ -479,12 +426,6 @@ pub(super) fn spawn_agents(
                 .clone()
                 .or_else(|| profile_launch.claude_projects_root.clone()),
             managed_mcp_config: plan.managed_mcp_config || profile_launch.managed_mcp_config,
-            layout_window: placement
-                .as_ref()
-                .map(|placement| placement.layout_window.clone()),
-            layout_index: placement.as_ref().map(|placement| placement.layout_index),
-            pane_index: placement.as_ref().map(|placement| placement.pane_index),
-            display,
         });
     }
     Ok(started)

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

@@ -60,7 +60,7 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use crate::lifecycle::*;
-use crate::model::enums::{AuthMode, DisplayBackend, PaneLiveness, Provider, ProviderEffort};
+use crate::model::enums::{AuthMode, PaneLiveness, Provider, ProviderEffort};
 use crate::model::ids::AgentId;
 use crate::model::yaml::{self, Value};
 use crate::state::persist::load_runtime_state;
@@ -68,7 +68,6 @@ use crate::transport::{PaneId, SessionName, Target, Transport, WindowName};
 
 use crate::lifecycle::lock::{acquire_agent_lifecycle_lock, LifecycleLockRequest};
 
-use super::identity::spec_display_backend;
 use super::leader_context::{caller_provider_for_seed_with_lookup, seed_unbound_launched_owner};
 use super::worker_env::spawn_timestamp;
 
@@ -77,7 +76,7 @@ use super::worker_env::spawn_timestamp;
 /// params:
 ///   team_key: 本团队的 runtime 键
 ///   scoped_endpoint: 本次起队已选中的 transport tmux endpoint，与 fresh bind 同源
-/// returns: 含 spec_path、workspace、team_dir、session_name、leader、agents、tasks 与 display_backend 的 state；随后按环境种入 launched owner，种不到则种一份 unbound owner
+/// returns: 含 spec_path、workspace、team_dir、session_name、leader、agents、tasks 的 state；随后按环境种入 launched owner，种不到则种一份 unbound owner
 /// ---
 pub(super) fn initial_runtime_state(
     spec: &Value,
@@ -113,7 +112,6 @@ pub(super) fn initial_runtime_state(
         }
         agents.insert(id.to_string(), value);
     }
-    let display_backend = spec_display_backend(spec);
     let mut state = serde_json::Map::new();
     state.insert(
         "spec_path".to_string(),
@@ -140,10 +138,6 @@ pub(super) fn initial_runtime_state(
     );
     state.insert("agents".to_string(), serde_json::Value::Object(agents));
     state.insert("tasks".to_string(), spec_tasks_json(spec));
-    state.insert(
-        "display_backend".to_string(),
-        serde_json::json!(display_backend),
-    );
     state.insert("is_external_leader".to_string(), serde_json::json!(false));
     let mut state = serde_json::Value::Object(state);
     if !seed_launched_owner_from_env(&mut state, scoped_endpoint) {
@@ -377,13 +371,6 @@ pub(crate) fn override_spec_workspace(spec: &mut Value, workspace: &Path) {
     }
 }
 
-/// ---
-/// purpose: 就地把 spec 的 runtime.display_backend 改成给定值
-/// ---
-pub(super) fn override_spec_display_backend(spec: &mut Value, display_backend: &str) {
-    override_spec_runtime_str(spec, "display_backend", display_backend);
-}
-
 /// ---
 /// purpose: 就地写 spec 的 runtime 段下某个字符串字段
 /// params:

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

@@ -35,11 +35,11 @@ use std::process::Command;
 use crate::lifecycle::lock::{acquire_agent_lifecycle_lock, LifecycleLockRequest};
 use crate::lifecycle::profile_launch::parse_provider;
 use crate::lifecycle::*;
-use crate::model::enums::{AuthMode, DisplayBackend, PaneLiveness, Provider, ProviderEffort};
+use crate::model::enums::{AuthMode, PaneLiveness, Provider, ProviderEffort};
 use crate::model::ids::AgentId;
 use crate::model::yaml::{self, Value};
 use crate::state::persist::load_runtime_state;
-use crate::transport::{PaneId, SessionName, Target, Transport, WindowName};
+use crate::transport::{PaneId, SessionName, Target, Transport};
 
 use super::agent_state::running_agent_state;
 use super::identity::{explicit_active_team_key, runtime_team_key_for_spec};
@@ -132,11 +132,7 @@ pub(super) fn persist_spawn_agent_state(
             continue;
         }
         let started_agent = started.iter().find(|agent| agent.agent_id.as_str() == id);
-        let window = started_agent
-            .and_then(|started| started.layout_window.as_ref())
-            .map(WindowName::as_str)
-            .or_else(|| agent.get("window").and_then(Value::as_str))
-            .unwrap_or(id);
+        let window = agent.get("window").and_then(Value::as_str).unwrap_or(id);
         if !live_started_agents.contains(id)
             || (!live_windows.is_empty() && !live_windows.contains(window))
         {

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

@@ -28,7 +28,7 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use crate::lifecycle::*;
-use crate::model::enums::{AuthMode, DisplayBackend, PaneLiveness, Provider, ProviderEffort};
+use crate::model::enums::{AuthMode, PaneLiveness, Provider, ProviderEffort};
 use crate::model::ids::AgentId;
 use crate::model::yaml::{self, Value};
 use crate::state::persist::load_runtime_state;

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

@@ -15,7 +15,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-use crate::model::enums::{AuthMode, DisplayBackend, PaneLiveness, Provider, ProviderEffort};
+use crate::model::enums::{AuthMode, PaneLiveness, Provider, ProviderEffort};
 use crate::model::ids::AgentId;
 use crate::model::yaml::{self, Value};
 use crate::state::persist::load_runtime_state;
@@ -370,10 +370,9 @@ pub(crate) use identity::{
 
 mod quick_start;
 pub(super) use quick_start::*;
-pub use quick_start::{quick_start, quick_start_in_workspace_with_display_and_backend};
+pub use quick_start::{quick_start, quick_start_in_workspace_with_backend};
 pub(crate) use quick_start::{
     quick_start_in_workspace, quick_start_with_transport, quick_start_with_transport_in_workspace,
-    quick_start_with_transport_in_workspace_with_display,
 };
 
 mod quick_start_transport;
@@ -426,7 +425,7 @@ pub(crate) use spec_state::{
 };
 use spec_state::{
     env_nonempty, has_positive_caller_leader_env, initial_runtime_state,
-    override_spec_display_backend, override_spec_runtime_str, seed_launched_owner_from_env,
+    override_spec_runtime_str, seed_launched_owner_from_env,
     spec_agent_values, spec_agents, spec_default_assignee, spec_routes, spec_session_name,
     spec_tasks_json, team_workspace, yaml_value_to_json,
 };

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

@@ -20,8 +20,6 @@
 //!   (`stop_agent`/`reset_agent`/`add_agent`/`fork_agent`)、`lifecycle/agents.py`
 //!   (`remove_agent` + `_RemoveRollback`)、`lifecycle/paste_buffer_hygiene.py`。
 //! - `restart/orchestration.py`(`restart` Route B)、`restart/selection.py`、`restart/snapshot.py`。
-//! - `display/backend.py`/`adaptive.py`/`tiling.py`/`workspace.py`/`worker_window.py`/
-//!   `ghostty.py`/`close.py`/`rebuild.py`。
 //! - `orchestrator/__init__.py`/`plan.py`/`state.py`(plan 多 stage 状态机)。
 //! - `diagnose/quick_start.py`(`quick_start`/`prepare_quick_start_team`/`wait_ready`)。
 //!
@@ -52,7 +50,6 @@
 // (unimplemented!() stub 不被拦);tests 子模块各自 allow。
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
-pub mod display;
 pub mod helpers;
 pub mod launch;
 pub(crate) mod lock;
@@ -70,12 +67,7 @@ use crate::model::ids::AgentId;
 use crate::provider::{RolloutPath, SessionId};
 use crate::transport::{PaneId, SessionName, WindowName};
 
-// 复用既有 enum(model::enums)。`DisplayBackend` 已在 step2 定义并带 `has_worker_views()`。
-pub use crate::model::enums::DisplayBackend;
-
 pub use types::*;
-
-pub use display::*;
 pub use launch::*;
 pub use restart::*;
 

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

@@ -228,16 +228,19 @@ pub(crate) fn start_agent_at_paths(
     // spawn (defensive). The check itself remains a no-op on healthy
     // state — assert_topology_invariants from Step 1 catches the
     // upstream corruption.
-    let has_collision = pane_conflicts_with_leader_or_other(&state, agent_id, &raw_agent);
-    if has_collision && noop_pane.is_none() {
+    let noop_pane_conflict = noop_pane.as_ref().is_some_and(|pane| {
+        pane_conflicts_with_pane_id(&state, agent_id, &raw_agent, pane.pane_id.as_str())
+    });
+    let has_collision = pane_conflicts_with_leader_or_other(&state, agent_id, &raw_agent)
+        || noop_pane_conflict;
+    if has_collision {
         eprintln!(
-            "team_agent::layout e51_collision_post_step2 agent_id=`{agent_id}` \
+            "team_agent::layout pane_collision agent_id=`{agent_id}` \
              action=forcing_fresh_spawn \
-             (should be impossible after Step 2 leader/worker session separation; \
-              investigate upstream state corruption)"
+             (the persisted or discovered pane is owned by another live seat)"
         );
     }
-    let agent_live = agent_live && (!has_collision || noop_pane.is_some());
+    let agent_live = agent_live && !has_collision;
     // 0.5.66 bypass 单源 §2.6 — dangerously_skip_permissions drift 挡板:
     // Noop 路径不 spawn,若声明面(角色 md / spec)与运行面(as-launched)不一致,
     // 拒 Noop 报明,防"改了 md 却以为生效、进程仍带旧 bypass 跑着"的暗门。
@@ -678,6 +681,15 @@ fn pane_conflicts_with_leader_or_other(
     else {
         return false;
     };
+    pane_conflicts_with_pane_id(state, agent_id, agent, pane_id)
+}
+
+fn pane_conflicts_with_pane_id(
+    state: &serde_json::Value,
+    agent_id: &crate::model::ids::AgentId,
+    agent: &serde_json::Value,
+    pane_id: &str,
+) -> bool {
     let state_socket = runtime_tmux_socket(state);
     let agent_socket = tmux_socket_field(agent).or(state_socket);
     // Check leader anchor.
@@ -693,7 +705,12 @@ fn pane_conflicts_with_leader_or_other(
     // Check other agents.
     if let Some(agents) = state.get("agents").and_then(serde_json::Value::as_object) {
         for (id, other) in agents {
-            if id == agent_id.as_str() {
+            if id == agent_id.as_str()
+                || matches!(
+                    other.get("status").and_then(serde_json::Value::as_str),
+                    Some("stopped" | "paused" | "failed" | "removed")
+                )
+            {
                 continue;
             }
             let other_socket = tmux_socket_field(other).or(state_socket);
@@ -1165,7 +1182,6 @@ pub(super) fn stop_agent_at_paths(
         );
         let _ = write_stop_drain_event(workspace, agent_id, &target_str, &drain_evidence);
     }
-    close_agent_display(&mut state, agent_id);
     mark_agent_stopped(&mut state, agent_id, agent, &window)?;
     let team_key = restart_projection_team_key(&state, team);
     // golden operations.py:95: save_team_scoped_state (team projection) — NOT a raw save, so a
@@ -2041,6 +2057,44 @@ mod tests {
         );
     }
 
+    #[test]
+    fn e51_restart_rejects_discovered_peer_pane_for_stale_worker() {
+        let socket = "/private/tmp/tmux-501/ta-worker";
+        let state = serde_json::json!({
+            "tmux_endpoint": socket,
+            "agents": {
+                "worker": {"pane_id": "%1", "status": "running"},
+                "peer": {"pane_id": "%0", "status": "running"}
+            }
+        });
+        let agent_id = AgentId::new("worker");
+        let agent = state["agents"]["worker"].clone();
+
+        assert!(
+            pane_conflicts_with_pane_id(&state, &agent_id, &agent, "%0"),
+            "a discovered live pane owned by a running peer must not be rebound"
+        );
+    }
+
+    #[test]
+    fn e51_restart_ignores_stopped_peer_pane_residue() {
+        let socket = "/private/tmp/tmux-501/ta-worker";
+        let state = serde_json::json!({
+            "tmux_endpoint": socket,
+            "agents": {
+                "worker": {"pane_id": "%1", "status": "running"},
+                "peer": {"pane_id": "%0", "status": "stopped"}
+            }
+        });
+        let agent_id = AgentId::new("worker");
+        let agent = state["agents"]["worker"].clone();
+
+        assert!(
+            !pane_conflicts_with_pane_id(&state, &agent_id, &agent, "%0"),
+            "stopped peer residue must not claim a pane for a live restart"
+        );
+    }
+
     // 0.5.66 bypass 单源 §4.1:Noop drift 检测——声明面与运行面不一致 → drift。
     #[test]
     fn test_restart_noop_denied_on_drift() {

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

@@ -2047,38 +2047,6 @@ pub(super) fn window_exists(
     }
 }
 
-/// ---
-/// purpose: 在 state 里把该席位的显示标记为已关
-/// params:
-///   state: 就地改写；只有 ghostty 工作区后端会被改写状态与标题，其余后端不动
-/// ---
-pub(super) fn close_agent_display(state: &mut serde_json::Value, agent_id: &AgentId) {
-    let Some(display) = state
-        .get_mut("agents")
-        .and_then(|v| v.as_object_mut())
-        .and_then(|agents| agents.get_mut(agent_id.as_str()))
-        .and_then(|agent| agent.get_mut("display"))
-        .and_then(|display| display.as_object_mut())
-    else {
-        return;
-    };
-    let backend = display
-        .get("backend")
-        .and_then(|v| v.as_str())
-        .unwrap_or("")
-        .to_string();
-    // golden operations.py:88-92: close_ghostty_display (display/close.py:17-48) mutates NOTHING in the
-    // persisted state for a ghostty_window; only the ghostty_workspace slot is relabeled
-    // (close.py:84-85: status="stopped", pane_title=f"stopped: {agent_id}") and re-assigned back.
-    if backend == "ghostty_workspace" {
-        display.insert("status".to_string(), serde_json::json!("stopped"));
-        display.insert(
-            "pane_title".to_string(),
-            serde_json::json!(format!("stopped: {}", agent_id.as_str())),
-        );
-    }
-}
-
 /// ---
 /// purpose: 丢弃该席位的会话捕获字段并标记为已停
 /// params: