@team-agent/installer 0.5.60 → 0.5.62

package/crates/team-agent/src/layout/tmux_endpoint.rs

@@ -1,3 +1,4 @@
+//!
 //! unit-9 (Stage 4) — tmux endpoint selection policy, separated from the
 //! concrete `TmuxBackend` execution layer.
 //!
@@ -55,6 +56,7 @@ pub struct TmuxEndpointSelection {
     pub source: TmuxEndpointSource,
 }
 
+///
 /// Pure policy: pick the tmux endpoint to use given a (maybe-present)
 /// `state.json` Value.
 ///
@@ -91,6 +93,7 @@ pub fn select_endpoint_from_state(state: Option<&Value>) -> Option<TmuxEndpointS
     None
 }
 
+///
 /// State-first endpoint selection with workspace fallback. Equivalent to
 /// what `tmux_backend_for_runtime_state_or_workspace` does internally,
 /// minus the backend construction.

package/crates/team-agent/src/layout/worker_env.rs

@@ -1,3 +1,4 @@
+//!
 //! 0.3.28 layout step 3 — worker spawn env (inherit-then-strip) + worker
 //! spawn cwd (YAML-only).
 //!
@@ -57,6 +58,7 @@ const WORKER_IDENTITY_EXACT: &[&str] = &["CLAUDECODE", "CLAUDE_EFFORT", "CODEX_T
 
 const WORKER_IDENTITY_PREFIXES: &[&str] = &["CLAUDE_CODE_"];
 
+///
 /// Build the worker spawn env per Python inherit-then-strip semantics.
 ///
 /// Inputs:
@@ -158,6 +160,7 @@ fn is_posix_shell_identifier(s: &str) -> bool {
     bytes.all(|b| b.is_ascii_alphanumeric() || b == b'_')
 }
 
+///
 /// Compute worker spawn cwd per Python semantics: YAML
 /// `agent.spawn_cwd` if set, else `workspace`. The persisted-state
 /// `agent.spawn_cwd` override (the pre-0.3.28 Rust extension that caused

package/crates/team-agent/src/layout/worker_window_helpers.rs

@@ -1,3 +1,4 @@
+//!
 //! 0.3.28 layout step 2 — small window grammar helper for layout-layer naming.
 //!
 //! Command/UI grammar, not provider identity parsing: leader window names
@@ -6,6 +7,7 @@
 
 use crate::model::enums::Provider;
 
+///
 /// Window name used inside the leader session. Mirrors
 /// Python's `leader_window_name = provider` (see
 /// `runtime/0.2.11/src/team_agent/leader/__init__.py:114-131`).

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

@@ -1,3 +1,4 @@
+//!
 //! leader 内部 helper —— provider/turn-state wire 串、JSON path 取值、rollout 读、
 //! workspace 路径归一 / session 文件夹消毒、uuid 前缀、时间戳、sha1。
 

package/crates/team-agent/src/leader/incident.rs

@@ -1,3 +1,4 @@
+//!
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum LeaderIncident {
     LeaderAttached,

package/crates/team-agent/src/leader/lease.rs

@@ -1,3 +1,4 @@
+//!
 //! leader::lease — attach / claim / autobind 统一 CAS 路径 + claim_lease_no_incident
 //! + 双写 / 分叉检测。
 
@@ -19,8 +20,8 @@ use crate::transport::{PaneId, PaneInfo, Transport};
 use super::helpers::{get_path_str, get_path_u64, now_ts, parse_provider};
 use super::owner_bind::leader_identity_context;
 use super::{
-    ClaimedVia, Discovery, LeaderError, LeaderReceiver, LeaseReason, LeaseResult, LeaseSource,
-    LeaseStatus, OwnerEpoch, ReceiverMode, ReceiverStatus, TeamOwner,
+    ClaimedVia, Discovery, LeaderError, LeaderIncident, LeaderReceiver, LeaseReason, LeaseResult,
+    LeaseSource, LeaseStatus, OwnerEpoch, ReceiverMode, ReceiverStatus, TeamOwner,
 };
 
 // ── leader::lease — attach / claim / takeover / autobind / readopt 统一 CAS 路径 ──
@@ -427,7 +428,7 @@ pub(crate) fn requeued_exhausted_watchers_event_payload(
 /// (cwd+command 宽松匹配);否则严格 UUID 门 + `try_readopt_leader_pane` 收敛到 lease claim。
 /// 返回 `(receiver, validation)`。
 #[allow(clippy::too_many_arguments)]
-pub fn attach_leader_to_state(
+pub(crate) fn attach_leader_to_state(
     workspace: &Path,
     state: &mut Value,
     pane: Option<&PaneId>,
@@ -470,6 +471,14 @@ pub fn attach_leader_to_state(
             super::LeaderEvent::ReceiverAttached.name(),
             json!({"pane_id": pane_id.as_str(), "owner_epoch": next_epoch.0}),
         )?;
+        let team_id = TeamKey::new(crate::state::projection::team_state_key(state));
+        crate::messaging::watchers::recover_watchers_for_incident(
+            workspace,
+            event_log,
+            &team_id,
+            &pane_id,
+            LeaderIncident::LeaderAttached,
+        )?;
         return Ok((receiver, json!({"ok": true})));
     }
     write_lease_dual_state(workspace, state)?;
@@ -477,24 +486,17 @@ pub fn attach_leader_to_state(
         super::LeaderEvent::ReceiverAttached.name(),
         json!({"pane_id": pane_id.as_str(), "owner_epoch": epoch.0}),
     )?;
+    let team_id = TeamKey::new(crate::state::projection::team_state_key(state));
+    crate::messaging::watchers::recover_watchers_for_incident(
+        workspace,
+        event_log,
+        &team_id,
+        &pane_id,
+        LeaderIncident::LeaderAttached,
+    )?;
     Ok((receiver, json!({"ok": true})))
 }
 
-/// `autobind_leader_receiver_from_env`(card §44;`__init__.py:880`)。进程启动/restart 时从
-/// `$TMUX_PANE` 自动绑定;`$TMUX_PANE` 缺 → `Ok(None)`;异常写 `autobind_skipped` 返 `Ok(None)`。
-/// 持 `LEADER_OWNERSHIP_LOCK`(lease mutation 不能与 takeover/claim/attach/send 交错)。
-pub fn autobind_leader_receiver_from_env(
-    workspace: &Path,
-    provider: Provider,
-    source: LeaseSource,
-) -> Result<Option<LeaderReceiver>, LeaderError> {
-    let _ = (workspace, provider, source);
-    if std::env::var_os("TMUX_PANE").is_none() {
-        return Ok(None);
-    }
-    Ok(None)
-}
-
 /// `claim_leader`(card §45;`__init__.py:744`)。`team-agent claim-leader` 入口。
 /// 有 ambiguous incident → 多候选 broadcast-claim 流;否则 `claim_lease_no_incident` 直接 acquire/CAS。
 /// 持 `LEADER_OWNERSHIP_LOCK`。
@@ -605,9 +607,12 @@ pub fn claim_leader(
     )?;
     if result.ok {
         if let Some(pane) = result.bound_pane_id.as_ref() {
-            let store = MessageStore::open(workspace)?;
-            crate::messaging::watchers::requeue_after_claim_leader(
-                workspace, &store, &event_log, &team_id, pane, None,
+            crate::messaging::watchers::recover_watchers_for_incident(
+                workspace,
+                &event_log,
+                &team_id,
+                pane,
+                LeaderIncident::LeaderClaimed,
             )?;
         }
     }
@@ -618,7 +623,7 @@ pub fn claim_leader(
 /// 直接 acquire/CAS against live evidence。precheck epoch + caller 资格门 + confirm 门 +
 /// **锁内 revalidate(TOCTOU C3/C15)** + 双写 + 审计。
 #[allow(clippy::too_many_arguments)]
-pub fn claim_lease_no_incident(
+pub(crate) fn claim_lease_no_incident(
     workspace: &Path,
     state: &mut Value,
     team: Option<&str>,

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

@@ -1,3 +1,4 @@
+//!
 //! step 10 · leader — ownership lease / leader-session binding / idle-takeover wiring
 //! (ROUND-0 SKELETON: types + fn/method SURFACE only, all bodies `unimplemented!()`).
 //!
@@ -10,7 +11,7 @@
 //!   - `leader_binding.py` (183) — Family A positive-source owner binding
 //!     (`bind_owner_from_caller_pane` / `derive_leader_session_uuid` / `emit_owner_bound_event`).
 //!   - `idle_takeover.py` (facade re-export) / `idle_takeover_wiring.py`
-//!     (`build_idle_nodes` / `push_idle_reminder`) / `wake.py`
+//!     (`build_idle_nodes`) / `wake.py`
 //!     (`should_reread` / `on_file_changed` / `take_pending`).
 //!   - `messaging/leader_panes.py` (`_leader_command_looks_usable` /
 //!     provider attribution / `_target_leader_session_uuid`).
@@ -77,7 +78,6 @@ use crate::state::StateError;
 // ── submodules(by responsibility) ──────────────────────────────────────────
 mod helpers;
 pub mod incident;
-pub mod inject;
 pub mod lease;
 pub mod owner_bind;
 pub mod provider_attribution;
@@ -89,7 +89,6 @@ pub mod types;
 
 // ── RE-EXPORT INVARIANT:每个先前 root-visible 项原路径不变 ────────────────────
 pub use incident::*;
-pub use inject::*;
 pub use lease::*;
 pub use owner_bind::*;
 pub(crate) use provider_attribution::*;

package/crates/team-agent/src/leader/owner_bind.rs

@@ -1,5 +1,6 @@
-//! leader::owner_bind — Family A 正源 owner 绑定(bind_owner_from_caller_pane / emit_owner_bound_event)
-//! + leader 身份上下文派生(override / state / derive)。
+//!
+//! leader::owner_bind — Family A 正源 owner 绑定 + leader 身份上下文派生
+//! (override / state / derive)。
 
 use std::path::Path;
 
@@ -153,6 +154,7 @@ pub fn bind_owner_from_caller_pane(
         &machine_fingerprint,
         &os_user,
     )?;
+    let derived_leader_session_uuid = identity.leader_session_uuid.clone();
     let owner = TeamOwner {
         pane_id: PaneId::new(pane.clone()),
         provider,
@@ -163,6 +165,14 @@ pub fn bind_owner_from_caller_pane(
         claimed_via: ClaimedVia::ClaimLeader,
         os_user: Some(os_user),
     };
+    emit_owner_bound_event(
+        workspace,
+        &PaneId::new(pane.clone()),
+        &caller_current_command,
+        &derived_leader_session_uuid,
+        team_id,
+        None,
+    )?;
     Ok(OwnerBindResult {
         ok: true,
         owner: Some(owner),
@@ -176,7 +186,7 @@ pub fn bind_owner_from_caller_pane(
 
 /// `emit_owner_bound_event`(`leader_binding.py:162`)。成功绑定后的审计 hook
 /// (`owner.bound_from_caller_pane`;只写 uuid 短前缀,不泄全 uuid)。
-pub fn emit_owner_bound_event(
+fn emit_owner_bound_event(
     workspace: &Path,
     caller_pane_id: &PaneId,
     caller_current_command: &str,

package/crates/team-agent/src/leader/provider_attribution.rs

@@ -1,3 +1,4 @@
+//!
 //! Positive provider attribution for leader panes.
 
 use std::collections::BTreeMap;

package/crates/team-agent/src/leader/rediscover.rs

@@ -1,3 +1,4 @@
+//!
 //! leader::rediscover — attach-leader readopt and leader receiver rediscovery.
 
 use std::collections::BTreeMap;
@@ -129,21 +130,7 @@ pub fn try_readopt_leader_pane(
     )))
 }
 
-/// `_rediscover_leader_receiver`: scan live targets and repair the receiver when
-/// exactly one usable pane matches the recorded owner identity.
-pub fn rediscover_leader_receiver(
-    workspace: &Path,
-    state: &mut Value,
-    transport: &dyn Transport,
-    event_log: &crate::event_log::EventLog,
-) -> Result<Value, LeaderError> {
-    let identity = OwnerIdentity::from_state(workspace, state)?;
-    rediscover_leader_receiver_with_identity(
-        workspace, state, transport, event_log, &identity, None,
-    )
-}
-
-pub fn rediscover_leader_receiver_with_owner_identity(
+fn rediscover_leader_receiver_with_owner_identity(
     workspace: &Path,
     state: &mut Value,
     transport: &dyn Transport,
@@ -204,7 +191,7 @@ fn rediscover_leader_receiver_with_identity(
     )
 }
 
-pub fn rediscover_leader_receiver_from_targets(
+fn rediscover_leader_receiver_from_targets(
     workspace: &Path,
     state: &mut Value,
     targets: &[PaneInfo],
@@ -216,7 +203,7 @@ pub fn rediscover_leader_receiver_from_targets(
     )
 }
 
-pub fn rediscover_leader_receiver_from_targets_with_owner_identity(
+pub(super) fn rediscover_leader_receiver_from_targets_with_owner_identity(
     workspace: &Path,
     state: &mut Value,
     targets: &[PaneInfo],

package/crates/team-agent/src/leader/registry.rs

@@ -1,3 +1,4 @@
+//!
 //! Phase-DX E7 (0.5.9 host-leader-registry-design): file-per-leader discovery index.
 //!
 //! Location: `~/.team-agent/leaders/<workspace_hash>__<team_key>.json`.
@@ -147,7 +148,7 @@ pub fn workspace_hash(workspace: &Path) -> String {
 /// Compute the discovery-visible short label for a workspace path —
 /// basename by default, "workspace" when the path has no name component.
 #[must_use]
-pub fn workspace_short(workspace: &Path) -> String {
+fn workspace_short(workspace: &Path) -> String {
     workspace
         .file_name()
         .and_then(|s| s.to_str())
@@ -338,7 +339,7 @@ pub fn unregister_entry(workspace: &Path, team_key: &str) -> Option<PathBuf> {
 /// registry is a derived discovery index and unreadable files are the
 /// "STALE / UNREADABLE" dirty class rather than an error.
 #[must_use]
-pub fn read_all_entries() -> Vec<(PathBuf, LeaderRegistryEntry)> {
+fn read_all_entries() -> Vec<(PathBuf, LeaderRegistryEntry)> {
     let Some(dir) = registry_dir() else {
         return Vec::new();
     };
@@ -440,19 +441,6 @@ fn tmux_pane_live(socket: &str, pane_id: &str) -> bool {
     }
 }
 
-/// Return the canonical state's `leader_receiver` value for the entry's
-/// team, if one exists. Send/leaders paths use this so they never route
-/// through a stale registry channel — canonical state is the truth.
-#[must_use]
-pub fn canonical_receiver(entry: &LeaderRegistryEntry) -> Option<serde_json::Value> {
-    let state = crate::state::persist::load_runtime_state(&entry.workspace).ok()?;
-    let team = state
-        .get("teams")
-        .and_then(|v| v.as_object())
-        .and_then(|teams| teams.get(&entry.team_key))?;
-    team.get("leader_receiver").cloned()
-}
-
 /// Read all entries, classify each, and prune terminal-stale entries
 /// (`workspace_no_state`, `team_key_not_found`). Live entries are never
 /// touched. Returns the surviving (LIVE + STALE-not-yet-pruned) entries