@team-agent/installer 0.4.10 → 0.5.0

package/crates/team-agent/src/messaging/scheduler.rs

@@ -10,7 +10,9 @@ use crate::transport::{PaneId, Transport};
 
 use super::delivery::{deliver_stored_message, handle_trust_retry_needed};
 use super::helpers::{parse_scheduled_kind, status_wire};
-use super::{AlertType, MessagingError, ScheduledKind, TrustRetryPayload, TRUST_RETRY_MAX_ATTEMPTS};
+use super::{
+    AlertType, MessagingError, ScheduledKind, TrustRetryPayload, TRUST_RETRY_MAX_ATTEMPTS,
+};
 
 /// `_fire_due_scheduled_events` (`scheduler.py:41`):coordinator tick 的调度器心脏 —— 分派到期
 /// `send`/`health_ping`/`trust_retry` ([`ScheduledKind`] 穷尽 match),send 失败有界重试。
@@ -50,9 +52,15 @@ pub fn fire_due_scheduled_events(
                     let outcome = deliver_stored_message(
                         workspace,
                         Some(&target),
-                        payload.get("content").and_then(|v| v.as_str()).unwrap_or(""),
+                        payload
+                            .get("content")
+                            .and_then(|v| v.as_str())
+                            .unwrap_or(""),
                         None,
-                        payload.get("sender").and_then(|v| v.as_str()).unwrap_or("leader"),
+                        payload
+                            .get("sender")
+                            .and_then(|v| v.as_str())
+                            .unwrap_or("leader"),
                         payload
                             .get("requires_ack")
                             .and_then(|v| v.as_bool())
@@ -61,7 +69,10 @@ pub fn fire_due_scheduled_events(
                             .get("wait_visible")
                             .and_then(|v| v.as_bool())
                             .unwrap_or(false),
-                        payload.get("timeout").and_then(|v| v.as_f64()).unwrap_or(30.0),
+                        payload
+                            .get("timeout")
+                            .and_then(|v| v.as_f64())
+                            .unwrap_or(30.0),
                         None,
                     )?;
                     serde_json::json!({
@@ -114,7 +125,10 @@ pub fn fire_due_scheduled_events(
 
         let (status, result_json) = match fire_one() {
             Ok(result) => {
-                let ok = result.get("ok").and_then(serde_json::Value::as_bool).unwrap_or(false);
+                let ok = result
+                    .get("ok")
+                    .and_then(serde_json::Value::as_bool)
+                    .unwrap_or(false);
                 (if ok { "done" } else { "failed" }, result.to_string())
             }
             Err(error) => {
@@ -242,7 +256,26 @@ pub fn stuck_cancel(
             },
         );
     }
-    crate::state::persist::save_runtime_state(workspace, &state)?;
+    crate::state::persist::save_runtime_state_reapplying_after_conflict(
+        workspace,
+        &state,
+        |latest| {
+            for kind in &alert_types {
+                upsert_suppression(
+                    latest,
+                    SuppressionRecord {
+                        team: &team,
+                        agent_id,
+                        alert_type: kind,
+                        suppressed_by,
+                        suppressed_at: &now,
+                        assigned_task_ids: assigned.clone(),
+                        delivered_message_ids: delivered.clone(),
+                    },
+                );
+            }
+        },
+    )?;
     crate::event_log::EventLog::new(workspace).write(
         "coordinator.idle_alert_suppressed",
         serde_json::json!({
@@ -273,7 +306,11 @@ fn active_team_key(workspace: &Path, state: &serde_json::Value) -> String {
         .and_then(serde_json::Value::as_str)
         .filter(|team| !team.is_empty())
         .map(ToString::to_string)
-        .or_else(|| workspace.file_name().map(|name| name.to_string_lossy().to_string()))
+        .or_else(|| {
+            workspace
+                .file_name()
+                .map(|name| name.to_string_lossy().to_string())
+        })
         .unwrap_or_else(|| "current".to_string())
 }
 
@@ -284,8 +321,14 @@ fn assigned_task_ids(state: &serde_json::Value, agent_id: &str) -> Vec<String> {
         .map(|tasks| {
             tasks
                 .iter()
-                .filter(|task| task.get("assignee").and_then(serde_json::Value::as_str) == Some(agent_id))
-                .filter_map(|task| task.get("id").and_then(serde_json::Value::as_str).map(ToString::to_string))
+                .filter(|task| {
+                    task.get("assignee").and_then(serde_json::Value::as_str) == Some(agent_id)
+                })
+                .filter_map(|task| {
+                    task.get("id")
+                        .and_then(serde_json::Value::as_str)
+                        .map(ToString::to_string)
+                })
                 .collect()
         })
         .unwrap_or_default();

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

@@ -18,6 +18,7 @@ use crate::model::ids::TaskId;
 use crate::model::task_graph::{find_dependency_cycle, TaskNode};
 use crate::model::yaml::Value as Yaml;
 use crate::model::{permissions, yaml};
+use crate::provider::wire::{is_claude_family, parse_canonical_provider};
 
 /// result_envelope_v1 顶层 required(= allowed)。
 const RESULT_REQUIRED: &[&str] = &[
@@ -175,9 +176,6 @@ fn result_schema_errors(envelope: &Value) -> Vec<String> {
 const ROOT_KEYS: &[&str] = &[
     "version", "team", "leader", "agents", "routing", "communication", "runtime", "context", "tasks",
 ];
-// Copilot 一期加入白名单(design §B compiler.py:249-251 同位 + cr verdict 总裁,
-// MUST-NOT-7 跨厂商等价 — 设计 / cr 已落地 26 约束)。
-const SUPPORTED_PROVIDERS: &[&str] = &["claude", "claude_code", "codex", "copilot", "gemini_cli", "fake"];
 const AUTH_MODES: &[&str] = &["subscription", "official_api", "compatible_api"];
 const VALID_DISPLAY_BACKENDS: &[&str] = &[
     "none", "tmux_attach", "iterm", "ghostty", "ghostty_window", "ghostty_workspace", "adaptive",
@@ -326,7 +324,7 @@ fn check_agent(agent: &Yaml, path: &str, errors: &mut Vec<String>) {
             }
             Some(effort) if effort.is_claude_only() => {
                 let provider = agent.get("provider").and_then(Yaml::as_str).unwrap_or("");
-                if !matches!(provider, "claude" | "claude_code") {
+                if !parse_canonical_provider(provider).is_some_and(is_claude_family) {
                     errors.push(format!(
                         "{path}/effort: effort '{raw}' is only supported by claude/claude_code (provider: {provider})"
                     ));
@@ -476,13 +474,19 @@ fn semantic_errors(spec: &Yaml, base_dir: &Path) -> Vec<String> {
     }
 
     let leader_provider = leader.and_then(|l| l.get("provider"));
-    if !leader_provider.and_then(Yaml::as_str).is_some_and(|p| SUPPORTED_PROVIDERS.contains(&p)) {
+    if !leader_provider
+        .and_then(Yaml::as_str)
+        .is_some_and(|p| parse_canonical_provider(p).is_some())
+    {
         e.push(format!("/leader/provider: unknown provider {}", py_repr(leader_provider)));
     }
 
     for (idx, agent) in agents.iter().enumerate() {
         let provider = agent.get("provider");
-        if !provider.and_then(Yaml::as_str).is_some_and(|p| SUPPORTED_PROVIDERS.contains(&p)) {
+        if !provider
+            .and_then(Yaml::as_str)
+            .is_some_and(|p| parse_canonical_provider(p).is_some())
+        {
             e.push(format!("/agents/{idx}/provider: unknown provider {}", py_repr(provider)));
         }
         if let Some(auth) = agent.get("auth_mode") {