@team-agent/installer 0.5.97 → 0.5.99

package/Cargo.lock

@@ -581,7 +581,7 @@ dependencies = [
 
 [[package]]
 name = "team-agent"
-version = "0.5.97"
+version = "0.5.99"
 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.97"
+version = "0.5.99"
 license = "AGPL-3.0"
 rust-version = "1.95"
 

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

@@ -108,7 +108,6 @@ pub fn cmd_quick_start(args: &QuickStartArgs) -> Result<CmdResult, CliError> {
         args.name.as_deref(),
         args.team_id.as_deref(),
         args.yes,
-        !args.no_display,
         args.backend.as_deref(),
     )?;
     append_send_guidance(&mut value, &args.workspace, args.team_id.as_deref());
@@ -269,50 +268,6 @@ fn append_reminder(text: String, reminder: &str) -> String {
     }
 }
 
-/// `cmd_compile`(`commands.py:42`)。
-pub fn cmd_compile(args: &CompileArgs) -> Result<CmdResult, CliError> {
-    let spec =
-        crate::compiler::compile_team(&args.team).map_err(|e| CliError::Runtime(e.to_string()))?;
-    warn_ignored_owner_team_id(&args.team);
-    std::fs::write(&args.out, crate::model::yaml::dumps(&spec))?;
-    Ok(CmdResult::from_json(
-        json!({
-            "ok": true,
-            "team_dir": args.team.to_string_lossy().to_string(),
-            "out": args.out.to_string_lossy().to_string(),
-            "agents": compiled_agent_ids_for_cli(&spec),
-        }),
-        args.json,
-    ))
-}
-
-fn warn_ignored_owner_team_id(team_dir: &std::path::Path) {
-    let Ok(Some(ignored)) = crate::compiler::ignored_owner_team_id_from_team_md(team_dir) else {
-        return;
-    };
-    let workspace = crate::model::paths::team_workspace(team_dir)
-        .unwrap_or_else(|_| team_dir.parent().unwrap_or(team_dir).to_path_buf());
-    eprintln!(
-        "Warning: ignored TEAM.md {}={}",
-        ignored.field, ignored.value
-    );
-    eprintln!("Reason: owner identity is the canonical runtime team key, not TEAM.md front matter");
-    eprintln!("Action: remove {} from TEAM.md", ignored.field);
-    let fields = json!({
-        "field": ignored.field,
-        "source": team_dir.join("TEAM.md").to_string_lossy().to_string(),
-        "value": ignored.value,
-        "warning": "ignored user-set owner_team_id",
-        "reason": "owner identity is derived from the canonical runtime team key",
-        "action": "remove owner_team_id from TEAM.md",
-    });
-    if let Err(err) =
-        crate::event_log::EventLog::new(&workspace).write("spec.field_ignored", fields)
-    {
-        eprintln!("Warning: spec.field_ignored event write failed: {err}");
-    }
-}
-
 /// `cmd_status`(`commands.py:90`)。CLI status 统一为只读七字段 brief；
 /// `--json` 与人读路径共享 native tmux/process projection；`--summary`/`--detail` 保留参数兼容性但不暴露诊断。
 #[cfg(test)]
@@ -915,7 +870,6 @@ communication:
     mirror_files: ".team/messages"
 runtime:
   backend: "tmux"
-  display_backend: "none"
   session_name: "team-agent-fake-e2e"
   auto_launch: true
   require_user_approval_before_launch: false
@@ -968,19 +922,6 @@ fn sessions_overview(state: &Value, spec: Option<&crate::model::yaml::Value>) ->
     Value::Array(rows)
 }
 
-fn compiled_agent_ids_for_cli(spec: &crate::model::yaml::Value) -> Vec<String> {
-    spec.get("agents")
-        .and_then(crate::model::yaml::Value::as_list)
-        .map(|agents| {
-            agents
-                .iter()
-                .filter_map(|agent| agent.get("id").and_then(crate::model::yaml::Value::as_str))
-                .map(str::to_string)
-                .collect()
-        })
-        .unwrap_or_default()
-}
-
 fn session_row(
     state: &Value,
     spec_agent: &crate::model::yaml::Value,
@@ -1269,7 +1210,6 @@ pub fn cmd_start_agent(args: &StartAgentArgs) -> Result<CmdResult, CliError> {
         &args.workspace,
         &args.agent,
         args.force,
-        !args.no_display,
         args.allow_fresh,
         args.team.as_deref(),
     )?;
@@ -1300,7 +1240,6 @@ pub fn cmd_reset_agent(args: &ResetAgentArgs) -> Result<CmdResult, CliError> {
             &args.workspace,
             &args.agent,
             args.discard_session,
-            !args.no_display,
             args.team.as_deref(),
         )?,
         args.json,
@@ -1313,7 +1252,6 @@ pub fn cmd_add_agent(args: &AddAgentArgs) -> Result<CmdResult, CliError> {
         &args.workspace,
         &args.agent,
         &args.role_file,
-        !args.no_display,
         args.team.as_deref(),
         args.force,
     )?;
@@ -1337,7 +1275,6 @@ pub fn cmd_fork_agent(args: &ForkAgentArgs) -> Result<CmdResult, CliError> {
             &args.source_agent,
             &args.as_agent,
             args.label.as_deref(),
-            !args.no_display,
             args.team.as_deref(),
         )?,
         args.json,
@@ -1351,7 +1288,6 @@ pub fn cmd_clone_agent(args: &CloneAgentArgs) -> Result<CmdResult, CliError> {
             &args.source_agent,
             &args.as_agent,
             args.label.as_deref(),
-            !args.no_display,
             args.team.as_deref(),
         )?,
         args.json,

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

@@ -1319,22 +1319,6 @@ pub(crate) fn build_preflight_report(team: &std::path::Path) -> Result<Value, Cl
         next_actions.push(json!("install tmux or add it to PATH"));
     }
 
-    let display_backend = compiled
-        .as_ref()
-        .and_then(|spec| yaml_path_str(spec, &["runtime", "display_backend"]))
-        .unwrap_or("none");
-    let ghostty_required = display_backend == "ghostty_window" || display_backend == "ghostty";
-    let ghostty_path = command_path("ghostty");
-    checks.push(json!({
-        "name": "ghostty",
-        "ok": !ghostty_required || ghostty_path.is_some(),
-        "path": ghostty_path,
-        "required": ghostty_required,
-    }));
-    if ghostty_required && ghostty_path.is_none() {
-        next_actions.push(json!("install Ghostty or choose another display_backend"));
-    }
-
     let workspace = crate::model::paths::team_workspace(team)
         .map_err(|error| CliError::Runtime(error.to_string()))?;
     let profile_dir_exists = workspace

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

@@ -158,6 +158,14 @@ pub(crate) fn __test_dispatch(
 }
 
 fn dispatch(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliError> {
+    // Keep the removed flag harmless for older scripts and persisted command
+    // lines; the default tmux backend is already the only runtime path.
+    let filtered_args: Vec<String> = args
+        .iter()
+        .filter(|arg| arg.as_str() != "--no-display")
+        .cloned()
+        .collect();
+    let args = filtered_args.as_slice();
     let Some(spec) = command_spec(command) else {
         return Ok(emit_unknown_subcommand_usage(command));
     };
@@ -174,7 +182,6 @@ fn dispatch(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliE
     match command {
         "init" => cmd_init(&init_args(args, cwd)).map(emit_result),
         "quick-start" => cmd_quick_start(&quick_start_args(args, cwd)?).map(emit_result),
-        "compile" => cmd_compile(&compile_args(args, cwd)?).map(emit_result),
         "send" => cmd_send(&send_args(args, cwd)?).map(emit_result),
         "allow-peer-talk" => {
             cmd_allow_peer_talk(&allow_peer_talk_args(args, cwd)?).map(emit_result)
@@ -239,7 +246,6 @@ fn dispatch(command: &str, args: &[String], cwd: &Path) -> Result<ExitCode, CliE
 const DISPATCH_COMMANDS: &[&str] = &[
     "init",
     "quick-start",
-    "compile",
     "send",
     "allow-peer-talk",
     "status",
@@ -399,9 +405,8 @@ fn command_help(command: Option<&str>) -> String {
     match command {
         None => default_help(),
         Some("init") => compat_hidden_help("init", "usage: team-agent init [--workspace WORKSPACE] [--force] [--json]"),
-        Some("quick-start") => "usage: team-agent quick-start [TEAMDIR] [--workspace WORKSPACE] [--name NAME] [--team-id TEAM|--team TEAM] [--yes] [--no-display] [--backend tmux|conpty] [--json] [--detail]\n\ndefaults: display_backend=adaptive; set display_backend: none in TEAM.md or pass --no-display to use one worker window per agent.\n\n--backend selects the worker transport (Phase 1d Batch 2): tmux (default on POSIX; unchanged behavior), conpty (Windows-native ConPTY worker transport; requires the shim binary and Windows host).\n\n--detail includes internal receiver/topology diagnostics in JSON output.\n\nAfter a successful start, use the returned `send_commands` (or choose an agent explicitly) with `team-agent send AGENT MESSAGE`.".to_string(),
+        Some("quick-start") => "usage: team-agent quick-start [TEAMDIR] [--workspace WORKSPACE] [--name NAME] [--team-id TEAM|--team TEAM] [--yes] [--backend tmux|conpty] [--json] [--detail]\n\n--backend selects the worker transport: tmux (default on POSIX) or conpty (Windows-native ConPTY worker transport; requires the shim binary and Windows host).\n\n--detail includes internal receiver/topology diagnostics in JSON output.\n\nAfter a successful start, use the returned `send_commands` (or choose an agent explicitly) with `team-agent send AGENT MESSAGE`.".to_string(),
         Some("start") => compat_hidden_help("start", "usage: team-agent start [TEAMDIR] [--yes] [--fresh] [--json]"),
-        Some("compile") => "usage: team-agent compile --team TEAM [--out FILE] [--json]".to_string(),
         Some("send") => concat!(
             "usage: team-agent send TO MESSAGE... ",
             "[--workspace WORKSPACE] [--team TEAM] ",
@@ -418,13 +423,13 @@ fn command_help(command: Option<&str>) -> String {
         Some("stop") => compat_hidden_help("stop", "usage: team-agent stop [--workspace WORKSPACE] [--team TEAM] [--keep-logs] [--json]"),
         Some("shutdown") => "usage: team-agent shutdown [--workspace WORKSPACE] [--team TEAM] [--keep-logs] [--json]".to_string(),
         Some("restart") => "usage: team-agent restart [WORKSPACE] [--team TEAM] [--allow-fresh] [--session-converge-deadline SECONDS] [--json] [--detail]".to_string(),
-        Some("restart-agent") => compat_hidden_help("restart-agent", "usage: team-agent restart-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--discard-session] [--no-display] [--json]"),
-        Some("reset-agent") => "usage: team-agent reset-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--discard-session] [--no-display] [--json]".to_string(),
-        Some("start-agent") => "usage: team-agent start-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--force] [--allow-fresh] [--no-display] [--json]\n\nAfter a successful start, use the returned `send_commands` with `team-agent send AGENT MESSAGE`.".to_string(),
+        Some("restart-agent") => compat_hidden_help("restart-agent", "usage: team-agent restart-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--discard-session] [--json]"),
+        Some("reset-agent") => "usage: team-agent reset-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--discard-session] [--json]".to_string(),
+        Some("start-agent") => "usage: team-agent start-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--force] [--allow-fresh] [--json]\n\nAfter a successful start, use the returned `send_commands` with `team-agent send AGENT MESSAGE`.".to_string(),
         Some("stop-agent") => "usage: team-agent stop-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--json]".to_string(),
-        Some("add-agent") => "usage: team-agent add-agent AGENT --role-file FILE [--force] [--workspace WORKSPACE] [--team TEAM] [--no-display] [--json]\n\nAfter a successful add, use the returned `send_commands` with `team-agent send AGENT MESSAGE`.".to_string(),
-        Some("clone-agent") => "usage: team-agent clone-agent SOURCE_AGENT --as AGENT [--label LABEL] [--workspace WORKSPACE] [--team TEAM] [--no-display] [--json]".to_string(),
-        Some("fork-agent") => "usage: team-agent fork-agent SOURCE_AGENT --as AGENT [--label LABEL] [--workspace WORKSPACE] [--team TEAM] [--no-display] [--json]".to_string(),
+        Some("add-agent") => "usage: team-agent add-agent AGENT --role-file FILE [--force] [--workspace WORKSPACE] [--team TEAM] [--json]\n\nAfter a successful add, use the returned `send_commands` with `team-agent send AGENT MESSAGE`.".to_string(),
+        Some("clone-agent") => "usage: team-agent clone-agent SOURCE_AGENT --as AGENT [--label LABEL] [--workspace WORKSPACE] [--team TEAM] [--json]".to_string(),
+        Some("fork-agent") => "usage: team-agent fork-agent SOURCE_AGENT --as AGENT [--label LABEL] [--workspace WORKSPACE] [--team TEAM] [--json]".to_string(),
         Some("remove-agent") => "usage: team-agent remove-agent AGENT [--workspace WORKSPACE] [--team TEAM] [--from-spec] [--confirm] [--force] [--json]".to_string(),
         // 0.5.26 (§7.6): removed from help; dispatch was never wired.
         Some("stuck-list") => "usage: team-agent stuck-list [--workspace WORKSPACE] [--team TEAM] [--json]".to_string(),
@@ -827,7 +832,6 @@ struct ParsedArgs {
     allow_fresh: bool,
     session_converge_deadline_ms: Option<u64>,
     force: bool,
-    no_display: bool,
     discard_session: bool,
     role_file: Option<String>,
     as_agent: Option<String>,
@@ -853,7 +857,6 @@ struct ParsedArgs {
     result: Option<String>,
     real: bool,
     assignee: Option<String>,
-    out: Option<PathBuf>,
     auth_mode: Option<String>,
     proxy_mode: Option<String>,
     pane: Option<String>,
@@ -919,7 +922,6 @@ fn parse_args(args: &[String]) -> ParsedArgs {
                     next_arg(args, &mut i).and_then(|v| parse_seconds_ms(&v));
             }
             "--force" => parsed.force = true,
-            "--no-display" => parsed.no_display = true,
             "--backend" => parsed.backend = next_arg(args, &mut i),
             "--discard-session" => parsed.discard_session = true,
             "--role-file" => parsed.role_file = next_arg(args, &mut i),
@@ -950,7 +952,6 @@ fn parse_args(args: &[String]) -> ParsedArgs {
             "--result" => parsed.result = next_arg(args, &mut i),
             "--real" => parsed.real = true,
             "--assignee" => parsed.assignee = next_arg(args, &mut i),
-            "--out" => parsed.out = next_arg(args, &mut i).map(PathBuf::from),
             "--auth-mode" => parsed.auth_mode = next_arg(args, &mut i),
             "--proxy-mode" => parsed.proxy_mode = next_arg(args, &mut i),
             "--pane" => parsed.pane = next_arg(args, &mut i),
@@ -1110,7 +1111,6 @@ fn quick_start_args(args: &[String], cwd: &Path) -> Result<QuickStartArgs, CliEr
         name: parsed.name,
         team_id: parsed.team_id.or(parsed.team),
         yes: parsed.yes,
-        no_display: parsed.no_display,
         json: parsed.json,
         detail: parsed.detail,
         backend: parsed.backend,
@@ -1145,23 +1145,6 @@ fn init_args(args: &[String], cwd: &Path) -> InitArgs {
     }
 }
 
-fn compile_args(args: &[String], cwd: &Path) -> Result<CompileArgs, CliError> {
-    let parsed = parse_args(args);
-    let team = parsed
-        .team
-        .as_deref()
-        .map(PathBuf::from)
-        .ok_or_else(|| CliError::Usage("missing --team".to_string()))?;
-    let out = parsed
-        .out
-        .unwrap_or_else(|| PathBuf::from("team.spec.yaml"));
-    Ok(CompileArgs {
-        team: resolve_cli_path(cwd, &team),
-        out: resolve_cli_path(cwd, &out),
-        json: parsed.json,
-    })
-}
-
 fn resolve_cli_path(cwd: &Path, path: &Path) -> PathBuf {
     if path.is_absolute() {
         path.to_path_buf()
@@ -1549,7 +1532,6 @@ fn start_agent_args(args: &[String], cwd: &Path) -> Result<StartAgentArgs, CliEr
         team: parsed.team,
         force: parsed.force,
         allow_fresh: parsed.allow_fresh,
-        no_display: parsed.no_display,
         json: parsed.json,
     })
 }
@@ -1573,7 +1555,6 @@ fn reset_agent_args(args: &[String], cwd: &Path) -> Result<ResetAgentArgs, CliEr
         workspace,
         team: parsed.team,
         discard_session: parsed.discard_session,
-        no_display: parsed.no_display,
         json: parsed.json,
     })
 }
@@ -1588,7 +1569,6 @@ fn add_agent_args(args: &[String], cwd: &Path) -> Result<AddAgentArgs, CliError>
             .role_file
             .ok_or_else(|| CliError::Usage("missing --role-file".to_string()))?,
         force: parsed.force,
-        no_display: parsed.no_display,
         json: parsed.json,
     })
 }
@@ -1603,7 +1583,6 @@ fn fork_agent_args(args: &[String], cwd: &Path) -> Result<ForkAgentArgs, CliErro
             .as_agent
             .ok_or_else(|| CliError::Usage("missing --as".to_string()))?,
         label: parsed.label,
-        no_display: parsed.no_display,
         json: parsed.json,
     })
 }
@@ -1618,7 +1597,6 @@ fn clone_agent_args(args: &[String], cwd: &Path) -> Result<CloneAgentArgs, CliEr
             .as_agent
             .ok_or_else(|| CliError::Usage("missing --as".to_string()))?,
         label: parsed.label,
-        no_display: parsed.no_display,
         json: parsed.json,
     })
 }
@@ -2267,7 +2245,6 @@ mod tests {
                     "--team",
                     "--force",
                     "--allow-fresh",
-                    "--no-display",
                     "--json",
                 ][..],
             ),
@@ -2277,7 +2254,6 @@ mod tests {
                     "--workspace",
                     "--team",
                     "--discard-session",
-                    "--no-display",
                     "--json",
                 ][..],
             ),
@@ -2287,7 +2263,6 @@ mod tests {
                     "--role-file",
                     "--workspace",
                     "--team",
-                    "--no-display",
                     "--json",
                 ][..],
             ),
@@ -2298,7 +2273,6 @@ mod tests {
                     "--label",
                     "--workspace",
                     "--team",
-                    "--no-display",
                     "--json",
                 ][..],
             ),
@@ -2738,6 +2712,5 @@ mod tests {
         assert_eq!(args.workspace, ws);
         // No `fresh` field anymore — the struct must compile and round-trip
         // without it.
-        let _ = args.no_display;
     }
 }

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

@@ -49,7 +49,7 @@ use crate::messaging::{self, AlertType, MessageTarget, SendOptions, TrustedSende
 use crate::model::ids::{TaskId, TeamKey};
 
 pub(crate) const COMMS_BOUNDARY_TEXT: &str = "validates live pane binding consistency and zero-token comms contracts. Does NOT perform live runtime message round-trip. (zero token, zero pollution)";
-pub(crate) const QUICK_START_REMINDER: &str = "Reminder: Do not inspect raw worker terminal output during normal operation. Use team-agent status / inbox / collect instead. Wait for report_result.";
+pub(crate) const QUICK_START_REMINDER: &str = "Reminder: Do not inspect raw worker pane output during normal operation. Use team-agent status / inbox / collect instead. Wait for report_result.";
 pub(crate) const SEND_REMINDER: &str = "Message delivered. Wait for the worker to report_result. Do not poll the worker terminal with capture-pane.";
 pub(crate) const STATUS_REMINDER: &str = "Results are finalized automatically; use --watch-result or team-agent inbox AGENT -n 3 for transport fallback. Do not capture-pane worker terminals.";
 
@@ -133,16 +133,14 @@ pub mod lifecycle_port {
         name: Option<&str>,
         team_id: Option<&str>,
         yes: bool,
-        open_display: bool,
         backend: Option<&str>,
     ) -> Result<Value, CliError> {
-        match crate::lifecycle::quick_start_in_workspace_with_display_and_backend(
+        match crate::lifecycle::quick_start_in_workspace_with_backend(
             workspace,
             agents_dir,
             name,
             yes,
             team_id,
-            open_display,
             backend,
         ) {
             Ok(report) => Ok(quick_start_value(report)),
@@ -1155,10 +1153,7 @@ pub mod lifecycle_port {
                             }
                         }
                     }
-                    let _ = crate::lifecycle::display::close_team_display_backends(
-                        &run_workspace,
-                        session,
-                    );
+                    cleanup_owned_team_windows(&run_workspace, transport, &state, session);
                 } else {
                     let targets = vec![session.as_str().to_string()];
                     let event_log = crate::event_log::EventLog::new(&run_workspace);
@@ -1185,10 +1180,7 @@ pub mod lifecycle_port {
                     } else {
                         push_unique_session(&mut killed_sessions, session.clone());
                     }
-                    let _ = crate::lifecycle::display::close_team_display_backends(
-                        &run_workspace,
-                        session,
-                    );
+                    cleanup_owned_team_windows(&run_workspace, transport, &state, session);
                 }
             }
         }
@@ -1473,6 +1465,127 @@ pub mod lifecycle_port {
         Ok(response)
     }
 
+    /// Remove legacy adaptive display windows without reopening a display backend.
+    /// Every target is scoped to the selected transport and passes the same
+    /// ownership/protection audit as the rest of shutdown. Unknown or protected
+    /// targets are intentionally left in place.
+    fn cleanup_owned_team_windows(
+        workspace: &Path,
+        transport: &dyn crate::transport::Transport,
+        state: &Value,
+        session: &crate::transport::SessionName,
+    ) {
+        let Some(agents) = state.get("agents").and_then(Value::as_object) else {
+            return;
+        };
+        let leader_session = state
+            .get("leader_receiver")
+            .and_then(|receiver| receiver.get("session_name"))
+            .and_then(Value::as_str)
+            .filter(|value| !value.is_empty())
+            .unwrap_or_else(|| session.as_str());
+        let leader_panes = collect_state_leader_anchor_pane_ids(
+            state,
+            transport.tmux_endpoint().as_deref(),
+        );
+        let event_log = crate::event_log::EventLog::new(workspace);
+        let team_key = state.get("team_key").and_then(Value::as_str);
+        let generation = state_generation(state);
+        let overview_prefix = format!("team-agent:{}:overview", session.as_str());
+        let mut windows = std::collections::BTreeSet::new();
+        let mut panes = std::collections::BTreeSet::new();
+        for (_agent_id, agent) in agents {
+            let Some(display) = agent.get("display").and_then(Value::as_object) else {
+                continue;
+            };
+            if display.get("backend").and_then(Value::as_str) != Some("adaptive") {
+                continue;
+            }
+            if display.get("status").and_then(Value::as_str) == Some("stopped") {
+                continue;
+            }
+            if let Some(window) = display
+                .get("workspace_window")
+                .or_else(|| display.get("window"))
+                .or_else(|| agent.get("window"))
+                .and_then(Value::as_str)
+                .filter(|value| !value.is_empty())
+            {
+                if window == overview_prefix || window.starts_with(&format!("{overview_prefix}-")) {
+                    windows.insert(format!("{leader_session}:{window}"));
+                }
+            }
+            if let Some(pane) = display.get("pane_id").and_then(Value::as_str) {
+                if pane.starts_with('%') && !leader_panes.contains(pane) {
+                    panes.insert(pane.to_string());
+                }
+            }
+        }
+        if let Ok(live_windows) = transport.list_windows(&crate::transport::SessionName::new(
+            leader_session.to_string(),
+        )) {
+            for window in live_windows {
+                let name = window.as_str();
+                if name == overview_prefix || name.starts_with(&format!("{overview_prefix}-")) {
+                    windows.insert(format!("{leader_session}:{name}"));
+                }
+            }
+        }
+        let live_targets = transport.list_targets().unwrap_or_default();
+        for target in &live_targets {
+            if leader_panes.contains(target.pane_id.as_str()) {
+                continue;
+            }
+            if let Some(window) = target.window_name.as_ref() {
+                if windows.contains(&format!("{}:{}", target.session.as_str(), window.as_str())) {
+                    panes.remove(target.pane_id.as_str());
+                }
+            }
+        }
+        for target in windows {
+            let Some((target_session, target_window)) = target.split_once(':') else {
+                continue;
+            };
+            let target = crate::transport::Target::SessionWindow {
+                session: crate::transport::SessionName::new(target_session.to_string()),
+                window: crate::transport::WindowName::new(target_window.to_string()),
+            };
+            let target_text = format!("{target_session}:{target_window}");
+            let audit = crate::kill_audit::pre_kill_audit_scoped(
+                &event_log,
+                transport,
+                "shutdown.legacy_display_window",
+                "kill-window",
+                std::slice::from_ref(&target_text),
+                workspace,
+                team_key,
+                generation,
+                "session_marker+state_display_window+team_tag",
+                "positive workspace/team ownership",
+            );
+            if audit.is_ok() {
+                let _ = transport.kill_window(&target);
+            }
+        }
+        for pane in panes {
+            let audit = crate::kill_audit::pre_kill_audit_scoped(
+                &event_log,
+                transport,
+                "shutdown.legacy_display_pane",
+                "kill-pane",
+                std::slice::from_ref(&pane),
+                workspace,
+                team_key,
+                generation,
+                "state_display_pane+team_session",
+                "positive workspace/team ownership",
+            );
+            if audit.is_ok() {
+                let _ = transport.kill_pane(&crate::transport::PaneId::new(pane));
+            }
+        }
+    }
+
     /// 0.5.x Windows portability Batch 6 Option A: locate and
     /// terminate the ConPTY shim if `state.transport.shim.pid` is
     /// recorded. Returns a JSON blob for the shutdown response so
@@ -2635,7 +2748,6 @@ pub mod lifecycle_port {
         workspace: &Path,
         agent: &str,
         force: bool,
-        open_display: bool,
         allow_fresh: bool,
         team: Option<&str>,
     ) -> Result<Value, CliError> {
@@ -2644,7 +2756,7 @@ pub mod lifecycle_port {
             workspace,
             &agent_id,
             force,
-            open_display,
+            true,
             allow_fresh,
             team,
         ) {
@@ -2712,7 +2824,6 @@ pub mod lifecycle_port {
         workspace: &Path,
         agent: &str,
         discard_session: bool,
-        open_display: bool,
         team: Option<&str>,
     ) -> Result<Value, CliError> {
         let agent_id = crate::model::ids::AgentId::new(agent);
@@ -2720,7 +2831,7 @@ pub mod lifecycle_port {
             workspace,
             &agent_id,
             discard_session,
-            open_display,
+            true,
             team,
         ) {
             Ok(crate::lifecycle::ResetAgentOutcome::Reset {
@@ -2763,7 +2874,6 @@ pub mod lifecycle_port {
         workspace: &Path,
         agent: &str,
         role_file: &str,
-        open_display: bool,
         team: Option<&str>,
         force: bool,
     ) -> Result<Value, CliError> {
@@ -2772,7 +2882,7 @@ pub mod lifecycle_port {
             workspace,
             &agent_id,
             Path::new(role_file),
-            open_display,
+            true,
             team,
             force,
         ) {
@@ -2811,12 +2921,11 @@ pub mod lifecycle_port {
         source_agent: &str,
         as_agent_id: &str,
         label: Option<&str>,
-        open_display: bool,
         team: Option<&str>,
     ) -> Result<Value, CliError> {
         let source = crate::model::ids::AgentId::new(source_agent);
         let dest = crate::model::ids::AgentId::new(as_agent_id);
-        match crate::lifecycle::fork_agent(workspace, &source, &dest, label, open_display, team) {
+        match crate::lifecycle::fork_agent(workspace, &source, &dest, label, true, team) {
             Ok(report) => Ok(json!({
                 "ok": true,
                 "source_agent_id": report.source_agent_id.as_str(),
@@ -2833,12 +2942,11 @@ pub mod lifecycle_port {
         source_agent: &str,
         as_agent_id: &str,
         label: Option<&str>,
-        open_display: bool,
         team: Option<&str>,
     ) -> Result<Value, CliError> {
         let source = crate::model::ids::AgentId::new(source_agent);
         let dest = crate::model::ids::AgentId::new(as_agent_id);
-        match crate::lifecycle::clone_agent(workspace, &source, &dest, label, open_display, team) {
+        match crate::lifecycle::clone_agent(workspace, &source, &dest, label, true, team) {
             Ok(report) => Ok(json!({
                 "ok": true,
                 "status": "cloned",
@@ -3362,7 +3470,6 @@ pub mod lifecycle_port {
                 launch,
                 next_actions,
                 attach_commands,
-                display_backend,
                 worker_readiness,
                 team,
             } => {
@@ -3502,7 +3609,6 @@ pub mod lifecycle_port {
                     "team": team,
                     "agent_ids": launch.started.iter().map(|agent| agent.agent_id.as_str()).collect::<Vec<_>>(),
                     "dry_run": launch.dry_run,
-                    "display_backend": display_backend,
                     "next_actions": next_actions,
                     "attach_commands": attach_commands,
                     "reminder": crate::cli::QUICK_START_REMINDER,
@@ -3638,12 +3744,6 @@ pub mod lifecycle_port {
                         claude_config_dir: None,
                         provider_projects_root: None,
                         managed_mcp_config: false,
-                        layout_window: None,
-                        layout_index: None,
-                        pane_index: None,
-                        display: crate::lifecycle::WorkerDisplay::Blocked {
-                            reason: crate::lifecycle::AdaptiveBlockReason::AggregatorRebuildFailed,
-                        },
                     }],
                     dry_run: false,
                     tmux_endpoint: None,
@@ -3655,7 +3755,6 @@ pub mod lifecycle_port {
                 }),
                 next_actions: Vec::new(),
                 attach_commands: Vec::new(),
-                display_backend: "none".to_string(),
                 worker_readiness: crate::lifecycle::QuickStartReadiness::PendingToolLoad,
                 team: "team-demo".to_string(),
             });