@team-agent/installer 0.4.11 → 0.5.1

package/crates/team-agent/src/state/owner_gate.rs

@@ -59,7 +59,10 @@ pub fn check_team_owner(
     if !owner.is_object() || owner.as_object().is_none_or(serde_json::Map::is_empty) {
         return None;
     }
-    let owner_uuid = owner.get("leader_session_uuid").and_then(Value::as_str).unwrap_or("");
+    let owner_uuid = owner
+        .get("leader_session_uuid")
+        .and_then(Value::as_str)
+        .unwrap_or("");
     let owner_pane = owner.get("pane_id").and_then(Value::as_str).unwrap_or("");
     let caller_uuid = caller.leader_session_uuid.as_str();
     let caller_pane = caller.pane_id.as_str();
@@ -178,7 +181,9 @@ fn lexical_abs(p: &Path) -> std::path::PathBuf {
     if p.is_absolute() {
         p.to_path_buf()
     } else {
-        std::env::current_dir().map(|cwd| cwd.join(p)).unwrap_or_else(|_| p.to_path_buf())
+        std::env::current_dir()
+            .map(|cwd| cwd.join(p))
+            .unwrap_or_else(|_| p.to_path_buf())
     }
 }
 
@@ -253,7 +258,9 @@ mod tests {
     #[test]
     fn no_owner_allows() {
         assert!(check_team_owner(&json!({}), &caller("%c", "u"), true, &LIVE).is_none());
-        assert!(check_team_owner(&json!({"team_owner": {}}), &caller("%c", "u"), true, &LIVE).is_none());
+        assert!(
+            check_team_owner(&json!({"team_owner": {}}), &caller("%c", "u"), true, &LIVE).is_none()
+        );
     }
 
     #[test]
@@ -298,15 +305,30 @@ mod tests {
     fn worker_bypass_rules() {
         let s = json!({"leader": {"id": "leader"}, "agents": {"worker_a": {}, "worker_b": {}}});
         // worker_a + env worker_a → 绕过。
-        assert_eq!(worker_sender_bypasses_owner_gate(&s, Some("worker_a"), Some("worker_a")), Some("worker_a".to_string()));
+        assert_eq!(
+            worker_sender_bypasses_owner_gate(&s, Some("worker_a"), Some("worker_a")),
+            Some("worker_a".to_string())
+        );
         // leader → 不绕过(走 owner 门)。
-        assert_eq!(worker_sender_bypasses_owner_gate(&s, Some("leader"), Some("leader")), None);
+        assert_eq!(
+            worker_sender_bypasses_owner_gate(&s, Some("leader"), Some("leader")),
+            None
+        );
         // 未注册 agent → 不绕过。
-        assert_eq!(worker_sender_bypasses_owner_gate(&s, Some("ghost"), Some("ghost")), None);
+        assert_eq!(
+            worker_sender_bypasses_owner_gate(&s, Some("ghost"), Some("ghost")),
+            None
+        );
         // sender/env 不一致(伪造)→ 不绕过。
-        assert_eq!(worker_sender_bypasses_owner_gate(&s, Some("worker_b"), Some("worker_a")), None);
+        assert_eq!(
+            worker_sender_bypasses_owner_gate(&s, Some("worker_b"), Some("worker_a")),
+            None
+        );
         // 无 env_agent_id + 已注册 → 绕过(返回 sender)。
-        assert_eq!(worker_sender_bypasses_owner_gate(&s, Some("worker_a"), None), Some("worker_a".to_string()));
+        assert_eq!(
+            worker_sender_bypasses_owner_gate(&s, Some("worker_a"), None),
+            Some("worker_a".to_string())
+        );
     }
 
     // §11 血泪:/tmp → /private/tmp 软链不对称(macOS 真机 bug)。两边 canonicalize → match。
@@ -319,7 +341,10 @@ mod tests {
         let raw = Path::new("/tmp").join(dir.file_name().unwrap());
         let private = Path::new("/private/tmp").join(dir.file_name().unwrap());
         if raw.exists() && private.exists() {
-            assert!(workspace_paths_match(&raw, &private), "/tmp 与 /private/tmp 应 canonicalize 相等");
+            assert!(
+                workspace_paths_match(&raw, &private),
+                "/tmp 与 /private/tmp 应 canonicalize 相等"
+            );
         }
         // 自反:同路径 match。
         assert!(workspace_paths_match(&dir, &dir));
@@ -333,7 +358,10 @@ mod tests {
         let repo_backup = base.join("repo-backup");
         std::fs::create_dir_all(&repo).unwrap();
         std::fs::create_dir_all(&repo_backup).unwrap();
-        assert!(!workspace_paths_match(&repo, &repo_backup), "共享前缀的兄弟目录不得 match");
+        assert!(
+            !workspace_paths_match(&repo, &repo_backup),
+            "共享前缀的兄弟目录不得 match"
+        );
         // 子目录也不 match(禁子串/反推)。
         let sub = repo.join("sub");
         std::fs::create_dir_all(&sub).unwrap();
@@ -359,15 +387,25 @@ mod tests {
         c.leader_session_uuid_source = "derived".to_string();
         let r = check_team_owner(&s, &c, true, &LIVE);
         assert!(r.is_some(), "两边空 uuid 不得 allow;必落拒绝");
-        assert_eq!(r.unwrap()["reason_kind"], json!("owner_takeover_required"), "非 sticky_bind(空 uuid 不算同)");
+        assert_eq!(
+            r.unwrap()["reason_kind"],
+            json!("owner_takeover_required"),
+            "非 sticky_bind(空 uuid 不算同)"
+        );
     }
 
     // 对抗 P2:owner pane liveness == Unknown 时,非 worker caller 也接管;worker 不接管。
     #[test]
     fn unknown_owner_pane_allows_nonworker_takeover() {
         let s = state_owned("%owner", "uuid-owner");
-        assert!(check_team_owner(&s, &caller("%new", "uuid-new"), false, &UNKNOWN).is_none(), "Unknown owner pane + 非 worker → 接管");
-        assert!(check_team_owner(&s, &caller("%new", "uuid-new"), true, &UNKNOWN).is_some(), "worker 即便 Unknown 也不接管");
+        assert!(
+            check_team_owner(&s, &caller("%new", "uuid-new"), false, &UNKNOWN).is_none(),
+            "Unknown owner pane + 非 worker → 接管"
+        );
+        assert!(
+            check_team_owner(&s, &caller("%new", "uuid-new"), true, &UNKNOWN).is_some(),
+            "worker 即便 Unknown 也不接管"
+        );
     }
 
     // 空 caller_pane + 异 uuid + 死 owner:死-owner 接管分支需 caller_pane 非空,故落拒绝。
@@ -375,7 +413,10 @@ mod tests {
     fn empty_caller_pane_diff_uuid_refuses_even_dead_owner() {
         let s = state_owned("%owner", "uuid-owner");
         let r = check_team_owner(&s, &caller("", "uuid-diff"), false, &DEAD);
-        assert!(r.is_some(), "空 caller_pane 不触发死-owner 接管;异 uuid → 拒绝");
+        assert!(
+            r.is_some(),
+            "空 caller_pane 不触发死-owner 接管;异 uuid → 拒绝"
+        );
     }
 
     // 对抗 P0-B(§11 血泪):父目录是软链 + 末段不存在 → realpath_like 解析父软链 → 判 own。
@@ -396,7 +437,10 @@ mod tests {
                 "父软链 + 缺失末段应判 own(realpath_like 解析父软链)"
             );
             // 不同末段仍不 match。
-            assert!(!workspace_paths_match(&link.join("ghostA"), &real.join("ghostB")));
+            assert!(!workspace_paths_match(
+                &link.join("ghostA"),
+                &real.join("ghostB")
+            ));
         }
     }
 

package/crates/team-agent/src/state/ownership.rs

@@ -164,13 +164,11 @@ pub fn write_owner(state: &mut Value, team_key: &str, record: OwnershipWrite) {
     }
     // Canonical teams.<key> write. Stage 5 will move this to a per-team
     // state file; the call sites do not change.
-    let teams = state
-        .as_object_mut()
-        .and_then(|root| {
-            root.entry("teams")
-                .or_insert_with(|| serde_json::json!({}))
-                .as_object_mut()
-        });
+    let teams = state.as_object_mut().and_then(|root| {
+        root.entry("teams")
+            .or_insert_with(|| serde_json::json!({}))
+            .as_object_mut()
+    });
     let Some(teams) = teams else { return };
     let entry = teams
         .entry(team_key.to_string())
@@ -402,7 +400,10 @@ mod tests {
         assert!(state.get("owner_epoch").is_none());
         assert!(state.get("leader_receiver").is_none());
         // Canonical teams.<key>: written.
-        assert_eq!(state["teams"]["alpha"]["team_owner"]["pane_id"], json!("%new"));
+        assert_eq!(
+            state["teams"]["alpha"]["team_owner"]["pane_id"],
+            json!("%new")
+        );
         assert_eq!(state["teams"]["alpha"]["owner_epoch"], json!(7));
         assert_eq!(
             state["teams"]["alpha"]["leader_receiver"]["pane_id"],
@@ -442,9 +443,9 @@ mod tests {
         write_owner(&mut state, "", record);
         assert_eq!(state["team_owner"]["pane_id"], json!("%top"));
         assert!(
-            state.get("teams").is_none_or(|teams| teams
-                .as_object()
-                .is_some_and(|map| map.is_empty())),
+            state
+                .get("teams")
+                .is_none_or(|teams| teams.as_object().is_some_and(|map| map.is_empty())),
             "empty team_key must NOT touch teams.<key>"
         );
     }

package/crates/team-agent/src/state/paths.rs

@@ -96,7 +96,10 @@ impl TeamRuntimePaths {
     }
 
     pub fn for_scope(scope: &TeamScope) -> Self {
-        Self::new(scope.workspace().to_path_buf(), scope.team_key().to_string())
+        Self::new(
+            scope.workspace().to_path_buf(),
+            scope.team_key().to_string(),
+        )
     }
 
     pub fn workspace(&self) -> &Path {
@@ -188,9 +191,7 @@ impl CommandScope {
         let alive = team_state_candidates(&state);
         match alive.len() {
             0 => Self::EmptyWorkspace,
-            1 => Self::Resolved(
-                alive.keys().next().cloned().unwrap_or_default(),
-            ),
+            1 => Self::Resolved(alive.keys().next().cloned().unwrap_or_default()),
             _ => {
                 let mut keys: Vec<String> = alive.keys().cloned().collect();
                 keys.sort();
@@ -241,7 +242,10 @@ mod tests {
     #[test]
     fn team_runtime_paths_layout_matches_existing_runtime_dir_layout() {
         let paths = TeamRuntimePaths::new(PathBuf::from("/ws/proj"), "alpha");
-        assert_eq!(paths.team_dir(), PathBuf::from("/ws/proj/.team/runtime/alpha"));
+        assert_eq!(
+            paths.team_dir(),
+            PathBuf::from("/ws/proj/.team/runtime/alpha")
+        );
         assert_eq!(
             paths.spec_path(),
             PathBuf::from("/ws/proj/.team/runtime/alpha/team.spec.yaml")
@@ -338,7 +342,10 @@ mod tests {
         .unwrap();
         let scope = CommandScope::resolve(&ws, None);
         assert!(scope.is_ambiguous());
-        assert_eq!(scope.candidates(), &["alpha".to_string(), "beta".to_string()]);
+        assert_eq!(
+            scope.candidates(),
+            &["alpha".to_string(), "beta".to_string()]
+        );
     }
 
     #[test]