@team-agent/installer 0.5.43 → 0.5.45

package/crates/team-agent/src/mcp_server/tools.rs

@@ -737,24 +737,83 @@ impl TeamOrchestratorTools {
         {
             return None;
         }
-        if let Ok(visible) = self.get_visible_peers() {
-            if visible.peers.iter().any(|peer| peer.as_str() == target) {
-                return None;
-            }
+        // 0.5.45 naming-addressing (design §3.6, RED-2 MCP): compute
+        // the visible peers ONCE and reuse for both exact-match check
+        // AND scope-safe candidate ranking. Peers come from
+        // `get_visible_peers()` (owner-team only) so sibling teams,
+        // host registry, and workspace reverse scans cannot leak.
+        let visible_peers: Vec<String> = self
+            .get_visible_peers()
+            .map(|visible| {
+                visible
+                    .peers
+                    .iter()
+                    .map(|peer| peer.as_str().to_string())
+                    .collect()
+            })
+            .unwrap_or_default();
+        if visible_peers.iter().any(|peer| peer == target) {
+            return None;
         }
-        let hint = "the requested peer is not part of your team; worker-origin MCP cannot widen team scope.";
+        let owner_team_key = owner_team
+            .as_ref()
+            .map(TeamKey::as_str)
+            .unwrap_or("")
+            .to_string();
+        // Rank the typo against owner-scope peers.
+        let ranked = {
+            use crate::model::name_similarity::{rank, Candidate};
+            let candidates: Vec<Candidate<String>> = visible_peers
+                .iter()
+                .map(|peer| Candidate {
+                    match_key: peer.clone(),
+                    stable_key: peer.clone(),
+                    payload: peer.clone(),
+                })
+                .collect();
+            rank(target, &candidates)
+        };
+        let candidate_values: Vec<Value> = ranked
+            .iter()
+            .map(|peer| {
+                serde_json::json!({
+                    "name": peer,
+                    "team_key": owner_team_key,
+                    "agent_id": peer,
+                    "advisory": true,
+                })
+            })
+            .collect();
+        let best = ranked.first().cloned();
+        let hint = if let Some(best) = best.as_deref() {
+            format!(
+                "the requested peer is not in your owner team; did you mean `{best}`?"
+            )
+        } else {
+            "the requested peer is not part of your team; worker-origin MCP cannot widen team scope.".to_string()
+        };
         let _ = EventLog::new(&self.workspace).write(
             "mcp.send_message_refused",
             serde_json::json!({
                 "reason": "peer_not_in_scope",
-                "sender_team_id": owner_team.as_ref().map(TeamKey::as_str).unwrap_or(""),
+                "sender_team_id": owner_team_key,
                 "scope": "team",
-                "hint": hint
+                "hint": hint,
             }),
         );
         let mut extra = serde_json::Map::new();
         extra.insert("status".to_string(), Value::String("refused".to_string()));
-        extra.insert("hint".to_string(), Value::String(hint.to_string()));
+        extra.insert("hint".to_string(), Value::String(hint.clone()));
+        // 0.5.45 naming-addressing (design §3.6, RED-2 MCP): additive
+        // scope-safe suggestions inside the existing ToolError.extra
+        // JSON envelope — no struct/schema change, no event log
+        // widening. Advisory only: `isError=true` and
+        // reason=peer_not_in_scope stay unchanged.
+        extra.insert("requested_name".to_string(), Value::String(target.clone()));
+        if let Some(best) = best {
+            extra.insert("suggested_name".to_string(), Value::String(best));
+        }
+        extra.insert("candidates".to_string(), Value::Array(candidate_values));
         Some(ToolError {
             reason: ToolErrorReason::PeerNotInScope,
             exc_type: "PeerNotInScope".to_string(),

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

@@ -12,6 +12,12 @@
 pub mod enums;
 pub mod errors;
 pub mod ids;
+// 0.5.45 naming-addressing (design §3.2/§4.1): shared pure name
+// similarity ranking helper. crate-private consumer set = cli/emit.rs
+// (subcommand hint), cli/named_address.rs (typo candidates),
+// cli/send.rs (positional adapter), mcp_server/tools.rs (owner-scoped
+// peer suggestions). Never a routing authority — advisory only.
+pub(crate) mod name_similarity;
 pub mod paths;
 pub mod permissions;
 pub mod routing;

package/crates/team-agent/src/model/name_similarity.rs

@@ -0,0 +1,266 @@
+//! 0.5.45 naming-addressing (design §3.2/§4.1) — shared pure name
+//! similarity ranking helper.
+//!
+//! **Pure**: no filesystem reads, no state loads, no terminal
+//! multiplexer calls, no message dispatch. The RED-6 governance guard
+//! scans this file for the forbidden import tokens and rejects any
+//! occurrence.
+//!
+//! **Single source of truth for name-similarity ranking**: consumed by
+//!   - `cli/emit.rs::nearest_subcommand` (unknown top-level subcommand hint),
+//!   - `cli/named_address.rs` (bare/`--to-name` typo candidates),
+//!   - `cli/send.rs` positional adapter (unknown short id in selected team),
+//!   - `mcp_server/tools.rs` owner-scoped peer suggestions.
+//!
+//! **Never a routing authority**: the returned ranking is *advisory
+//! only*. Callers must still exit 1 / `isError=true` / refuse the
+//! request on their original reason; the ranked payload only
+//! populates the additive `requested_name` / `suggested_name` /
+//! `candidates` fields that get echoed back to the user.
+//!
+//! Ranking rules (design §3.2, byte-locked by RED-6):
+//!   1. Comparison keys are trimmed and ASCII-lowercased.
+//!   2. Candidates whose `match_key` prefixes the request outrank
+//!      lower-distance non-prefix candidates.
+//!   3. Otherwise sort by Levenshtein distance.
+//!   4. Threshold widens with request length: `0..=3 → 1`, `4..=6 →
+//!      2`, longer → `3`. Nothing beyond the threshold is returned —
+//!      no "best guess for a far name".
+//!   5. Sort order: `prefix_miss` (bool), `distance`, `stable_key`.
+//!   6. Deduplicate on `stable_key`, then cap at 3 results.
+//!   7. Canonical spelling comes from the candidate `name` payload
+//!      (not the lowercased comparison key) so case is preserved.
+
+#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+
+use std::collections::BTreeSet;
+
+/// A candidate to rank. `T` is a caller-owned payload returned
+/// verbatim in the ranked output — callers use it to keep whatever
+/// side data (team_key, workspace, etc.) they need to reconstruct
+/// their advisory JSON envelope.
+#[derive(Debug, Clone)]
+pub struct Candidate<T> {
+    /// Comparison key. Callers pass the raw canonical name; this
+    /// function trims + lowercases before comparing.
+    pub match_key: String,
+    /// Stable tie-break key. Typically the same as `match_key`, but
+    /// callers with cross-team or cross-workspace candidates use a
+    /// composite (`team/agent`) so ordering is deterministic across
+    /// otherwise-tied entries.
+    pub stable_key: String,
+    /// Caller-owned payload returned verbatim.
+    pub payload: T,
+}
+
+/// Threshold for accepting a candidate given the request length.
+/// Byte-locked by RED-6: short requests get 1, medium 2, longer 3.
+fn threshold_for_len(len: usize) -> usize {
+    match len {
+        0..=3 => 1,
+        4..=6 => 2,
+        _ => 3,
+    }
+}
+
+/// Rank `candidates` against `request`. Returns up to 3 payloads,
+/// most-similar-first. `<request>` casing does not affect matching,
+/// only comparison; the caller-supplied payload (which carries the
+/// canonical `name`) is what surfaces to the user.
+///
+/// Empty return means "no acceptable candidate" — do NOT re-rank or
+/// synthesize a best-guess elsewhere.
+pub fn rank<T: Clone>(request: &str, candidates: &[Candidate<T>]) -> Vec<T> {
+    let request_key = normalize(request);
+    if request_key.is_empty() {
+        return Vec::new();
+    }
+    let threshold = threshold_for_len(request_key.chars().count());
+    let mut seen: BTreeSet<String> = BTreeSet::new();
+    let mut scored: Vec<(bool, usize, String, T)> = Vec::new();
+    for candidate in candidates {
+        if !seen.insert(candidate.stable_key.clone()) {
+            continue;
+        }
+        let match_key = normalize(&candidate.match_key);
+        if match_key.is_empty() {
+            continue;
+        }
+        let distance = levenshtein(&request_key, &match_key);
+        // Prefix hit means "request is a prefix of candidate" OR
+        // "candidate is a prefix of request" — either direction
+        // beats a same-distance edit anywhere in the middle.
+        let is_prefix = match_key.starts_with(&request_key) || request_key.starts_with(&match_key);
+        // Prefix candidates skip the distance threshold (a 1-char
+        // prefix miss with distance 5 is still a legitimate
+        // completion hint); non-prefix candidates must clear the
+        // threshold.
+        if !is_prefix && distance > threshold {
+            continue;
+        }
+        // Prefix-miss is the primary sort key; sorting bools puts
+        // false (prefix hit) before true (prefix miss).
+        scored.push((
+            !is_prefix,
+            distance,
+            candidate.stable_key.clone(),
+            candidate.payload.clone(),
+        ));
+    }
+    scored.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.cmp(&b.1)).then(a.2.cmp(&b.2)));
+    scored.into_iter().take(3).map(|(_, _, _, p)| p).collect()
+}
+
+/// Convenience wrapper for the common case where callers only need
+/// the single best canonical name (a `String`), not full payloads.
+/// Returns `None` when no candidate clears the threshold.
+pub fn best_name<'a, S: AsRef<str>>(request: &str, candidates: &'a [S]) -> Option<&'a str> {
+    let payloads: Vec<Candidate<&'a str>> = candidates
+        .iter()
+        .map(|c| {
+            let name = c.as_ref();
+            Candidate {
+                match_key: name.to_string(),
+                stable_key: name.to_string(),
+                payload: name,
+            }
+        })
+        .collect();
+    rank(request, &payloads).into_iter().next()
+}
+
+fn normalize(input: &str) -> String {
+    input.trim().to_ascii_lowercase()
+}
+
+/// Standard Levenshtein edit distance. Pure, no dependencies.
+/// Compared strings must already be normalized (trim + lowercase) by
+/// the caller (`rank` does this internally).
+pub fn levenshtein(a: &str, b: &str) -> usize {
+    let a: Vec<char> = a.chars().collect();
+    let b: Vec<char> = b.chars().collect();
+    let mut prev: Vec<usize> = (0..=b.len()).collect();
+    let mut curr = vec![0usize; b.len() + 1];
+    for (i, &ca) in a.iter().enumerate() {
+        curr[0] = i + 1;
+        for (j, &cb) in b.iter().enumerate() {
+            let cost = if ca == cb { 0 } else { 1 };
+            curr[j + 1] = (prev[j + 1] + 1).min(curr[j] + 1).min(prev[j] + cost);
+        }
+        std::mem::swap(&mut prev, &mut curr);
+    }
+    prev[b.len()]
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn c(name: &str) -> Candidate<String> {
+        Candidate {
+            match_key: name.to_string(),
+            stable_key: name.to_string(),
+            payload: name.to_string(),
+        }
+    }
+
+    #[test]
+    fn levenshtein_basic() {
+        assert_eq!(levenshtein("kitten", "sitting"), 3);
+        assert_eq!(levenshtein("", ""), 0);
+        assert_eq!(levenshtein("abc", "abc"), 0);
+        assert_eq!(levenshtein("abc", "abd"), 1);
+    }
+
+    #[test]
+    fn prefix_hit_beats_lower_distance_non_prefix() {
+        // "stat" is a prefix of "status" (distance 2) but "slat" is
+        // distance 1 (mid-word substitution). Prefix wins.
+        let out = rank("stat", &[c("slat"), c("status")]);
+        assert_eq!(out, vec!["status".to_string(), "slat".to_string()]);
+    }
+
+    #[test]
+    fn distance_orders_non_prefix() {
+        let out = rank("btea", &[c("bota"), c("beta")]);
+        assert_eq!(out[0], "beta"); // 1 edit
+        assert_eq!(out[1], "bota"); // 2 edits
+    }
+
+    #[test]
+    fn stable_key_decides_tie() {
+        // Both "beta" and "bota" are distance 2 from "bata".
+        let out = rank("bata", &[c("bota"), c("beta")]);
+        assert_eq!(out, vec!["beta".to_string(), "bota".to_string()]);
+    }
+
+    #[test]
+    fn caps_at_three() {
+        let out = rank("aaaa", &[c("aaab"), c("aaac"), c("aaad"), c("aaae")]);
+        assert_eq!(out.len(), 3);
+        assert_eq!(out, vec!["aaab", "aaac", "aaad"]);
+    }
+
+    #[test]
+    fn case_preserved_in_payload() {
+        // "BTEA" normalized matches "Beta" (distance 1); the
+        // canonical payload preserves original casing.
+        let out = rank("BTEA", &[c("Beta")]);
+        assert_eq!(out, vec!["Beta".to_string()]);
+    }
+
+    #[test]
+    fn far_request_returns_empty() {
+        let out = rank("zzzzzz", &[c("beta")]);
+        assert!(out.is_empty());
+    }
+
+    #[test]
+    fn threshold_widens_with_length() {
+        assert_eq!(threshold_for_len(0), 1);
+        assert_eq!(threshold_for_len(3), 1);
+        assert_eq!(threshold_for_len(4), 2);
+        assert_eq!(threshold_for_len(6), 2);
+        assert_eq!(threshold_for_len(7), 3);
+        assert_eq!(threshold_for_len(20), 3);
+    }
+
+    #[test]
+    fn empty_request_returns_empty() {
+        let out = rank("", &[c("beta")]);
+        assert!(out.is_empty());
+    }
+
+    #[test]
+    fn dedup_on_stable_key() {
+        let out = rank(
+            "beta",
+            &[
+                c("beta"),
+                Candidate {
+                    match_key: "beta".to_string(),
+                    stable_key: "beta".to_string(),
+                    payload: "beta-dup".to_string(),
+                },
+            ],
+        );
+        assert_eq!(out, vec!["beta".to_string()]);
+    }
+
+    #[test]
+    fn best_name_convenience() {
+        assert_eq!(best_name("btea", &["beta", "bota"]), Some("beta"));
+        assert_eq!(best_name("zzzzzz", &["beta"]), None);
+    }
+
+    #[test]
+    fn statu_still_maps_to_status() {
+        // Byte-lock the existing emit.rs behavior: `statu` → `status`
+        // with the shared helper.
+        let out = rank(
+            "statu",
+            &[c("status"), c("send"), c("start"), c("restart")],
+        );
+        assert_eq!(out[0], "status");
+    }
+}

package/crates/team-agent/src/platform/process.rs

@@ -99,6 +99,7 @@ mod unix_impl {
     //! `cli/mod.rs`, `coordinator/backoff.rs`, `mcp_server/wire.rs`,
     //! `lifecycle/restart/agent.rs`) with zero behavioral drift.
     use super::*;
+    use std::process::Command;
 
     pub fn current_parent_pid() -> Option<u32> {
         // Byte-equivalent to `mcp_server/wire.rs:319` and
@@ -150,8 +151,38 @@ mod unix_impl {
         Ok(Vec::new())
     }
 
-    pub fn process_tree(_root: u32) -> Result<Vec<u32>, io::Error> {
-        Ok(Vec::new())
+    pub fn process_tree(root: u32) -> Result<Vec<u32>, io::Error> {
+        let output = Command::new("ps").args(["-axo", "pid=,ppid="]).output()?;
+        if !output.status.success() {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "ps_parent exited unsuccessfully",
+            ));
+        }
+        let pairs = String::from_utf8_lossy(&output.stdout)
+            .lines()
+            .filter_map(|line| {
+                let mut parts = line.split_whitespace();
+                let pid = parts.next()?.parse::<u32>().ok()?;
+                let ppid = parts.next()?.parse::<u32>().ok()?;
+                Some((pid, ppid))
+            })
+            .collect::<Vec<_>>();
+        let mut out = Vec::new();
+        collect_child_pids(root, &pairs, &mut out);
+        out.push(root);
+        out.sort_unstable();
+        out.dedup();
+        Ok(out)
+    }
+
+    fn collect_child_pids(parent: u32, pairs: &[(u32, u32)], out: &mut Vec<u32>) {
+        for (pid, ppid) in pairs {
+            if *ppid == parent && !out.contains(pid) {
+                out.push(*pid);
+                collect_child_pids(*pid, pairs, out);
+            }
+        }
     }
 
     /// Send a SIGTERM (`TerminateGraceful`) or SIGKILL

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

@@ -1130,6 +1130,34 @@ pub fn load_runtime_state(workspace: &Path) -> Result<Value, StateError> {
     Ok(state)
 }
 
+pub(crate) fn load_runtime_state_without_migrations(workspace: &Path) -> Result<Value, StateError> {
+    let path = runtime_state_path(workspace);
+    if !path.exists() {
+        return Ok(
+            json!({"agents": {}, "tasks": [], "session_name": null, "active_team_key": null}),
+        );
+    }
+    let text = std::fs::read_to_string(&path)?;
+    let mut state: Value = serde_json::from_str(&text)?;
+    normalize_agent_session_state(&mut state);
+    Ok(state)
+}
+
+pub(crate) fn save_runtime_state_without_migrations(
+    workspace: &Path,
+    state: &Value,
+) -> Result<(), StateError> {
+    let path = runtime_state_path(workspace);
+    let _lock = RuntimeLock::acquire(workspace, "state-save-raw", 2.0)?;
+    if let Some(parent) = path.parent() {
+        std::fs::create_dir_all(parent)?;
+    }
+    let payload = serde_json::to_string_pretty(state)?;
+    std::fs::write(&path, payload.as_bytes())?;
+    cache_set(&path, state);
+    Ok(())
+}
+
 #[cfg(test)]
 mod tests {
     #![allow(clippy::unwrap_used, clippy::panic, clippy::expect_used)]

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

@@ -47,6 +47,7 @@ use super::persist::{
     save_runtime_state_with_lifecycle_topology_authority_and_capture_backfill_skip as helper_write_root_with_lifecycle_topology_authority_and_capture_backfill_skip,
     save_runtime_state_with_team_tombstone_lifecycle_topology_authority as helper_write_root_with_team_tombstone_lifecycle_topology_authority,
     save_runtime_state_with_team_tombstoned_agents as helper_write_root_with_team_tombstoned_agents,
+    save_runtime_state_without_migrations as helper_write_root_without_migrations,
 };
 use super::projection::{
     resolve_team_scoped_state as helper_resolve_team_scoped,
@@ -173,6 +174,9 @@ pub enum StateWriteIntent<'a> {
     ClaimLeader {
         team_key: &'a str,
     },
+    LeaderBindingRestoreNonTargetTeams {
+        target_team_key: &'a str,
+    },
     LeaderStartBinding {
         team_key: &'a str,
         transport_kind: &'a str,
@@ -325,6 +329,9 @@ fn route_direct(
         // scoped preserve-claim-fields variant at :1702 uses the team-tombstoned
         // agents helper.
         StateWriteIntent::ClaimLeader { .. } => helper_write_root(workspace, state),
+        StateWriteIntent::LeaderBindingRestoreNonTargetTeams { .. } => {
+            helper_write_root_without_migrations(workspace, state)
+        }
         // LeaderStartBinding -> managed/exec/external all root-save at
         // leader/start.rs:795/903/946.
         StateWriteIntent::LeaderStartBinding { .. } => helper_write_root(workspace, state),

package/crates/team-agent/src/topology.rs

@@ -457,6 +457,19 @@ fn session_exists_on_endpoint(endpoint: &str, session: &str) -> bool {
     session_exists_on_endpoint_checked(endpoint, session).unwrap_or(false)
 }
 
+pub(crate) fn team_session_ready_on_endpoint(endpoint: &str, session: &str) -> Option<bool> {
+    if endpoint.is_empty() || session.is_empty() {
+        return None;
+    }
+    let backend = crate::tmux_backend::TmuxBackend::for_tmux_endpoint(endpoint);
+    let targets = backend.list_targets().ok()?;
+    Some(
+        targets
+            .iter()
+            .any(|target| target.session.as_str() == session),
+    )
+}
+
 fn session_exists_on_endpoint_checked(endpoint: &str, session: &str) -> Option<bool> {
     crate::tmux_backend::TmuxBackend::for_tmux_endpoint(endpoint)
         .has_session(&SessionName::new(session.to_string()))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-agent/installer",
-  "version": "0.5.43",
+  "version": "0.5.45",
   "description": "npx installer for Team Agent",
   "keywords": [
     "codex",
@@ -20,9 +20,9 @@
     "team-agent-installer": "npm/install.mjs"
   },
   "optionalDependencies": {
-    "@team-agent/cli-darwin-arm64": "0.5.43",
-    "@team-agent/cli-darwin-x64": "0.5.43",
-    "@team-agent/cli-linux-x64": "0.5.43"
+    "@team-agent/cli-darwin-arm64": "0.5.45",
+    "@team-agent/cli-darwin-x64": "0.5.45",
+    "@team-agent/cli-linux-x64": "0.5.45"
   },
   "scripts": {
     "postinstall": "node npm/bincheck.mjs",