@team-agent/installer 0.5.61 → 0.5.62

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

@@ -1,3 +1,4 @@
+//!
 //! lifecycle::helpers —— runtime snapshot 原子写(bug-084)+ plan-state 路径/读取。
 
 use std::fs;
@@ -6,6 +7,7 @@ use std::path::{Path, PathBuf};
 
 use super::*;
 
+///
 /// `save_team_runtime_snapshot(workspace, state)` — Foundation-0 F0-2:
 /// this is now a **diagnostic-only** legacy per-session snapshot writer.
 /// Root/projection `.team/runtime/state.json` is the sole product
@@ -24,7 +26,7 @@ use super::*;
 /// team-key layout will live under a different path
 /// (`teams/<team_key>/...`), so this file also cannot be mistaken for
 /// the future canonical shape.
-pub fn save_team_runtime_snapshot(
+pub(crate) fn save_team_runtime_snapshot(
     workspace: &Path,
     state: &serde_json::Value,
 ) -> Result<PathBuf, LifecycleError> {

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

@@ -130,7 +130,7 @@ pub fn add_agent_force(
 
 /// `add_agent` with an injected transport — after the recompile+write, wires the new worker spawn
 /// (via start_agent_with_transport) + start_coordinator (rt-host-a sweep: recompiled but never spawned).
-pub fn add_agent_with_transport(
+pub(crate) fn add_agent_with_transport(
     workspace: &Path,
     agent_id: &AgentId,
     role_file_path: &Path,
@@ -157,7 +157,7 @@ pub fn add_agent_with_transport(
     )
 }
 
-pub fn add_agent_with_transport_force(
+pub(crate) fn add_agent_with_transport_force(
     workspace: &Path,
     agent_id: &AgentId,
     role_file_path: &Path,

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

@@ -1,3 +1,4 @@
+//!
 use super::super::*;
 
 pub(super) struct CompleteForkInput<'a> {

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

@@ -1,3 +1,4 @@
+//!
 use super::*;
 
 /// `fork_agent(workspace, source_agent_id, as_agent_id, ...)`(`lifecycle/operations.py:284`)。

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

@@ -1,3 +1,4 @@
+//!
 use super::*;
 
 pub(super) struct ForkPostSpawnInput<'a> {

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

@@ -4,7 +4,7 @@ use super::*;
 
 /// `start_plan(workspace, plan_path, start)`(`orchestrator/__init__.py:26`)。load_plan
 /// (YAML 校验)→ 持久化 PlanState → 派发首 stage。对已 running/halted/completed 幂等返回。
-pub fn start_plan(
+pub(crate) fn start_plan(
     workspace: &Path,
     plan_path: &Path,
     start: bool,
@@ -56,7 +56,7 @@ pub fn start_plan(
 
 /// `handle_report_result(workspace, envelope)`(`orchestrator/__init__.py:79`)。被 step11
 /// report_result 路径调用以推进 stage;条件匹配 → 推进/完成,否则 `NoMatch`。
-pub fn handle_report_result(
+pub(crate) fn handle_report_result(
     workspace: &Path,
     envelope: &serde_json::Value,
 ) -> Result<PlanProgress, LifecycleError> {

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

@@ -27,7 +27,7 @@ pub fn quick_start(
     quick_start_in_workspace(&workspace, agents_dir, name, yes, team_id)
 }
 
-pub fn quick_start_in_workspace(
+pub(crate) fn quick_start_in_workspace(
     workspace: &Path,
     agents_dir: &Path,
     name: Option<&str>,
@@ -39,28 +39,6 @@ pub fn quick_start_in_workspace(
     quick_start_with_transport_in_workspace(&workspace, agents_dir, name, yes, team_id, &transport)
 }
 
-pub fn quick_start_in_workspace_with_display(
-    workspace: &Path,
-    agents_dir: &Path,
-    name: Option<&str>,
-    yes: bool,
-    team_id: Option<&str>,
-    open_display: bool,
-) -> Result<QuickStartReport, LifecycleError> {
-    // Legacy entrypoint: no `--backend` override. Preserves the exact
-    // tmux behavior we shipped in Phase 1c (byte-equivalent tmux path
-    // when no explicit backend is asked for).
-    quick_start_in_workspace_with_display_and_backend(
-        workspace,
-        agents_dir,
-        name,
-        yes,
-        team_id,
-        open_display,
-        None,
-    )
-}
-
 /// 0.5.x Phase 1d Batch 2: quick-start with an optional
 /// `--backend <tmux|conpty>` override. When `backend` is `None` or
 /// `Some("tmux")` the transport is the same one the legacy entrypoint
@@ -204,7 +182,7 @@ pub fn quick_start_in_workspace_with_display_and_backend(
     )
 }
 
-pub fn quick_start_with_transport(
+pub(crate) fn quick_start_with_transport(
     agents_dir: &Path,
     name: Option<&str>,
     yes: bool,
@@ -215,7 +193,7 @@ pub fn quick_start_with_transport(
     quick_start_with_transport_in_workspace(&workspace, agents_dir, name, yes, team_id, transport)
 }
 
-pub fn quick_start_with_transport_in_workspace(
+pub(crate) fn quick_start_with_transport_in_workspace(
     workspace: &Path,
     agents_dir: &Path,
     name: Option<&str>,
@@ -228,7 +206,7 @@ pub fn quick_start_with_transport_in_workspace(
     )
 }
 
-pub fn quick_start_with_transport_in_workspace_with_display(
+pub(crate) fn quick_start_with_transport_in_workspace_with_display(
     workspace: &Path,
     agents_dir: &Path,
     name: Option<&str>,

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

@@ -20,33 +20,6 @@ use crate::lifecycle::lock::{acquire_agent_lifecycle_lock, LifecycleLockRequest}
 
 use super::*;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ReadinessPhase {
-    StartCoordinator,
-    ComputeVerdict,
-}
-
-impl ReadinessPhase {
-    pub fn as_str(self) -> &'static str {
-        match self {
-            Self::StartCoordinator => "launch.readiness.start_coordinator",
-            Self::ComputeVerdict => "launch.readiness.compute_verdict",
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn phase_labels_are_dotted_paths_under_launch_readiness() {
-        assert!(ReadinessPhase::StartCoordinator
-            .as_str()
-            .starts_with("launch.readiness."));
-    }
-}
-
 pub(super) fn quick_start_worker_readiness(
     workspace: &Path,
     team_key: &str,

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

@@ -1,3 +1,4 @@
+//!
 //! unit-8 (Stage 3) — `lifecycle::launch::spawn` phase boundary.
 //!
 //! Dedicated home for the worker spawn executor. Future commits migrate
@@ -21,33 +22,6 @@ use crate::lifecycle::lock::{acquire_agent_lifecycle_lock, LifecycleLockRequest}
 
 use super::*;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum SpawnPhase {
-    SpawnFirstWithEnvUnset,
-    SpawnIntoWithEnvUnset,
-}
-
-impl SpawnPhase {
-    pub fn as_str(self) -> &'static str {
-        match self {
-            Self::SpawnFirstWithEnvUnset => "launch.spawn.first_with_env_unset",
-            Self::SpawnIntoWithEnvUnset => "launch.spawn.into_with_env_unset",
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn phase_labels_are_dotted_paths_under_launch_spawn() {
-        assert!(SpawnPhase::SpawnFirstWithEnvUnset
-            .as_str()
-            .starts_with("launch.spawn."));
-    }
-}
-
 pub(super) fn spawn_agents(
     workspace: &Path,
     spec_path: &Path,

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

@@ -1,3 +1,4 @@
+//!
 //! unit-8 (Stage 3) — `lifecycle::launch::spec_state` phase boundary.
 //!
 //! The dedicated home for spec/runtime-path resolution and state-tree
@@ -40,38 +41,6 @@ use super::leader_context::{
 };
 use super::worker_env::spawn_timestamp;
 
-/// Named launch phases under spec_state. Used in phase labels for logs
-/// and (future) for the orchestrator's step dispatcher.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum SpecStatePhase {
-    ResolveSpecPaths,
-    MaterializeState,
-}
-
-impl SpecStatePhase {
-    pub fn as_str(self) -> &'static str {
-        match self {
-            Self::ResolveSpecPaths => "launch.spec_state.resolve_spec_paths",
-            Self::MaterializeState => "launch.spec_state.materialize_state",
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn phase_labels_are_dotted_paths_under_launch_spec_state() {
-        assert!(SpecStatePhase::ResolveSpecPaths
-            .as_str()
-            .starts_with("launch.spec_state."));
-        assert!(SpecStatePhase::MaterializeState
-            .as_str()
-            .starts_with("launch.spec_state."));
-    }
-}
-
 pub(super) fn initial_runtime_state(
     spec: &Value,
     spec_path: &Path,
@@ -258,6 +227,7 @@ pub(super) fn yaml_value_to_json(value: &Value) -> serde_json::Value {
     }
 }
 
+///
 /// Set `runtime.session_name` on the compiled spec to `session_name`, creating the
 /// `runtime` map and/or the `session_name` entry if absent. Used by quick-start to
 /// derive the tmux session from the REQUESTED team identity (CR-040/042) rather
@@ -356,6 +326,7 @@ pub(super) fn spec_session_name(spec: &Value) -> SessionName {
     SessionName::new(format!("team-{team_name}"))
 }
 
+///
 /// 0.3.28 layout step 1: pub re-export of `spec_session_name` for the new
 /// `layout::sessions::worker_session_name` to delegate to. Single underlying
 /// impl; this just widens visibility without duplicating logic.
@@ -370,6 +341,7 @@ pub(super) fn spec_agents(spec: &Value) -> Vec<AgentId> {
         .collect()
 }
 
+///
 /// Bug 1 (0.4.2): expose spec agent id set so the restart path can filter
 /// state.agents to only the agents currently defined in the rebuilt spec.
 /// Returns a `BTreeSet<String>` for O(log n) membership checks.

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

@@ -1,3 +1,4 @@
+//!
 use std::collections::{BTreeMap, BTreeSet};
 use std::path::{Path, PathBuf};
 use std::process::Command;

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

@@ -1,3 +1,4 @@
+//!
 //! lifecycle::launch —— 冷启 / quick-start / 危险审批探测 + add/fork / plan 起步与推进。
 
 use std::collections::{BTreeMap, BTreeSet};
@@ -17,6 +18,7 @@ use super::*;
 
 // ── lifecycle::launch —— 冷启 / quick-start / 危险审批探测 ──────────────────
 
+///
 /// `launch(spec_path, dry_run, auto_approve, skip_profile_smoke)`(`launch/core.py:29`)。
 /// 冷启全队:路由 tasks、resolve 权限/危险审批门、session 冲突检查(冲突 →
 /// `SessionConflict` 拒绝不 kill)、按 startup 顺序起每个 worker、捕获 session、开显示、
@@ -40,7 +42,7 @@ pub fn launch(
     )
 }
 
-pub fn launch_with_transport(
+pub(crate) fn launch_with_transport(
     spec_path: &Path,
     dry_run: bool,
     auto_approve: bool,
@@ -186,10 +188,9 @@ pub fn launch_with_transport_in_workspace(
 }
 
 mod plan;
-pub use plan::{handle_report_result, start_plan};
+pub(crate) use plan::{handle_report_result, start_plan};
 
 pub mod spawn;
-pub use spawn::SpawnPhase;
 pub(super) use spawn::*;
 
 mod layout;
@@ -247,10 +248,10 @@ pub(crate) use identity::{
 
 mod quick_start;
 pub(super) use quick_start::*;
-pub use quick_start::{
-    quick_start, quick_start_in_workspace, quick_start_in_workspace_with_display,
-    quick_start_in_workspace_with_display_and_backend, quick_start_with_transport,
-    quick_start_with_transport_in_workspace, quick_start_with_transport_in_workspace_with_display,
+pub use quick_start::{quick_start, quick_start_in_workspace_with_display_and_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;
@@ -263,7 +264,6 @@ pub(crate) use quick_start_transport::{
 
 pub mod readiness;
 pub(crate) use readiness::launched_team_receiver_is_attached;
-pub use readiness::ReadinessPhase;
 pub(super) use readiness::*;
 
 mod approval;
@@ -276,9 +276,8 @@ use approval::{
 
 mod add_agent;
 pub(super) use add_agent::*;
-pub use add_agent::{
-    add_agent, add_agent_force, add_agent_with_transport, add_agent_with_transport_force,
-};
+pub use add_agent::{add_agent, add_agent_force};
+pub(crate) use add_agent::{add_agent_with_transport, add_agent_with_transport_force};
 
 mod add_agent_state;
 pub(crate) use add_agent_state::inject_agent_into_spec;
@@ -320,4 +319,4 @@ use spec_state::{
     spec_agent_values, spec_agents, spec_default_assignee, spec_routes, spec_session_name,
     spec_tasks_json, team_workspace, write_launch_permission_audit, yaml_value_to_json,
 };
-pub use spec_state::{worker_session_name_pub, SpecStatePhase};
+pub use spec_state::worker_session_name_pub;

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

@@ -1,3 +1,4 @@
+//!
 //! step 13 · lifecycle — team 进程级生命周期编排器(ROUND-0.5 骨架)。
 //!
 //! 真相源 `team-agent-public` @ v0.2.11 (439bef8),只读。Card:
@@ -67,7 +68,7 @@ pub use display::*;
 pub use launch::*;
 pub use restart::*;
 
-pub use helpers::save_team_runtime_snapshot;
+pub(crate) use helpers::save_team_runtime_snapshot;
 pub(crate) use helpers::{plan_lock_path, plan_state_path, read_plan_state, save_plan_state};
 
 #[cfg(test)]

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

@@ -42,7 +42,7 @@ pub fn start_agent(
 /// `start_agent` with an injected transport — wires the single-worker resume/fresh spawn +
 /// start_coordinator (rt-host-a sweep: was a stub returning RequirementUnmet at the spawn boundary).
 #[allow(clippy::too_many_arguments)]
-pub fn start_agent_with_transport(
+pub(crate) fn start_agent_with_transport(
     workspace: &Path,
     agent_id: &AgentId,
     force: bool,
@@ -801,7 +801,7 @@ pub fn stop_agent(
     )
 }
 
-pub fn stop_agent_with_transport(
+pub(crate) fn stop_agent_with_transport(
     workspace: &Path,
     agent_id: &AgentId,
     team: Option<&str>,
@@ -1249,7 +1249,7 @@ pub fn reset_agent(
     )
 }
 
-pub fn reset_agent_with_transport(
+pub(crate) fn reset_agent_with_transport(
     workspace: &Path,
     agent_id: &AgentId,
     discard_session: bool,

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

@@ -4,7 +4,7 @@ use super::*;
 
 /// `halt_plan(workspace, plan_id, reason)`(`orchestrator/__init__.py:152`)。停 plan;
 /// 非 running → 幂等返回。
-pub fn halt_plan(
+pub(crate) fn halt_plan(
     workspace: &Path,
     plan_id: &PlanId,
     reason: &str,
@@ -26,7 +26,7 @@ pub fn halt_plan(
 }
 
 /// `plan_status(workspace, plan_id)`(`orchestrator/__init__.py:177`)。读 plan 持久态。
-pub fn plan_status(workspace: &Path, plan_id: &PlanId) -> Result<PlanState, LifecycleError> {
+pub(crate) fn plan_status(workspace: &Path, plan_id: &PlanId) -> Result<PlanState, LifecycleError> {
     let path = plan_state_path(workspace, plan_id);
     if !path.exists() {
         return Err(LifecycleError::InvalidPlan(format!(

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

@@ -109,7 +109,7 @@ fn resolve_restart_context(
 /// `restart` with an injected transport (tests: recording mock; prod: real TmuxBackend). The Route-B
 /// resume/fresh worker spawn + start_coordinator are wired here over `transport`. (rt-host-a sweep:
 /// was a stub returning RequirementUnmet at the spawn boundary — never spawned/resumed/started coordinator.)
-pub fn restart_with_transport(
+pub(crate) fn restart_with_transport(
     workspace: &Path,
     allow_fresh: bool,
     team: Option<&str>,
@@ -118,7 +118,7 @@ pub fn restart_with_transport(
     restart_with_transport_with_readiness_deadline(workspace, allow_fresh, team, transport, None)
 }
 
-pub fn restart_with_transport_with_readiness_deadline(
+pub(crate) fn restart_with_transport_with_readiness_deadline(
     workspace: &Path,
     allow_fresh: bool,
     team: Option<&str>,
@@ -158,7 +158,7 @@ pub fn restart_with_transport_with_readiness_deadline(
     }
 }
 
-pub fn restart_with_transport_with_session_convergence_deadline(
+pub(crate) fn restart_with_transport_with_session_convergence_deadline(
     workspace: &Path,
     allow_fresh: bool,
     team: Option<&str>,
@@ -1224,6 +1224,14 @@ fn restart_with_selected_team_and_transport(
     // restoring the worker→leader delivery path. Failure is non-fatal — the
     // user can still run `team-agent attach-leader` manually.
     try_autobind_leader_after_restart(&selected.run_workspace, Some(&selected.team_key), &state);
+    if let Ok(probe) = crate::lifecycle::display::probe_display_capabilities(&selected.run_workspace)
+    {
+        let _ = crate::lifecycle::display::rebuild_adaptive_display_after_rebind(
+            &selected.run_workspace,
+            &session_name,
+            &probe,
+        );
+    }
     // 0.3.28 Step 1: topology invariant guard (warn-only). Same pattern as
     // `lifecycle::launch::launch_with_transport_in_workspace` — logs to stderr,
     // never panics. Hard error path is deferred to Step 10.
@@ -3062,7 +3070,7 @@ fn write_restart_resume_decision_event(
 
 /// `restart_candidates(workspace)`(`restart/selection.py:12`)。从 snapshot + active
 /// state 收集可重启 team。
-pub fn restart_candidates(workspace: &Path) -> Result<Vec<RestartCandidate>, LifecycleError> {
+pub(crate) fn restart_candidates(workspace: &Path) -> Result<Vec<RestartCandidate>, LifecycleError> {
     let state = crate::state::persist::load_runtime_state(workspace)
         .map_err(|e| LifecycleError::StatePersist(e.to_string()))?;
     let alive = crate::state::projection::team_state_candidates(&state);
@@ -3084,7 +3092,7 @@ pub fn restart_candidates(workspace: &Path) -> Result<Vec<RestartCandidate>, Lif
 
 /// `select_restart_state(workspace, team)`(`restart/selection.py:49`)。按 `--team` 或
 /// 唯一性选一个;歧义/未找到 → `TeamSelect`。
-pub fn select_restart_state(
+pub(crate) fn select_restart_state(
     workspace: &Path,
     team: Option<&str>,
 ) -> Result<RestartCandidate, LifecycleError> {

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

@@ -35,7 +35,7 @@ pub fn remove_agent(
     )
 }
 
-pub fn remove_agent_with_transport(
+pub(crate) fn remove_agent_with_transport(
     workspace: &Path,
     agent_id: &AgentId,
     from_spec: bool,

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

@@ -37,7 +37,7 @@ pub(crate) fn resumable_provider_requires_backing(provider: &str) -> bool {
 
 /// `first_send_at` 严格分类(`_classify_first_send_at`,`orchestration.py:399`)。
 /// **绝不靠 truthiness**:`""`/`0`/`False`/`"null"`/非 ISO → `Corrupt`。
-pub fn classify_first_send_at(raw: &serde_json::Value) -> FirstSendAtState {
+pub(crate) fn classify_first_send_at(raw: &serde_json::Value) -> FirstSendAtState {
     match raw {
         serde_json::Value::Null => FirstSendAtState::Absent,
         serde_json::Value::String(s) => {
@@ -159,7 +159,7 @@ fn normalize_iso_separator(raw: &str) -> String {
 /// `0/123→"int"`、`false→"bool"`、`[]→"list"`、`{}→"dict"`、float→`"float"`。
 /// **绝不**用 Rust 的 `"null"/"string"/"number"/"boolean"/"array"/"object"`(serde 名)—— 必须是
 /// Python 名,否则 audit payload 与真相源不一致。
-pub fn python_type_name(value: &serde_json::Value) -> &'static str {
+pub(crate) fn python_type_name(value: &serde_json::Value) -> &'static str {
     match value {
         serde_json::Value::Null => "NoneType",
         serde_json::Value::String(_) => "str",
@@ -186,7 +186,7 @@ pub fn python_type_name(value: &serde_json::Value) -> &'static str {
 ///     进 `unresumable`。
 /// restart() **先**调它再 teardown;corrupt 非空 → `RefusedInvalidFirstSendAt`,unresumable
 /// 非空且 !allow_fresh → `RefusedResumeAtomicity`。**refuse 早于一切 teardown,nothing created**。
-pub fn classify_restart_plan(
+pub(crate) fn classify_restart_plan(
     state: &serde_json::Value,
     allow_fresh: bool,
 ) -> Result<RestartPlan, LifecycleError> {

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

@@ -1,3 +1,4 @@
+//!
 //! lifecycle::restart —— 单 worker 起/停/重置/删 + 整队 Route B 重建 + plan halt/status。
 
 use std::collections::BTreeMap;
@@ -60,9 +61,9 @@ pub(crate) use agent::start_agent_at_paths;
 // this to replace a stuck provider process without going through the
 // public start-agent CLI path.
 pub(crate) use agent::start_agent_at_paths_for_recovery;
-pub use agent::{
-    reset_agent, reset_agent_with_transport, start_agent, start_agent_with_transport, stop_agent,
-    stop_agent_with_transport,
+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,
 };
 pub(crate) use common::refresh_missing_provider_sessions;
 pub(crate) use common::restart_required_missing_session_agent_ids;
@@ -71,7 +72,7 @@ pub(crate) use common::session_identity_probe_for_agent;
 // `lifecycle::launch::add_agent` / `fork_agent` so all three (restart / add / fork)
 // route to the SAME tmux socket the live team uses.
 pub(crate) use common::lifecycle_worker_tmux_backend_for_selected_state;
-pub use orchestrator::{halt_plan, plan_status};
+pub(crate) use orchestrator::{halt_plan, plan_status};
 pub(crate) use rebuild::restart_with_transport_with_session_convergence_deadline;
 // 0.5.38 (`.team/artifacts/startup-latency-locate.md` §5): expose the phase
 // timer + worker timing writer so `lifecycle::launch::launch_with_transport_in_workspace`
@@ -79,14 +80,15 @@ pub(crate) use rebuild::restart_with_transport_with_session_convergence_deadline
 pub(crate) use rebuild::{
     provider_wire_from_state, write_worker_spawn_timing_event, RestartPhaseTimer,
 };
-pub use rebuild::{
-    restart, restart_candidates, restart_with_session_convergence_deadline, restart_with_transport,
-    restart_with_transport_with_readiness_deadline, select_restart_state,
-};
-pub use remove::{remove_agent, remove_agent_flag_requirements, remove_agent_with_transport};
-pub use selection::{
-    classify_first_send_at, classify_restart_plan, decide_start_mode, python_type_name,
+pub use rebuild::{restart, restart_with_session_convergence_deadline};
+pub(crate) use rebuild::{
+    restart_candidates, restart_with_transport, restart_with_transport_with_readiness_deadline,
+    select_restart_state,
 };
+pub use remove::{remove_agent, remove_agent_flag_requirements};
+pub(crate) use remove::remove_agent_with_transport;
+pub(crate) use selection::{classify_first_send_at, classify_restart_plan, python_type_name};
+pub use selection::decide_start_mode;
 // Layer 2 (leader follow-up 2026-06-22): test-visible workspace-aware
 // classification so lifecycle/tests/restart.rs can exercise the
 // SessionBackingStoreMissing + checked_paths + RecoveryHint path