@team-agent/installer 0.5.48 → 0.5.50

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

@@ -153,7 +153,7 @@ pub(crate) struct CommandSpec {
 #[rustfmt::skip]
 pub(crate) const COMMAND_SPECS: &[CommandSpec] = &[
     CommandSpec { name: "quick-start", tier: CommandTier::Core, category: CommandCategory::Start, kind: CommandKind::Dispatch(DispatchKind::QuickStart), summary: "start or attach a team from TEAM.md", usage: "usage: team-agent quick-start [TEAMDIR] [--workspace WORKSPACE] [--name NAME] [--team-id TEAM|--team TEAM] [--yes] [--no-display] [--backend tmux|conpty] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, alias_of: None, sunset: None, action: None, governance: None },
-    CommandSpec { name: "send", tier: CommandTier::Core, category: CommandCategory::Daily, kind: CommandKind::Dispatch(DispatchKind::Send), summary: "send a message/task", usage: "usage: team-agent send TARGET MESSAGE... [--workspace WORKSPACE] [--team TEAM] [--targets AGENTS] [--to-name NAME | --to-name agent | --to-name team/agent | --to-name workspace::team/agent] [--pane PANE] [--task TASK] [--sender SENDER] [--watch-result] [--requires-ack|--no-ack] [--no-wait] [--timeout SECONDS] [--confirm-human] [--message-id ID] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, alias_of: None, sunset: None, action: None, governance: None },
+    CommandSpec { name: "send", tier: CommandTier::Core, category: CommandCategory::Daily, kind: CommandKind::Dispatch(DispatchKind::Send), summary: "persist a message for a logical recipient", usage: "usage: team-agent send TO MESSAGE... [--workspace WORKSPACE] [--team TEAM] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, alias_of: None, sunset: Some("next compatibility release"), action: Some("use positional logical TO and the returned message id"), governance: None },
     CommandSpec { name: "status", tier: CommandTier::Core, category: CommandCategory::Daily, kind: CommandKind::Dispatch(DispatchKind::Status), summary: "show current team status", usage: "usage: team-agent status [AGENT] [--workspace WORKSPACE] [--team TEAM] [--summary|--json] [--detail]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "collect", tier: CommandTier::Core, category: CommandCategory::Daily, kind: CommandKind::Dispatch(DispatchKind::Collect), summary: "collect reported results", usage: "usage: team-agent collect [--workspace WORKSPACE] [--team TEAM] [--result-file FILE] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::No, alias_of: None, sunset: None, action: None, governance: None },
     CommandSpec { name: "restart", tier: CommandTier::Core, category: CommandCategory::TeamLifecycle, kind: CommandKind::Dispatch(DispatchKind::Restart), summary: "restart the selected team", usage: "usage: team-agent restart [WORKSPACE] [--team TEAM] [--allow-fresh] [--session-converge-deadline SECONDS] [--json]", default_help: true, command_help: true, suggestion_index: true, token_usage: TokenUsage::Conditional, alias_of: None, sunset: None, action: None, governance: None },

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

@@ -41,7 +41,7 @@ fn cli_send_persists_real_message_row() {
         workspace: ws.clone(),
         team: None,
         task: None,
-        sender: "leader".to_string(),
+        sender: TrustedSender::leader(),
         no_ack: false,
         no_wait: true,
         watch_result: false,

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

@@ -149,7 +149,7 @@ fn named_send_args(
         workspace: ws.to_path_buf(),
         team: None,
         task: None,
-        sender: "leader".to_string(),
+        sender: TrustedSender::leader(),
         no_ack: false,
         no_wait: false,
         watch_result: false,
@@ -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");
@@ -436,7 +459,7 @@ fn resolve_app_server_leader_name_fails_closed_on_transport_conflict() {
 
 #[cfg(unix)]
 #[test]
-fn send_to_name_app_server_leader_submits_turn_without_tmux_pane() {
+fn send_to_name_app_server_leader_persists_before_async_delivery() {
     let ws = named_ws("appserver-leader-send");
     let fake = crate::app_server_test_support::FakeAppServer::start(
         "named-send",
@@ -461,11 +484,13 @@ fn send_to_name_app_server_leader_submits_turn_without_tmux_pane() {
     };
 
     assert_eq!(value["ok"], json!(true));
-    assert_eq!(value["transport_kind"], json!("codex_app_server"));
-    assert_eq!(fake.received_turns().len(), 1);
-    assert_eq!(
-        fake.received_turns()[0]["params"]["clientUserMessageId"],
-        value["message_id"]
+    let message_id = value["message_id"].as_str().expect("persisted message id");
+    assert!(message_id.starts_with("msg_"));
+    let store = crate::message_store::MessageStore::open(&ws).unwrap();
+    assert!(store.message_exists(message_id).unwrap());
+    assert!(
+        fake.received_turns().is_empty(),
+        "send returns after persistence; coordinator owns physical delivery"
     );
     let _ = std::fs::remove_dir_all(&ws);
 }

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

@@ -90,7 +90,7 @@ fn run_dispatches_status_to_handler_returns_ok() {
 
 #[test]
 fn run_dispatches_send_to_handler_returns_ok() {
-    // run([send w1 hello --sender leader --workspace <seeded>]) -> cmd_send -> messaging::send_message
+    // run([send w1 hello --workspace <seeded>]) -> cmd_send -> messaging::send_message
     // -> ok (w1 is an in-team agent) -> ExitCode::Ok. w1 must be seeded: golden refuses non-team targets.
     //
     // OLD seed: flat `{"agents": {"w1": ...}}`.
@@ -112,8 +112,6 @@ fn run_dispatches_send_to_handler_returns_ok() {
         "send".to_string(),
         "w1".to_string(),
         "hello".to_string(),
-        "--sender".to_string(),
-        "leader".to_string(),
         "--workspace".to_string(),
         ws.to_string_lossy().to_string(),
     ];
@@ -230,7 +228,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

@@ -460,7 +460,7 @@ fn send_args_fixture() -> SendArgs {
         workspace: PathBuf::from("."),
         team: Some("teamA".into()),
         task: Some("t-1".into()),
-        sender: "leader".into(),
+        sender: TrustedSender::leader(),
         no_ack: true,
         no_wait: true,
         watch_result: true,
@@ -515,7 +515,7 @@ fn send_options_negates_no_ack_and_no_wait_and_carries_watch() {
         "watch_result flag MUST pass through into SendOptions"
     );
     assert!(!opts.confirm_human);
-    assert_eq!(opts.sender, "leader");
+    assert_eq!(opts.sender.as_str(), "leader");
     assert_eq!(opts.timeout, 12.5);
 }
 
@@ -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 =
@@ -824,15 +866,8 @@ fn cmd_send_unknown_task_surfaces_golden_error_envelope_not_silent() {
     let _ = std::fs::remove_dir_all(&ws);
 }
 
-// P0 (b') — the SWALLOW guard: `run()` (the CLI process entry) MUST RENDER the send error, not
-// discard Err(CliError) via unwrap_or (advisor %7 root cause). Proxy: emit_cli_error WRITES a
-// `.team/logs/cli-error-*.log` (and prints the compact envelope) — if run() swallowed, neither
-// happens. So a cli-error log containing the BARE "unknown task id: <id>" (no "validation:" prefix)
-// + ExitCode::Error proves run() rendered. Drives the real argv→(exit,render) path.
-// OLD/NEW: same Bug 1/2 seed sync as cmd_send_unknown_task_*; the render-vs-swallow
-// behavior under test is unchanged.
 #[test]
-fn run_send_unknown_task_renders_error_not_silent_swallow() {
+fn run_send_legacy_task_flag_is_internalized_before_persistence() {
     let ws = std::env::temp_dir().join(format!(
         "ta-run-sendunk-{}-{}",
         std::process::id(),
@@ -864,30 +899,21 @@ fn run_send_unknown_task_renders_error_not_silent_swallow() {
     let code = run(&argv, &ws);
     assert_eq!(
         code,
-        ExitCode::Error,
-        "run(send --task <unknown>) must exit Error, not Ok"
-    );
-    // run() must have RENDERED (emit_cli_error wrote the cli-error log); a swallow leaves none.
-    let logs_dir = ws.join(".team").join("logs");
-    let mut found = String::new();
-    if let Ok(entries) = std::fs::read_dir(&logs_dir) {
-        for entry in entries.flatten() {
-            let name = entry.file_name().to_string_lossy().to_string();
-            if name.starts_with("cli-error-") {
-                found = std::fs::read_to_string(entry.path()).unwrap_or_default();
-                break;
-            }
-        }
-    }
-    assert!(
-        found.contains("unknown task id: t-unknown"),
-        "run() must RENDER the send error (cli-error log written with the bare message) — a silent \
-         swallow (unwrap_or discards Err) leaves no log. got log body: {found:?}"
-    );
-    assert!(
-        !found.contains("validation:"),
-        "rendered error must be the bare golden message, NO 'validation:' prefix; got {found:?}"
+        ExitCode::Ok,
+        "legacy --task is sunset-noticed and ignored; public send persists without caller binding"
     );
+    let connection = rusqlite::Connection::open(
+        ws.join(".team").join("runtime").join("team.db"),
+    )
+    .unwrap();
+    let task_id: Option<String> = connection
+        .query_row(
+            "SELECT task_id FROM messages WHERE content = 'go' ORDER BY rowid DESC LIMIT 1",
+            [],
+            |row| row.get(0),
+        )
+        .unwrap();
+    assert_eq!(task_id, None, "caller-supplied task ids must not reach storage");
     let _ = std::fs::remove_dir_all(&ws);
 }
 

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

@@ -312,7 +312,7 @@ pub struct SendArgs {
     pub workspace: PathBuf,
     pub team: Option<String>,
     pub task: Option<String>,
-    pub sender: String,
+    pub sender: TrustedSender,
     pub no_ack: bool,
     pub no_wait: bool,
     pub watch_result: bool,
@@ -323,16 +323,12 @@ pub struct SendArgs {
     /// When set, the store insert uses this id verbatim; a repeat with the same
     /// id returns a `Duplicate` refusal instead of creating a second row.
     pub message_id: Option<String>,
-    /// F1 (0.3.26): `--pane <pane_id>` — direct pane-id targeting. Mutually
-    /// exclusive with `target` / `targets`. When set, the message is injected
-    /// directly into the specified tmux pane via `transport.inject`, bypassing
-    /// the agent-name → pane-id resolution + team-membership check. This is
-    /// the **cross-team communication** primitive: the target pane does not
-    /// need to be in the sender's team.
+    /// Deprecated compatibility input. Public send refuses pane identity and
+    /// requires a logical recipient so persistence always precedes delivery.
     pub pane: Option<String>,
     /// `--to-name <name>` — stable named addressing. Mutually exclusive with
     /// `target` / `targets` / `--pane`; resolves workspace/team/agent or leader
-    /// name to the current live pane before using direct pane injection.
+    /// name before delegating to the persisted message primitive.
     pub to_name: Option<String>,
     /// E7 (0.5.9 host-leader-registry-design): `--to-leader NAME` resolves
     /// NAME through `~/.team-agent/leaders`, canonical-validates, and then

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

@@ -259,7 +259,7 @@ fn run_phase_golden(spec: PhaseGolden) -> Value {
         workspace: workspace.clone(),
         team: Some(spec.team_key.to_string()),
         task: None,
-        sender: "leader".to_string(),
+        sender: crate::messaging::TrustedSender::leader(),
         no_ack: true,
         no_wait: true,
         watch_result: false,
@@ -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/crates/team-agent/src/mcp_server/mod.rs

@@ -88,7 +88,7 @@ use crate::message_store::MessageStore;
 use crate::state::persist::{load_runtime_state, save_runtime_state};
 
 // ── REUSE: step 11 messaging delegate surface ───────────────────────────────
-use crate::messaging::{self, DeliveryOutcome, MessageTarget, SendOptions};
+use crate::messaging::{self, DeliveryOutcome, MessageTarget, SendOptions, TrustedSender};
 
 pub mod helpers;
 pub(crate) mod lifecycle_tools;

package/crates/team-agent/src/mcp_server/tests/send.rs

@@ -155,7 +155,6 @@ fn send_message_worker_recipient_returns_accepted_with_poll_hint() {
         None,
         None,
         None,
-        None,
     );
     match outcome {
         Ok(SendOutcome::WorkerAccepted {
@@ -185,7 +184,6 @@ fn ordinary_send_assign_shape_has_no_recovery_marker() {
             None,
             None,
             None,
-            None,
         )
         .expect("ordinary send ok")
         .to_value();
@@ -240,6 +238,22 @@ fn ordinary_send_assign_shape_has_no_recovery_marker() {
     );
 }
 
+#[test]
+fn send_message_without_framework_identity_fails_closed() {
+    let ws = seed_current_worker_state("missing-sender-identity");
+    let tools = TeamOrchestratorTools::with_identity(&ws, None, Some(TeamKey::new("current")));
+    let error = tools
+        .send_message(
+            &MessageTarget::Single("worker-1".to_string()),
+            "must not be attributed to unknown",
+            None,
+            None,
+            None,
+        )
+        .expect_err("missing framework identity must fail before persistence");
+    assert_eq!(error.reason, ToolErrorReason::McpScopeRefused);
+}
+
 #[test]
 fn recovery_assign_shape_has_structured_marker() {
     let ws = seed_current_worker_state("recovery-marker");
@@ -304,7 +318,6 @@ fn send_message_worker_recipient_surfaces_dead_coordinator_warning() {
             None,
             None,
             None,
-            None,
         )
         .expect("send returns degraded warning, not an MCP error");
     let v = outcome.to_value();
@@ -336,7 +349,6 @@ fn send_message_leader_recipient_is_direct_not_accepted() {
             None,
             None,
             None,
-            None,
         )
         .expect("leader send ok");
     assert!(
@@ -435,7 +447,6 @@ fn send_message_cross_team_peer_surfaces_peer_not_in_scope_error() {
             None,
             None,
             None,
-            None,
         )
         .expect_err("out-of-scope peer must be refused");
     assert_eq!(err.reason, ToolErrorReason::PeerNotInScope);

package/crates/team-agent/src/mcp_server/tests/wire.rs

@@ -66,6 +66,12 @@
         );
         assert_eq!(send["inputSchema"]["additionalProperties"], json!(false));
         assert_eq!(send["inputSchema"]["required"], json!(["to", "content"]));
+        for internal in ["sender", "task_id", "requires_ack"] {
+            assert!(
+                send["inputSchema"]["properties"].get(internal).is_none(),
+                "{internal} is framework-owned, not caller-supplied"
+            );
+        }
     }
 
     #[test]

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

@@ -17,7 +17,7 @@ use crate::state::persist::{
 };
 
 // ── REUSE: step 11 messaging delegate surface ───────────────────────────────
-use crate::messaging::{self, MessageTarget, SendOptions};
+use crate::messaging::{self, MessageTarget, SendOptions, TrustedSender};
 
 use super::helpers::{
     current_reportable_message_for, delivery_outcome_value, direct_message_attribution_for,
@@ -140,7 +140,6 @@ impl TeamOrchestratorTools {
             Some(task_id),
             None,
             None,
-            None,
         )?;
         let mut ok = compact_tool_result(&out.to_value())?;
         if recovery {
@@ -155,7 +154,7 @@ impl TeamOrchestratorTools {
     }
 
     /// `send_message` (`tools.py:135-183`): C14/C15/C17 scope resolution.
-    ///   - sender = explicit / `TEAM_AGENT_ID` env / `"unknown"` (no candidate scan).
+    ///   - sender = immutable `TEAM_AGENT_ID` captured when the MCP server starts.
     ///   - `requires_ack` defaults from target (`_requires_ack_for_target`).
     ///   - C23 cross-team pre-refusal ([`Self::refuse_cross_team_peer`]) before any
     ///     runtime call.
@@ -168,7 +167,6 @@ impl TeamOrchestratorTools {
         to: &MessageTarget,
         content: &str,
         task_id: Option<&str>,
-        sender: Option<&str>,
         requires_ack: Option<bool>,
         scope_override: Option<Scope>,
     ) -> Result<SendOutcome, ToolError> {
@@ -183,10 +181,14 @@ impl TeamOrchestratorTools {
         if let Some(err) = self.refuse_cross_team_peer(to, None) {
             return Err(err);
         }
-        let sender = sender
-            .and_then(non_empty_string)
-            .or_else(|| self.agent_id.as_ref().map(AgentId::as_str))
-            .unwrap_or("unknown");
+        let sender = self.agent_id.clone().ok_or_else(|| {
+            ToolError::new(
+                ToolErrorReason::McpScopeRefused,
+                "send_message requires framework-injected TEAM_AGENT_ID",
+                "IdentityError",
+            )
+        })?;
+        let sender = TrustedSender::from_runtime_identity(sender);
         let ack = requires_ack.unwrap_or_else(|| requires_ack_for_target(to));
         // C14/C15/C17 scope audit (#230 I-2/I-6 contract): emit mcp.scope_resolved
         // for every worker-origin send before any routing/delivery — the funnel
@@ -197,7 +199,7 @@ impl TeamOrchestratorTools {
                 "mcp.scope_resolved",
                 serde_json::json!({
                     "tool": "send_message",
-                    "sender": sender,
+                    "sender": sender.as_str(),
                     "owner_team_id": canonical_owner_team.as_ref().map(TeamKey::as_str),
                     "to": match to {
                         MessageTarget::Single(t) => serde_json::Value::String(t.clone()),
@@ -213,7 +215,7 @@ impl TeamOrchestratorTools {
         let opts = SendOptions {
             task_id: task_id.map(TaskId::new),
             route_task_id: true,
-            sender: sender.to_string(),
+            sender,
             requires_ack: ack,
             team: canonical_owner_team,
             ..SendOptions::default()