@team-agent/installer 0.5.48 → 0.5.49

package/Cargo.lock

@@ -575,7 +575,7 @@ dependencies = [
 
 [[package]]
 name = "team-agent"
-version = "0.5.48"
+version = "0.5.49"
 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.48"
+version = "0.5.49"
 license = "AGPL-3.0"
 rust-version = "1.95"
 

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

@@ -472,7 +472,10 @@ pub(crate) fn parse_leader_target_workspace_and_team(
     let target_workspace = resolve_workspace(sender_workspace, parsed.workspace.as_deref())?;
     match parsed.target {
         ParsedTarget::TeamEntity { team, entity } if entity == "leader" => {
-            Ok(Some((target_workspace, team)))
+            let state = load_state_checked(&target_workspace)?;
+            let canonical = canonical_named_team_key(&target_workspace, &state, &team)
+                .unwrap_or(team);
+            Ok(Some((target_workspace, canonical)))
         }
         _ => Ok(None),
     }
@@ -607,23 +610,30 @@ fn resolve_in_workspace(
         ParsedTarget::BareAgent(agent) => {
             resolve_bare_agent(sender_workspace, target_workspace, state, agent, transport)
         }
-        ParsedTarget::TeamEntity { team, entity } if entity == "leader" => resolve_leader(
-            sender_workspace,
-            target_workspace,
-            state,
-            team,
-            parsed,
-            transport,
-        ),
-        ParsedTarget::TeamEntity { team, entity } => resolve_worker(
-            sender_workspace,
-            target_workspace,
-            state,
-            team,
-            entity,
-            parsed,
-            transport,
-        ),
+        ParsedTarget::TeamEntity { team, entity } => {
+            let canonical = canonical_named_team_key(target_workspace, state, team)
+                .unwrap_or_else(|| team.clone());
+            if entity == "leader" {
+                resolve_leader(
+                    sender_workspace,
+                    target_workspace,
+                    state,
+                    &canonical,
+                    parsed,
+                    transport,
+                )
+            } else {
+                resolve_worker(
+                    sender_workspace,
+                    target_workspace,
+                    state,
+                    &canonical,
+                    entity,
+                    parsed,
+                    transport,
+                )
+            }
+        }
         ParsedTarget::SessionWindow { session, window } => resolve_session_window(
             sender_workspace,
             target_workspace,
@@ -1149,8 +1159,10 @@ fn transport_for_cli_target(
     parsed: &ParsedNamedAddress,
 ) -> Box<dyn Transport> {
     if let ParsedTarget::TeamEntity { team, entity } = &parsed.target {
+        let canonical = canonical_named_team_key(target_workspace, state, team)
+            .unwrap_or_else(|| team.clone());
         if entity == "leader" {
-            let team_scoped_socket = team_entry(state, team)
+            let team_scoped_socket = team_entry(state, &canonical)
                 .and_then(|entry| entry.get("leader_receiver"))
                 .and_then(|receiver| string_field(receiver, "tmux_socket"));
             let socket = team_scoped_socket.map(str::to_string).or_else(|| {
@@ -1164,7 +1176,7 @@ fn transport_for_cli_target(
                 return Box::new(crate::tmux_backend::TmuxBackend::for_tmux_endpoint(&socket));
             }
         }
-        if let Some(entry) = team_entry(state, team) {
+        if let Some(entry) = team_entry(state, &canonical) {
             let selected = crate::tmux_backend::tmux_backend_for_runtime_state_or_workspace(
                 target_workspace,
                 Some(entry),
@@ -1247,6 +1259,30 @@ fn team_entry<'a>(state: &'a Value, team: &str) -> Option<&'a Value> {
         .and_then(|teams| teams.get(team))
 }
 
+fn canonical_named_team_key(
+    target_workspace: &Path,
+    state: &Value,
+    requested: &str,
+) -> Option<String> {
+    if team_entry(state, requested).is_some() || is_legacy_single_team_active(state, requested) {
+        return Some(requested.to_string());
+    }
+    let selected = crate::state::projection::select_runtime_state(
+        target_workspace,
+        Some(requested),
+    )
+    .ok()?;
+    let canonical = selected
+        .get("active_team_key")
+        .and_then(Value::as_str)
+        .filter(|team| !team.is_empty())?;
+    state
+        .get("teams")
+        .and_then(Value::as_object)
+        .is_some_and(|teams| teams.contains_key(canonical))
+        .then(|| canonical.to_string())
+}
+
 /// E6 (0.5.9 offline-mailbox-toname-design §3.1): decide which
 /// `leader_receiver` object, if any, applies to `<team>/leader` before any
 /// downstream code reads it. Wrong runtime keys are rejected here with

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

@@ -144,9 +144,10 @@ pub fn cmd_send(args: &SendArgs) -> Result<CmdResult, CliError> {
     )?;
     let target = send_target(args.targets.as_deref(), args.target.as_deref());
     let mut opts = send_options_from_args(args);
-    if opts.team.is_none() {
-        opts.team = Some(TeamKey::new(selected.team_key.clone()));
-    }
+    // `args.team` is a selector and may be a legacy session/team-dir alias.
+    // All downstream membership and DB scope must use the canonical key that
+    // resolve_active_team returned, never the original selector spelling.
+    opts.team = Some(TeamKey::new(selected.team_key.clone()));
     let content = args.message.join(" ");
     // CR-061/N27 routing-ambiguous: a single positional with no `--to`/`--targets` and an
     // empty message body is a prompt-only invocation (`team-agent send "fix the build"`).

package/crates/team-agent/src/cli/tests/named_address.rs

@@ -222,6 +222,29 @@ fn resolve_name_team_disambiguated() {
     let _ = std::fs::remove_dir_all(&ws);
 }
 
+#[test]
+fn resolve_qualified_name_canonicalizes_legacy_session_alias() {
+    let ws = named_ws("legacy-session-alias");
+    seed_state(
+        &ws,
+        state_with_teams(json!({
+            "teamdir": worker_team("team-displayname", "qa", "%1", "qa")
+        })),
+    );
+    let transport = OfflineTransport::new().with_targets(vec![pane(
+        "team-displayname",
+        "qa",
+        "%1",
+    )]);
+
+    let resolved = resolve_name_with_transport(&ws, "displayname/qa", &transport)
+        .expect("qualified legacy alias must resolve through the canonical selector");
+    assert_eq!(resolved.team_key.as_deref(), Some("teamdir"));
+    assert_eq!(resolved.agent_id.as_deref(), Some("qa"));
+    assert_eq!(resolved.pane_id, "%1");
+    let _ = std::fs::remove_dir_all(&ws);
+}
+
 #[test]
 fn resolve_name_stale_pane() {
     let ws = named_ws("stale-pane");

package/crates/team-agent/src/cli/tests/run_delegation.rs

@@ -230,7 +230,7 @@ fn cli_quick_start_invokes_real_lifecycle_compiles_spec() {
     };
     let _ = cmd_quick_start(&args); // real quick_start compiles the spec before any coordinator/launch step
                                     // E5: spec compiled to .team/runtime/<team_key>/, NOT the user team dir.
-    let team_key = team.file_name().unwrap().to_string_lossy().to_string();
+    let team_key = "clidelegteam";
     let workspace = crate::model::paths::team_workspace(&team).unwrap();
     let runtime_spec = crate::model::paths::runtime_spec_path(&workspace, &team_key);
     assert!(

package/crates/team-agent/src/cli/tests/status_send.rs

@@ -706,6 +706,48 @@ fn cmd_send_failed_outcome_yields_error_exit() {
     }
 }
 
+#[test]
+fn cmd_send_canonicalizes_legacy_session_alias_before_membership_projection() {
+    let ws = deleg_uniq_dir("send-team-alias");
+    let _ = crate::message_store::MessageStore::open(&ws).unwrap();
+    crate::state::persist::save_runtime_state(
+        &ws,
+        &json!({
+            "active_team_key": "teamdir",
+            "team_key": "teamdir",
+            "teams": {
+                "teamdir": {
+                    "status": "alive",
+                    "session_name": "team-displayname",
+                    "agents": {"w1": {"provider": "codex", "status": "running"}}
+                }
+            }
+        }),
+    )
+    .unwrap();
+    let args = SendArgs {
+        workspace: ws,
+        target: Some("w1".into()),
+        team: Some("displayname".into()),
+        task: None,
+        no_wait: true,
+        watch_result: false,
+        json: true,
+        ..send_args_fixture()
+    };
+
+    let result = cmd_send(&args).expect("alias selection should reach canonical team send");
+    let value = match result.output {
+        CmdOutput::Json(value) => value,
+        other => panic!("expected JSON send outcome, got {other:?}"),
+    };
+    assert_ne!(
+        value.get("reason").and_then(serde_json::Value::as_str),
+        Some("target_not_in_team"),
+        "selector accepted the alias, so membership must use its canonical team key: {value}"
+    );
+}
+
 // ═══════════════════════════════════════════════════════════════════════════
 // coordinator.ok — non-compact status carries the FULL coordinator_health (incl. `ok`); compact
 // strips to {status,pid,metadata_ok,schema_ok} (golden queries.py:77 + compact.py:35; ok =

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

@@ -3167,10 +3167,18 @@ pub fn quick_start_with_transport_in_workspace_with_display(
     if !open_display {
         override_spec_display_backend(&mut spec, "none");
     }
-    let requested_team = quick_start_requested_team_key(team_id, name)
-        .map(str::to_string)
-        .or_else(|| spec_team_id(&spec));
     let explicit_team_key = quick_start_requested_team_key(team_id, name).map(str::to_string);
+    let canonical_team_key = explicit_team_key
+        .clone()
+        .or_else(|| spec_team_id(&spec).filter(|team| !team.is_empty()))
+        .unwrap_or_else(|| {
+            runtime_team_key_for_spec(
+                &agents_dir.join("team.spec.yaml"),
+                &spec,
+                &spec_session_name(&spec),
+            )
+        });
+    let requested_team = Some(canonical_team_key.clone());
     let team_depth = quick_start_depth_guard(
         &workspace,
         agents_dir,
@@ -3248,14 +3256,12 @@ pub fn quick_start_with_transport_in_workspace_with_display(
     // spec's runtime.session_name with one derived from the REQUESTED team identity
     // so launch_with_transport (which reads runtime.session_name) spawns into an
     // isolated session per requested team.
-    if let Some(requested) = requested_team.as_deref() {
+    if let Some(requested) = explicit_team_key.as_deref() {
         override_spec_session_name(&mut spec, &format!("team-{requested}"));
     }
     let session_name = spec_session_name(&spec);
-    // team_key 身份源 = team_dir(agents_dir).name(角色定义目录),不依赖 spec 落点。
-    let state_team_key = explicit_team_key.clone().unwrap_or_else(|| {
-        runtime_team_key_for_spec(&agents_dir.join("team.spec.yaml"), &spec, &session_name)
-    });
+    // team_key 已在入口由显式 id/name 或 compiled spec identity 单次确定。
+    let state_team_key = canonical_team_key;
     warn_ignored_owner_team_id(workspace.as_path(), agents_dir, &state_team_key);
     // E5 spec 迁移:spec 写到 .team/runtime/<team_key>/(中间产物,绝不落用户目录 agents_dir)。
     // Bug2:原子写(tmp+rename),避免半截 spec。
@@ -3265,7 +3271,13 @@ pub fn quick_start_with_transport_in_workspace_with_display(
         .map_err(|e| LifecycleError::StatePersist(e.to_string()))?;
     let resolved_spec_path =
         std::fs::canonicalize(&spec_path).unwrap_or_else(|_| spec_path.clone());
-    let mut state = initial_runtime_state(&spec, &resolved_spec_path, &workspace, agents_dir);
+    let mut state = initial_runtime_state(
+        &spec,
+        &resolved_spec_path,
+        &workspace,
+        agents_dir,
+        &state_team_key,
+    );
     // 0.5.x Phase 1d hot-path 接线(裁决1 msg_76e1d98202b8): use the
     // generic annotator that writes `state.transport = { kind, source }`
     // for every backend AND (for tmux) preserves the existing
@@ -5104,6 +5116,7 @@ fn initial_runtime_state(
     spec_path: &Path,
     workspace: &Path,
     team_dir: &Path,
+    team_key: &str,
 ) -> serde_json::Value {
     let mut agents = serde_json::Map::new();
     for agent in spec_agent_values(spec) {
@@ -5145,6 +5158,7 @@ fn initial_runtime_state(
         "team_dir".to_string(),
         serde_json::json!(team_dir.to_string_lossy().to_string()),
     );
+    state.insert("team_key".to_string(), serde_json::json!(team_key));
     state.insert(
         "session_name".to_string(),
         serde_json::json!(spec_session_name(spec).as_str()),

package/crates/team-agent/src/lifecycle/tests/launch_spawn.rs

@@ -80,11 +80,10 @@ fn layout_pane(
 }
 
 /// E5 spec 迁移:spec 不再落 team_dir,而在 <team_workspace>/.team/runtime/<team_key>/。
-/// team_key = team_dir.name(quick_start_team_dir → "teamdir");workspace = team_workspace(team)。
+/// quick-start 未显式指定 id 时,team_key 来自 compiled TEAM.md name(`quickteam`)。
 pub(super) fn quick_start_runtime_spec_path(team: &std::path::Path) -> PathBuf {
     let workspace = crate::model::paths::team_workspace(team).unwrap();
-    let team_key = team.file_name().unwrap().to_string_lossy().to_string();
-    crate::model::paths::runtime_spec_path(&workspace, &team_key)
+    crate::model::paths::runtime_spec_path(&workspace, "quickteam")
 }
 
 /// 在 team 自身或其 team_workspace 父下找 .team/runtime/*/team.spec.yaml。run_workspace 解析
@@ -172,6 +171,26 @@ fn quick_start_compiles_real_spec_to_team_spec_yaml() {
     }
 }
 
+#[test]
+fn quick_start_without_team_id_uses_compiled_team_name_as_canonical_key() {
+    let team = quick_start_team_dir(QS_VALID_ROLE);
+    let workspace = crate::model::paths::team_workspace(&team).unwrap();
+    let transport = OfflineTransport::new();
+
+    let result = quick_start_with_transport(&team, None, true, None, &transport);
+    assert!(result.is_ok(), "quick-start fixture must run: {result:?}");
+
+    let state = crate::state::persist::load_runtime_state(&workspace).unwrap();
+    assert_eq!(state["active_team_key"], json!("quickteam"));
+    assert_eq!(state["team_key"], json!("quickteam"));
+    assert!(state["teams"].get("quickteam").is_some(), "{state}");
+    assert!(state["teams"].get("teamdir").is_none(), "{state}");
+    assert!(
+        crate::model::paths::runtime_spec_path(&workspace, "quickteam").exists(),
+        "runtime spec must share the canonical key"
+    );
+}
+
 #[test]
 fn quick_start_teamdir_under_dot_team_uses_project_workspace_for_status_and_collect() {
     let workspace = temp_ws();
@@ -215,8 +234,8 @@ fn quick_start_teamdir_under_dot_team_uses_project_workspace_for_status_and_coll
             "input={}",
             input.display()
         );
-        // E5: selector resolves spec_path to .team/runtime/<team_key>/ (team_key="current").
-        let expected_spec = crate::model::paths::runtime_spec_path(&workspace, "current");
+        // E5: selector resolves spec_path to .team/runtime/<canonical team_key>/.
+        let expected_spec = crate::model::paths::runtime_spec_path(&workspace, "quickteam");
         assert_eq!(
             selected
                 .spec_path
@@ -1319,7 +1338,7 @@ fn quick_start_persists_selected_tmux_endpoint_and_attach_commands() {
     assert_eq!(state["tmux_socket"], json!(endpoint));
     assert_eq!(state["is_external_leader"], json!(false));
     assert_eq!(
-        state["teams"]["teamdir"]["is_external_leader"],
+        state["teams"]["quickteam"]["is_external_leader"],
         json!(false)
     );
 }
@@ -2876,7 +2895,7 @@ fn quick_start_seeds_tasks_key_from_compiled_spec() {
 }
 
 // Stage A — golden launch/core.py:62-71 seeded top-level runtime state in insertion order:
-// spec_path, workspace, team_dir, session_name, leader, agents, tasks, display_backend.
+// spec_path, workspace, team_dir, team_key, session_name, leader, agents, tasks, display_backend.
 //
 // OLD (Python parity): the top-level shape ended at `display_backend`.
 // NEW (Bug 1/2 — team-in-team state scope, see tests/team_in_team_state_scope_red.rs):
@@ -2889,9 +2908,9 @@ fn quick_start_seeds_tasks_key_from_compiled_spec() {
 //   The post-launch hook drops the top-level owner triple when the launched pane is
 //   unbound (empty pane_id), and only the per-team entry retains the binding.
 //   R1: topology is explicit; fresh managed teams carry `is_external_leader=false`
-//   before the team-in-team suffix. Order remains the golden prefix
-//   (spec_path … display_backend) + topology marker + new suffix (active_team_key,
-//   teams). display_backend stays the resolved backend from display/backend.py:12-29
+//   before the team-in-team suffix. Canonical `team_key` is seeded before owner
+//   binding; the remaining order stays the golden prefix + topology marker + new
+//   suffix (active_team_key, teams). display_backend stays the resolved backend from display/backend.py:12-29
 //   (default adaptive), not the raw optional spec field.
 #[test]
 #[serial(env)]
@@ -2924,6 +2943,9 @@ fn quick_start_state_seeds_spec_path_workspace_leader_display_backend() {
             "spec_path",
             "workspace",
             "team_dir",
+            // Seed canonical identity before owner binding so the initial
+            // receiver is written under the same team key as the saved state.
+            "team_key",
             "session_name",
             "leader",
             "agents",
@@ -2937,17 +2959,12 @@ fn quick_start_state_seeds_spec_path_workspace_leader_display_backend() {
             // field); source is `"unknown"` until Phase 2 threads
             // `ResolvedTransport.source` through the launch call site.
             "transport",
-            // 0.4.0 refactor: `team_key` added as top-level topology marker
-            // alongside active_team_key (refactor-modular-architecture). The
-            // owner / leader_receiver / owner_epoch invariants below still
-            // hold — those live only under teams[<active_team_key>].
-            "team_key",
             "active_team_key",
             "teams",
         ],
         "state.json top-level key order must match golden launch/core.py:62-71 \
          plus R1 topology marker and Bug 1/2 team-in-team suffix \
-         (is_external_leader, team_key, active_team_key, teams). \
+         (is_external_leader, active_team_key, teams). \
          Bug 2 owner team-scope (N1/N12/N18/N29) deliberately keeps owner / \
          leader_receiver / owner_epoch OFF the top level — they live ONLY under \
          teams[<active_team_key>] so per-team isolation has a single source of \

package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs

@@ -451,7 +451,7 @@ fn team_dir_with_roles(role_docs: &[(&str, &str)]) -> PathBuf {
     std::fs::create_dir_all(team.join("agents")).unwrap();
     std::fs::write(
         team.join("TEAM.md"),
-        "---\nname: phaseb\nobjective: Phase B.\nprovider: codex\n---\n\nPhase B team.\n",
+        "---\nname: teamdir\nobjective: Phase B.\nprovider: codex\nsession_name: team-phaseb\n---\n\nPhase B team.\n",
     )
     .unwrap();
     for (file, role_doc) in role_docs {
@@ -536,7 +536,7 @@ fn add_fixture() -> (PathBuf, PathBuf, PathBuf, OfflineTransport) {
     quick_start_with_transport_in_workspace_with_display(
         &workspace,
         &team,
-        None,
+        Some("teamdir"),
         true,
         None,
         &launch_transport,

package/crates/team-agent/src/lifecycle/tests/phase_golden.rs

@@ -367,7 +367,7 @@ fn two_worker_team_dir(hermetic: &HermeticTestEnv) -> PathBuf {
     std::fs::create_dir_all(team.join("agents")).unwrap();
     std::fs::write(
         team.join("TEAM.md"),
-        "---\nname: phasegolden\nobjective: Phase golden.\nprovider: codex\n---\n\nPhase golden team.\n",
+        "---\nname: teamdir\nobjective: Phase golden.\nprovider: codex\nsession_name: team-phasegolden\n---\n\nPhase golden team.\n",
     )
     .unwrap();
     for id in ["w1", "w2"] {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-agent/installer",
-  "version": "0.5.48",
+  "version": "0.5.49",
   "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.48",
-    "@team-agent/cli-darwin-x64": "0.5.48",
-    "@team-agent/cli-linux-x64": "0.5.48"
+    "@team-agent/cli-darwin-arm64": "0.5.49",
+    "@team-agent/cli-darwin-x64": "0.5.49",
+    "@team-agent/cli-linux-x64": "0.5.49"
   },
   "scripts": {
     "postinstall": "node npm/bincheck.mjs",