@team-agent/installer 0.2.11 → 0.3.0

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

@@ -0,0 +1,244 @@
+    #[test]
+    fn result_status_alias_chain() {
+        // None / unknown → Success
+        assert_eq!(normalize_result_status(None), ResultStatus::Success);
+        assert_eq!(normalize_result_status(Some("weird")), ResultStatus::Success);
+        // ok/done/complete/completed/passed/pass → success
+        for a in ["ok", "DONE", "complete", "completed", "passed", "pass"] {
+            assert_eq!(normalize_result_status(Some(a)), ResultStatus::Success, "alias {a}");
+        }
+        assert_eq!(normalize_result_status(Some("blocked")), ResultStatus::Blocked);
+        assert_eq!(normalize_result_status(Some("block")), ResultStatus::Blocked);
+        assert_eq!(normalize_result_status(Some("failed")), ResultStatus::Failed);
+        assert_eq!(normalize_result_status(Some("fail")), ResultStatus::Failed);
+        assert_eq!(normalize_result_status(Some("error")), ResultStatus::Failed);
+        assert_eq!(normalize_result_status(Some("partial")), ResultStatus::Partial);
+        assert_eq!(normalize_result_status(Some("partially_done")), ResultStatus::Partial);
+        // case/space/hyphen fold: "  Partially-Done " → partial
+        assert_eq!(normalize_result_status(Some("  Partially-Done ")), ResultStatus::Partial);
+    }
+
+    // ════════════════════════════════════════════════════════════════════════
+    // normalize_change_kind — alias map + description keyword fallback (normalize.py:145)
+    // ════════════════════════════════════════════════════════════════════════
+    #[test]
+    fn change_kind_alias_and_keyword_inference() {
+        // None + empty desc → Modified (final fallback)
+        assert_eq!(normalize_change_kind(None, ""), ChangeKind::Modified);
+        // exact canonical passes through
+        assert_eq!(normalize_change_kind(Some("created"), "whatever"), ChangeKind::Created);
+        // alias map
+        assert_eq!(normalize_change_kind(Some("add"), ""), ChangeKind::Created);
+        assert_eq!(normalize_change_kind(Some("updated"), ""), ChangeKind::Modified);
+        // keyword inference from description when value absent
+        assert_eq!(normalize_change_kind(None, "created a new file"), ChangeKind::Created);
+        assert_eq!(normalize_change_kind(Some(""), "removed the thing"), ChangeKind::Deleted);
+        assert_eq!(normalize_change_kind(None, "verified output"), ChangeKind::Observed);
+        // unknown value + plain desc → Modified
+        assert_eq!(normalize_change_kind(Some("zzz"), "plain text"), ChangeKind::Modified);
+    }
+
+    // ════════════════════════════════════════════════════════════════════════
+    // normalize_test_status — alias + unknown→not_run (normalize.py:199)
+    // ════════════════════════════════════════════════════════════════════════
+    #[test]
+    fn test_status_alias_chain() {
+        assert_eq!(normalize_test_status(None), TestStatus::NotRun);
+        assert_eq!(normalize_test_status(Some("weird")), TestStatus::NotRun);
+        for a in ["pass", "OK", "success"] {
+            assert_eq!(normalize_test_status(Some(a)), TestStatus::Passed, "alias {a}");
+        }
+        assert_eq!(normalize_test_status(Some("fail")), TestStatus::Failed);
+        assert_eq!(normalize_test_status(Some("error")), TestStatus::Failed);
+        assert_eq!(normalize_test_status(Some("notrun")), TestStatus::NotRun);
+        assert_eq!(normalize_test_status(Some("skip")), TestStatus::Skipped);
+        assert_eq!(normalize_test_status(Some("passed")), TestStatus::Passed);
+    }
+
+    // ════════════════════════════════════════════════════════════════════════
+    // normalize_risk_severity — out-of-set → Low (normalize.py:226)
+    // ════════════════════════════════════════════════════════════════════════
+    #[test]
+    fn risk_severity_out_of_set_is_low() {
+        assert_eq!(normalize_risk_severity(None), RiskSeverity::Low);
+        assert_eq!(normalize_risk_severity(Some("CRITICAL")), RiskSeverity::Low);
+        assert_eq!(normalize_risk_severity(Some("low")), RiskSeverity::Low);
+        assert_eq!(normalize_risk_severity(Some("medium")), RiskSeverity::Medium);
+        assert_eq!(normalize_risk_severity(Some("high")), RiskSeverity::High);
+    }
+
+    // ════════════════════════════════════════════════════════════════════════
+    // normalize_report_envelope — fixed schema_version + manual/unknown fallbacks
+    // + child-list regularization (normalize.py:67)
+    // ════════════════════════════════════════════════════════════════════════
+    #[test]
+    fn report_envelope_empty_uses_fixed_fallbacks() {
+        let env = normalize_report_envelope(&json!({}));
+        assert_eq!(env.schema_version, "result_envelope_v1");
+        assert_eq!(env.task_id, TaskId::new("manual")); // bug-085: NOT None
+        assert_eq!(env.agent_id, AgentId::new("unknown"));
+        assert_eq!(env.status, ResultStatus::Success);
+        assert_eq!(env.summary, "completed"); // empty summary → "completed"
+        assert!(env.changes.is_empty());
+        assert!(env.tests.is_empty());
+        assert!(env.risks.is_empty());
+        assert!(env.artifacts.is_empty());
+        assert!(env.next_actions.is_empty());
+    }
+
+    #[test]
+    fn report_envelope_regularizes_children_and_blank_ids() {
+        // blank summary/task_id/agent_id collapse to fallbacks; status alias "done"→success;
+        // change uses file/action/summary aliases + keyword; bare test str → not_run.
+        let env = normalize_report_envelope(&json!({
+            "summary": "   ",
+            "status": "done",
+            "task_id": "  ",
+            "agent_id": "",
+            "changes": [{"file": "a.rs", "action": "add", "summary": "added a.rs"}],
+            "tests": ["cargo test"],
+        }));
+        assert_eq!(env.summary, "completed");
+        assert_eq!(env.task_id, TaskId::new("manual"));
+        assert_eq!(env.agent_id, AgentId::new("unknown"));
+        assert_eq!(env.status, ResultStatus::Success);
+        assert_eq!(env.changes.len(), 1);
+        assert_eq!(env.changes[0], NormalizedChange {
+            path: "a.rs".to_string(),
+            kind: ChangeKind::Created,        // "add" alias
+            description: "added a.rs".to_string(),
+        });
+        assert_eq!(env.tests.len(), 1);
+        assert_eq!(env.tests[0], NormalizedTest {
+            command: "cargo test".to_string(),
+            status: TestStatus::NotRun,       // bare string default
+            detail: None,
+        });
+    }
+
+    // ════════════════════════════════════════════════════════════════════════
+    // compact_tool_result — ok whitelist + INSERTION ORDER (preserve_order on)
+    // Golden: input {delivered_count,ok,message_id,status,to} (scrambled) emits
+    // keys in WHITELIST order: ok,status,message_id,to,delivered_count.
+    // ════════════════════════════════════════════════════════════════════════
+    #[test]
+    fn compact_ok_whitelist_drops_unknown_and_orders_by_whitelist() {
+        let r = json!({
+            "delivered_count": 5, "ok": true, "message_id": "mZ",
+            "status": "queued", "to": "x", "secret": "drop_me"
+        });
+        let ok = compact_tool_result(&r).expect("ok compaction");
+        let v = serde_json::to_value(&ok).unwrap();
+        // unknown key dropped
+        assert!(v.get("secret").is_none());
+        // WHITELIST order, not input order
+        assert_eq!(keys(&v), vec!["ok", "status", "message_id", "to", "delivered_count"]);
+        assert_eq!(s(&v), r#"{"ok":true,"status":"queued","message_id":"mZ","to":"x","delivered_count":5}"#);
+    }
+
+    #[test]
+    fn compact_ok_empty_yields_ok_true() {
+        // empty compaction → {"ok": true} (normalize.py:64)
+        let ok = compact_tool_result(&json!({})).expect("empty→ok:true");
+        assert_eq!(s(&serde_json::to_value(&ok).unwrap()), r#"{"ok":true}"#);
+    }
+
+    #[test]
+    fn compact_error_whitelist_and_order() {
+        // Python `_compact_tool_result` (normalize.py:6-31) does NOT synthesize a
+        // _tool_error_result for an ok:false delegate dict — it passes the delegate's
+        // OWN string reason/error/status THROUGH the error whitelist, in WHITELIST
+        // ORDER, and returns a plain dict that still carries ok:false. So the Rust
+        // seam is `Ok(ToolOk)` with ok:false inside (NOT Err(ToolError): the closed
+        // ToolErrorReason enum has no "r" variant and cannot byte-faithfully carry an
+        // arbitrary delegate reason). The isError flag is derived later from the
+        // body's ok:false in handle_mcp, not from this compactor.
+        //
+        // Golden (re-probed v0.2.11):
+        //   _compact_tool_result({"error":"e","ok":false,"message_id":"m",
+        //                         "reason":"r","status":"failed"})
+        //   == {"ok":false,"status":"failed","reason":"r","error":"e","message_id":"m"}
+        //   keys (whitelist order): ok,status,reason,error,message_id
+        let r = json!({"error":"e","ok":false,"message_id":"m","reason":"r","status":"failed"});
+        let ok = compact_tool_result(&r)
+            .expect("error-path compaction is Ok(ToolOk{ok:false,...}), not Err — mirrors Python");
+        let v = serde_json::to_value(&ok).unwrap();
+        // ok:false is preserved INSIDE the body (the error whitelist begins with "ok").
+        assert_eq!(v.get("ok"), Some(&json!(false)));
+        assert_eq!(v.get("status"), Some(&json!("failed")));
+        assert_eq!(v.get("reason"), Some(&json!("r")));  // delegate string passed through
+        assert_eq!(v.get("error"), Some(&json!("e")));   // delegate string passed through
+        assert_eq!(v.get("message_id"), Some(&json!("m")));
+        // WHITELIST insertion order (preserve_order), not input order.
+        assert_eq!(keys(&v), vec!["ok", "status", "reason", "error", "message_id"]);
+        // full byte-stable string — the contract this module exists to lock.
+        assert_eq!(s(&v),
+            r#"{"ok":false,"status":"failed","reason":"r","error":"e","message_id":"m"}"#);
+    }
+
+    #[test]
+    fn compact_fanout_preserves_deliveries_and_recipients() {
+        // fanout_* status preserves deliveries/recipients APPENDED after whitelist keys.
+        let r = json!({
+            "ok": true, "status": "fanout_partial",
+            "deliveries": [1, 2], "recipients": ["a", "b"], "delivered_count": 1
+        });
+        let ok = compact_tool_result(&r).expect("fanout ok");
+        let v = serde_json::to_value(&ok).unwrap();
+        assert_eq!(keys(&v), vec!["ok", "status", "delivered_count", "deliveries", "recipients"]);
+        assert_eq!(s(&v),
+            r#"{"ok":true,"status":"fanout_partial","delivered_count":1,"deliveries":[1,2],"recipients":["a","b"]}"#);
+    }
+
+    #[test]
+    fn compact_acknowledged_messages_becomes_count() {
+        // acknowledged_messages list → acknowledged_count = len
+        let ok = compact_tool_result(&json!({
+            "ok": true, "status": "collected", "acknowledged_messages": ["a", "b", "c"]
+        })).expect("ack ok");
+        let v = serde_json::to_value(&ok).unwrap();
+        assert_eq!(v.get("acknowledged_count"), Some(&json!(3)));
+        assert!(v.get("acknowledged_messages").is_none());
+        // None/empty → 0
+        let ok0 = compact_tool_result(&json!({"ok": true, "acknowledged_messages": Value::Null}))
+            .expect("ack none");
+        let v0 = serde_json::to_value(&ok0).unwrap();
+        assert_eq!(v0.get("acknowledged_count"), Some(&json!(0)));
+    }
+
+    // ════════════════════════════════════════════════════════════════════════
+    // ToolError envelope — REDUNDANT keys are load-bearing (server.py:98-106)
+    // reason==error_code AND message==error, byte-for-byte.
+    // ════════════════════════════════════════════════════════════════════════
+    #[test]
+    fn tool_error_envelope_redundant_keys_byte_stable() {
+        let te = ToolError::new(ToolErrorReason::UnknownTool, "unknown tool 'foo'", "UnknownTool");
+        let env = te.to_envelope();
+        // exact golden from server._tool_error_result
+        assert_eq!(env.get("ok"), Some(&json!(false)));
+        assert_eq!(env.get("reason"), Some(&json!("unknown_tool")));
+        assert_eq!(env.get("error_code"), Some(&json!("unknown_tool"))); // == reason
+        assert_eq!(env.get("exc_type"), Some(&json!("UnknownTool")));
+        assert_eq!(env.get("message"), Some(&json!("unknown tool 'foo'")));
+        assert_eq!(env.get("error"), Some(&json!("unknown tool 'foo'"))); // == message
+        // full byte-stable order: ok,reason,error_code,exc_type,message,error
+        assert_eq!(keys(&env), vec!["ok", "reason", "error_code", "exc_type", "message", "error"]);
+    }
+
+    #[test]
+    fn public_exception_message_scrub() {
+        // newline→space, trim
+        assert_eq!(
+            ToolError::public_exception_message("  line1\nline2  ", "ValueError"),
+            "line1 line2"
+        );
+        // empty → exc_type name
+        assert_eq!(ToolError::public_exception_message("", "ValueError"), "ValueError");
+        // truncate to 200 chars
+        let long = "x".repeat(250);
+        assert_eq!(ToolError::public_exception_message(&long, "ValueError").len(), 200);
+    }
+
+    // ════════════════════════════════════════════════════════════════════════
+    // McpTool / RpcMethod wire mapping
+    // ════════════════════════════════════════════════════════════════════════

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

@@ -0,0 +1,189 @@
+    #[test]
+    fn dispatch_send_message_worker_accepted_returned_verbatim() {
+        let tools = TeamOrchestratorTools::with_identity(
+            &unique_ws("dispatch-accepted"),
+            Some(AgentId::new("leader")), // legacy single-team bypasses cross-team refusal
+            None,
+        );
+        let ok = dispatch_tool(&tools, McpTool::SendMessage, &json!({
+            "to": "worker-1", "content": "do it"
+        })).expect("send ok");
+        let v = serde_json::to_value(&ok).unwrap();
+        assert_eq!(keys(&v), vec!["status", "delivery_pending", "poll_via", "message_id"],
+            "worker-accepted dict returned verbatim (NOT re-compacted)");
+        assert_eq!(v.get("status"), Some(&json!("accepted")));
+        assert_eq!(v.get("delivery_pending"), Some(&json!(true)));
+        let mid = v.get("message_id").and_then(Value::as_str).unwrap();
+        assert_eq!(v.get("poll_via"), Some(&json!(format!("team-agent inbox {mid}"))));
+    }
+
+    // ── #32/#47 request_human key order ok,message_id,status (no compaction) ────
+    // GOLDEN (probe_events_red.py REQUEST_HUMAN-KEYS): ['ok','message_id','status'].
+    // Rust compact_tool_result reorders to ok,status,message_id.
+    #[test]
+    fn request_human_key_order_is_ok_message_id_status() {
+        let tools = TeamOrchestratorTools::with_identity(
+            &unique_ws("reqhuman-order"),
+            Some(AgentId::new("worker-3")),
+            None,
+        );
+        let ok = tools.request_human("need approval", Some("task-1"), None).expect("request_human ok");
+        let v = serde_json::to_value(&ok).unwrap();
+        assert_eq!(keys(&v), vec!["ok", "message_id", "status"]);
+        assert_eq!(v.get("status"), Some(&json!("needs_human")));
+    }
+
+    // ── #32 update_state returns RAW {ok, state_file} (NO compaction) ───────────
+    // GOLDEN (tools.py:316-325 + probe_passthrough): update_state is NOT compacted;
+    // state_file survives. Rust runs compact_tool_result whose ok-whitelist DROPS
+    // state_file (not a golden whitelist key), so the key vanishes.
+    #[test]
+    fn update_state_state_file_survives_no_compaction() {
+        let tools = TeamOrchestratorTools::with_identity(
+            &unique_ws("update-state-raw"),
+            Some(AgentId::new("leader")),
+            None,
+        );
+        let ok = tools.update_state("note").expect("update_state ok");
+        let v = serde_json::to_value(&ok).unwrap();
+        assert!(v.get("state_file").and_then(Value::as_str).is_some(),
+            "state_file must survive (update_state is not _compact_tool_result'd)");
+        assert_eq!(keys(&v), vec!["ok", "state_file"]);
+    }
+
+    // ── #36 report_result setdefault: populated envelope keys WIN over args ─────
+    // GOLDEN (probe_setdefault.py): envelope {agent_id:env-agent, task_id:env-task,...}
+    // + explicit args agent_id=ARG-agent, task_id=ARG-task → returned dict keeps
+    // env-agent / env-task (setdefault). Rust unconditionally insert-overrides.
+    #[test]
+    fn report_result_setdefault_envelope_wins_over_args() {
+        let tools = TeamOrchestratorTools::with_identity(
+            &unique_ws("report-setdefault"),
+            Some(AgentId::new("env-id")),
+            None,
+        );
+        let ok = tools.report_result(
+            Some(&json!({
+                "agent_id": "env-agent", "task_id": "env-task",
+                "status": "blocked", "summary": "env summary"
+            })),
+            Some("ARG summary"), ResultStatus::Success,
+            None, None, None, None, None,
+            Some("ARG-task"), Some("ARG-agent"),
+        ).expect("report ok");
+        let v = serde_json::to_value(&ok).unwrap();
+        // setdefault: the pre-populated envelope values win.
+        assert_eq!(v.get("agent_id"), Some(&json!("env-agent")), "envelope agent_id wins (setdefault)");
+        assert_eq!(v.get("task_id"), Some(&json!("env-task")), "envelope task_id wins (setdefault)");
+    }
+
+    // ── #44 report_result task_id inference from state (_latest_task_for_assignee)
+    // GOLDEN (probe_report evidence): env agent worker-7, state tasks=[{id:t-42,
+    // assignee:worker-7,status:pending}], report with NO task_id → task_id "t-42".
+    // Rust has no _latest_task_for_assignee; hard-codes "manual".
+    #[test]
+    fn report_result_infers_task_id_from_latest_assigned_task() {
+        let cws = seed_state_ws("report-infer-task", &json!({
+            "agents": {}, "active_team_key": null,
+            "tasks": [{"id": "t-42", "assignee": "worker-7", "status": "pending"}]
+        }));
+        let tools = TeamOrchestratorTools::with_identity(&cws, Some(AgentId::new("worker-7")), None);
+        let ok = tools.report_result(
+            None, Some("done it"), ResultStatus::Success,
+            None, None, None, None, None,
+            None, None,
+        ).expect("report ok");
+        let v = serde_json::to_value(&ok).unwrap();
+        assert_eq!(v.get("task_id"), Some(&json!("t-42")),
+            "task_id inferred from latest non-terminal assigned task, not 'manual'");
+    }
+
+    // ── #42 get_visible_peers reads seeded state (sorted live peers) ────────────
+    // GOLDEN (probe_peers.py): teamA agents {worker-z(alive),worker-a(working),
+    // worker-dead(DEAD),worker-stopped(Stopped),worker-no-status(dict no status),
+    // worker-weird(non-dict)} → peers ["worker-a","worker-no-status","worker-weird",
+    // "worker-z"] (sorted, dead/stopped filtered, non-dict & no-status INCLUDED);
+    // sender_team_id "teamA", scope team. Rust stub returns empty peers.
+    #[test]
+    fn get_visible_peers_reads_state_sorted_live_filtered() {
+        let cws = seed_state_ws("visible-peers", &json!({
+            "agents": {}, "active_team_key": null,
+            "teams": {
+                "teamA": {"status": "alive", "agents": {
+                    "worker-z": {"status": "alive"},
+                    "worker-a": {"status": "working"},
+                    "worker-dead": {"status": "DEAD"},
+                    "worker-stopped": {"status": "Stopped"},
+                    "worker-no-status": {},
+                    "worker-weird": "not-a-dict"
+                }},
+                "teamB": {"status": "alive", "agents": {"other-bob": {"status": "alive"}}}
+            }
+        }));
+        let tools = TeamOrchestratorTools::with_identity(
+            &cws, Some(AgentId::new("worker-1")), Some(TeamKey::new("teamA")),
+        );
+        let vp = tools.get_visible_peers().expect("visible peers");
+        let got: Vec<&str> = vp.peers.iter().map(AgentId::as_str).collect();
+        assert_eq!(got, vec!["worker-a", "worker-no-status", "worker-weird", "worker-z"]);
+        assert_eq!(vp.sender_team_id, Some(TeamKey::new("teamA")));
+        assert_eq!(vp.scope, Scope::Team);
+    }
+
+    // ── #42 refuse_cross_team_peer ALLOWS a live in-team peer (visible bypass) ──
+    // GOLDEN (probe_peers.py): with the same seeded state, refusing worker-a / worker-z
+    // / worker-no-status / worker-weird → None (ALLOWED, they are visible peers), while
+    // worker-dead / worker-stopped / other-bob → refused. Rust stub refuses ALL of them.
+    #[test]
+    fn refuse_cross_team_peer_allows_live_in_team_peer() {
+        let cws = seed_state_ws("refuse-inteam", &json!({
+            "agents": {}, "active_team_key": null,
+            "teams": {
+                "teamA": {"status": "alive", "agents": {
+                    "worker-z": {"status": "alive"},
+                    "worker-a": {"status": "working"},
+                    "worker-dead": {"status": "DEAD"},
+                    "worker-no-status": {},
+                    "worker-weird": "not-a-dict"
+                }},
+                "teamB": {"status": "alive", "agents": {"other-bob": {"status": "alive"}}}
+            }
+        }));
+        let tools = TeamOrchestratorTools::with_identity(
+            &cws, Some(AgentId::new("worker-1")), Some(TeamKey::new("teamA")),
+        );
+        // live / no-status / non-dict in-team peers are ALLOWED (None).
+        assert!(tools.refuse_cross_team_peer(&MessageTarget::Single("worker-a".to_string()), None).is_none(),
+            "a live in-team peer must be allowed (visible-peer bypass)");
+        assert!(tools.refuse_cross_team_peer(&MessageTarget::Single("worker-z".to_string()), None).is_none());
+        assert!(tools.refuse_cross_team_peer(&MessageTarget::Single("worker-no-status".to_string()), None).is_none());
+        assert!(tools.refuse_cross_team_peer(&MessageTarget::Single("worker-weird".to_string()), None).is_none());
+        // dead / other-team peers are still refused.
+        assert!(tools.refuse_cross_team_peer(&MessageTarget::Single("worker-dead".to_string()), None).is_some());
+        assert!(tools.refuse_cross_team_peer(&MessageTarget::Single("other-bob".to_string()), None).is_some());
+    }
+
+    // ── #48 refuse_cross_team_peer writes mcp.send_message_refused EventLog ─────
+    // GOLDEN (probe_events_red.py): a refusal appends an event with fields
+    // event=mcp.send_message_refused, reason=peer_not_in_scope, scope=team,
+    // sender_team_id=teamA, hint=<the cross-team hint>. Rust handler writes nothing.
+    #[test]
+    fn refuse_cross_team_peer_writes_send_message_refused_event() {
+        let cws = seed_state_ws("refuse-event", &json!({
+            "agents": {}, "active_team_key": null,
+            "teams": {"teamA": {"status": "alive", "agents": {"worker-1": {"status": "alive"}}}}
+        }));
+        let tools = TeamOrchestratorTools::with_identity(
+            &cws, Some(AgentId::new("worker-1")), Some(TeamKey::new("teamA")),
+        );
+        // out-of-scope peer → refusal must emit the audit event.
+        let _ = tools.refuse_cross_team_peer(&MessageTarget::Single("other-bob".to_string()), None);
+        let events = EventLog::new(&cws).tail(50).expect("read events");
+        let refused = events.iter().find(|e| e["event"] == json!("mcp.send_message_refused"))
+            .expect("mcp.send_message_refused must be written on refusal");
+        assert_eq!(refused["reason"], json!("peer_not_in_scope"));
+        assert_eq!(refused["scope"], json!("team"));
+        assert_eq!(refused["sender_team_id"], json!("teamA"));
+        assert_eq!(refused["hint"],
+            json!("the requested peer is not part of your team. pass scope='workspace' to address peers in other teams."));
+    }