@team-agent/installer 0.5.97 → 0.5.99

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

@@ -24,7 +24,6 @@
 //! ---
 //! lifecycle 数据类型:newtype / enum / data struct / error / outcome-report 集中定义。
 
-use std::collections::BTreeMap;
 use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
@@ -32,9 +31,7 @@ use thiserror::Error;
 
 use crate::model::ids::AgentId;
 use crate::provider::{RolloutPath, SessionId};
-use crate::transport::{PaneId, SessionName, WindowName};
-
-use super::DisplayBackend;
+use crate::transport::SessionName;
 
 // ===========================================================================
 // CROSS-LANE PLACEHOLDERS(13/14/15 兄弟 lane 尚未交付;leader 集成时 reconcile)
@@ -184,22 +181,6 @@ impl std::fmt::Display for PlanId {
     }
 }
 
-/// ghostty 派生的唯一 linked-session 名(`ghostty_display_session_name`,sha1 派生,
-/// `display/ghostty.py`)。与 worker 的 `SessionName` 类型上区分,防混传(card §57)。
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct DisplaySessionName(pub String);
-
-impl DisplaySessionName {
-/// ---
-/// purpose: 取 ghostty 派生 display session 名的原始字符串
-/// returns: 内部保存的名字
-/// ---
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
 // ===========================================================================
 // ENUM(card §3/§11:散字符串 → 穷尽 enum)
 // ===========================================================================
@@ -240,30 +221,6 @@ pub enum FirstSendAtState {
     Corrupt,
 }
 
-/// adaptive 阻塞 reason(`ADAPTIVE_BLOCK_REASONS`,6 个封闭值,`display/adaptive.py:21`)。
-/// **必须 enum**(契约 C16 封闭集);`adaptive_blocked` 对越界 reason 兜底成
-/// `AggregatorRebuildFailed`。
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AdaptiveBlockReason {
-    LeaderNotInTmux,
-    SplitFailed,
-    WindowCreateFailed,
-    WorkerSessionMissing,
-    NotImplementedThisPlatform,
-    AggregatorRebuildFailed,
-}
-
-/// display `status`(`agent_state["display"]["status"]`,`start.py:123`)。
-/// **应 enum**:决定 `start_agent` 是否重开显示。
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum DisplayStatus {
-    Opened,
-    Blocked,
-    Stopped,
-}
-
 /// plan `status`(`orchestrator/__init__.py`)。**应 enum**:`start_plan` 对已
 /// running/halted/completed 幂等返回。
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -285,64 +242,9 @@ pub enum DangerousApprovalSource {
 }
 
 // ===========================================================================
-// DATA STRUCT(每 worker display / restart 候选 / plan state / 危险审批)
+// DATA STRUCT(restart 候选 / plan state / 危险审批)
 // ===========================================================================
 
-/// adaptive 能力探测结果(`probe_display_capabilities`,`display/adaptive.py:31`)。
-/// **C13 一等公民**:分支只看 probe,不看 `cfg!(target_os)`;Windows/WSL →
-/// `NotImplementedThisPlatform`。
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct DisplayProbe {
-    pub in_tmux: bool,
-    pub platform: String,
-    pub leader_session: Option<SessionName>,
-    pub leader_pane: Option<PaneId>,
-    pub caps: CapsFlags,
-    /// 探测后的 adaptive 状态(可开 / 已封闭+reason)。
-    pub adaptive_status: DisplayStatus,
-    /// 封闭时填 reason(C16 封闭集)。
-    pub reason: Option<AdaptiveBlockReason>,
-}
-
-/// 平台能力位(`caps{tmux_append_windows, adaptive_display}`)。
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct CapsFlags {
-    pub tmux_append_windows: bool,
-    pub adaptive_display: bool,
-}
-
-/// 每 worker display state(写进 `state.agents.<id>.display`)。adaptive vs ghostty_window
-/// vs ghostty_workspace 字段不同 → enum 区分(card §50)。
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(tag = "backend", rename_all = "snake_case")]
-pub enum WorkerDisplay {
-    Adaptive {
-        status: DisplayStatus,
-        window: Option<WindowName>,
-        workspace_window: Option<WindowName>,
-        pane_id: Option<PaneId>,
-        pane_title: Option<String>,
-        target: Option<String>,
-        target_worker_session: Option<String>,
-        linked_session: Option<String>,
-        leader_session: Option<SessionName>,
-        display_session: Option<SessionName>,
-        fallback: Option<String>,
-    },
-    GhosttyWindow {
-        status: DisplayStatus,
-        linked_session: DisplaySessionName,
-        display_session: DisplaySessionName,
-    },
-    GhosttyWorkspace {
-        status: DisplayStatus,
-        display_session: DisplaySessionName,
-    },
-    Blocked {
-        reason: AdaptiveBlockReason,
-    },
-}
-
 /// `RestartCandidate`(`restart/selection.py:27`)。`select_restart_state` 多 team 选择;
 /// `has_context` 是 resume 可行性粗判。
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -464,8 +366,7 @@ impl PlanCondition {
 // ERROR(card §10:fallible 边界;daemon/CLI 入口返 rich Result<Report, Error>)
 // ===========================================================================
 
-/// lifecycle 子系统错误。能力性降级(adaptive blocked)**不**走这里 —— 那是 typed
-/// outcome(`DisplayStatus::Blocked` / `AdaptiveBlockReason`)。这里只装真失败:
+/// lifecycle 子系统错误。这里只装真失败:
 /// owner-gate 拒绝、session 冲突、state 写崩(bug-084)、provider/transport I/O、回滚失败。
 #[derive(Debug, Error)]
 pub enum LifecycleError {
@@ -560,10 +461,6 @@ pub struct StartedAgent {
     pub claude_config_dir: Option<PathBuf>,
     pub provider_projects_root: Option<PathBuf>,
     pub managed_mcp_config: bool,
-    pub layout_window: Option<WindowName>,
-    pub layout_index: Option<usize>,
-    pub pane_index: Option<usize>,
-    pub display: WorkerDisplay,
 }
 
 /// 路由决策(`routing.decision` 事件 / launch `routes[]`)。
@@ -603,7 +500,6 @@ pub enum QuickStartReport {
         launch: Box<LaunchReport>,
         next_actions: Vec<String>,
         attach_commands: Vec<String>,
-        display_backend: String,
         /// BUG-7: real readiness verdict. `Ready` ⇒ the wrapper completed AND the
         /// caller already verified tool-set availability; the framework itself
         /// never emits this without an external observable confirming worker
@@ -940,32 +836,6 @@ pub struct RestartPlan {
     pub unresumable: Vec<UnresumableWorker>,
 }
 
-/// display 解析结果(`resolve_display_backend`,`display/backend.py`)。非默认时非静默
-/// 发 `display.backend_resolved`。
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct ResolvedBackend {
-    pub backend: DisplayBackend,
-    /// 是否非默认(默认 adaptive;非默认非静默发事件)。
-    pub non_default: bool,
-}
-
-/// `open_worker_displays` 结果(`display/worker_window.py`)。每 worker 一个
-/// `WorkerDisplay`,失败不阻塞 team readiness(C14)。
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct OpenDisplaysReport {
-    pub backend: DisplayBackend,
-    pub displays: BTreeMap<String, WorkerDisplay>,
-}
-
-/// `close_team_display_backends` 结果(`display/close.py`,C9 close-by-recorded-backend)。
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct CloseDisplaysReport {
-    /// 按 state 记录的后端关掉的窗口/会话标识。
-    pub closed: Vec<String>,
-    /// orphan 清理(adaptive 只删带 team tag 的窗口,C2 leader pane 安全)。
-    pub orphans_cleaned: Vec<String>,
-}
-
 /// plan 状态机推进结果(`orchestrator/__init__.py` start_plan / handle_report_result /
 /// halt_plan 的 typed 版)。
 #[derive(Debug, Clone, PartialEq, Eq)]

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

@@ -34,15 +34,18 @@ pub enum Provider {
 
 /// 0.4.x Provider effort MVP: reasoning effort level passed to the provider.
 /// Configuration sources (resolution order):
-///   1. role doc front matter `effort: low|medium|high|xhigh|max`
-///   2. TEAM.md front matter `provider_effort: low|medium|high|xhigh|max`
+///   1. role doc front matter `effort: low|medium|high|xhigh|max|ultra`
+///   2. TEAM.md front matter `provider_effort: low|medium|high|xhigh|max|ultra` (except Pi)
 ///   3. provider default (framework passes no flag)
 ///
 /// Provider support:
 ///   - claude / claude_code: low|medium|high|xhigh|max → `--effort <level>`
-///   - codex: low|medium|high|xhigh (NOT max) → `-c model_reasoning_effort=<level>`
-///   - grok: low|medium|high|xhigh (NOT max) → `--effort <level>`
-///   - copilot / gemini_cli / cursor_agent / fake: unsupported — warning event, no flag
+///   - codex: low|medium|high|xhigh|max|ultra → `-c model_reasoning_effort=<level>`
+///     Ultra adds Codex client delegation to max reasoning; it is not an API effort.
+///   - pi: low|medium|high|xhigh|max → `--thinking <level>`
+///   - grok: low|medium|high|xhigh → `--effort <level>`; max/ultra rejected
+///   - copilot / gemini_cli / fake: low..xhigh ignored with warning; max/ultra rejected
+///   - cursor_agent: all effort rejected
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum ProviderEffort {
     #[serde(rename = "low")]
@@ -55,6 +58,8 @@ pub enum ProviderEffort {
     XHigh,
     #[serde(rename = "max")]
     Max,
+    #[serde(rename = "ultra")]
+    Ultra,
 }
 
 impl ProviderEffort {
@@ -66,6 +71,7 @@ impl ProviderEffort {
             "high" => Some(Self::High),
             "xhigh" => Some(Self::XHigh),
             "max" => Some(Self::Max),
+            "ultra" => Some(Self::Ultra),
             _ => None,
         }
     }
@@ -78,20 +84,17 @@ impl ProviderEffort {
             Self::High => "high",
             Self::XHigh => "xhigh",
             Self::Max => "max",
+            Self::Ultra => "ultra",
         }
     }
 
-    /// Effort levels Claude-only (Codex / others must reject `max`).
-    pub fn is_claude_only(self) -> bool {
-        matches!(self, Self::Max)
-    }
-
-    /// Native command support. Claude/Pi accept max; Codex/Grok accept
-    /// the other levels. Use resolve_for_provider for admission/ignore policy.
+    /// Native command support: Codex through ultra, Claude/Pi through max,
+    /// Grok through xhigh. Use resolve_for_provider for admission/ignore policy.
     pub fn is_supported_by(self, provider: Provider) -> bool {
         match provider {
-            Provider::Claude | Provider::ClaudeCode | Provider::Pi => true,
-            Provider::Codex | Provider::Grok => !self.is_claude_only(),
+            Provider::Codex => true,
+            Provider::Claude | Provider::ClaudeCode | Provider::Pi => self != Self::Ultra,
+            Provider::Grok => !matches!(self, Self::Max | Self::Ultra),
             Provider::Copilot | Provider::GeminiCli | Provider::CursorAgent | Provider::Fake => {
                 false
             }
@@ -106,8 +109,10 @@ impl ProviderEffort {
         }
         if self.is_supported_by(provider) {
             Ok(Some(self))
-        } else if self.is_claude_only() {
-            Err("effort 'max' is only supported by claude/claude_code/pi")
+        } else if self == Self::Ultra {
+            Err("effort 'ultra' is only supported by codex")
+        } else if self == Self::Max {
+            Err("effort 'max' is only supported by claude/claude_code/codex/pi")
         } else {
             Ok(None)
         }
@@ -208,30 +213,6 @@ pub enum Backend {
     Pty,
 }
 
-/// display backend(`VALID_DISPLAY_BACKENDS` `display/backend.py:7-9`)。
-/// **`adaptive` 在代码集里但不在 JSON schema enum** —— 以代码为准(陷阱 #5)。
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum DisplayBackend {
-    None,
-    TmuxAttach,
-    Iterm,
-    Ghostty,
-    GhosttyWindow,
-    GhosttyWorkspace,
-    Adaptive,
-}
-
-impl DisplayBackend {
-    /// `DISPLAY_BACKENDS_WITH_WORKER_VIEWS = GHOSTTY_* | {adaptive}`(`display/backend.py:8`)。
-    pub fn has_worker_views(self) -> bool {
-        matches!(
-            self,
-            Self::Ghostty | Self::GhosttyWindow | Self::GhosttyWorkspace | Self::Adaptive
-        )
-    }
-}
-
 /// agent permission mode(schema `agent.permission_mode`;compiler 恒发 `restricted`)。
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
@@ -324,18 +305,6 @@ mod tests {
                 serde_json::to_string(&CommProtocol::McpInbox).unwrap(),
                 "\"mcp_inbox\"",
             ),
-            (
-                serde_json::to_string(&DisplayBackend::TmuxAttach).unwrap(),
-                "\"tmux_attach\"",
-            ),
-            (
-                serde_json::to_string(&DisplayBackend::GhosttyWorkspace).unwrap(),
-                "\"ghostty_workspace\"",
-            ),
-            (
-                serde_json::to_string(&DisplayBackend::Adaptive).unwrap(),
-                "\"adaptive\"",
-            ),
             (
                 serde_json::to_string(&PaneLiveness::Unknown).unwrap(),
                 "\"unknown\"",
@@ -380,25 +349,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn display_backend_worker_views() {
-        for b in [
-            DisplayBackend::Ghostty,
-            DisplayBackend::GhosttyWindow,
-            DisplayBackend::GhosttyWorkspace,
-            DisplayBackend::Adaptive,
-        ] {
-            assert!(b.has_worker_views());
-        }
-        for b in [
-            DisplayBackend::None,
-            DisplayBackend::TmuxAttach,
-            DisplayBackend::Iterm,
-        ] {
-            assert!(!b.has_worker_views());
-        }
-    }
-
     #[test]
     fn receive_worker_outputs_passthrough_preserves_drift_value() {
         // compiler 发的 drift 值必须原样保留(byte 不丢),不被拒。

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

@@ -20,6 +20,8 @@ use crate::model::yaml::Value as Yaml;
 use crate::model::yaml;
 use crate::provider::wire::parse_canonical_provider;
 
+const LEGACY_DISPLAY_KEY: &str = concat!("display", "_backend");
+
 /// result_envelope_v1 顶层 required(= allowed)。
 const RESULT_REQUIRED: &[&str] = &[
     "schema_version",
@@ -211,15 +213,6 @@ const ROOT_KEYS: &[&str] = &[
     "tasks",
 ];
 const AUTH_MODES: &[&str] = &["subscription", "official_api", "compatible_api"];
-const VALID_DISPLAY_BACKENDS: &[&str] = &[
-    "none",
-    "tmux_attach",
-    "iterm",
-    "ghostty",
-    "ghostty_window",
-    "ghostty_workspace",
-    "adaptive",
-];
 const TASK_STATUS_STRS: &[&str] = &[
     "pending",
     "ready",
@@ -319,7 +312,7 @@ fn basic_schema_errors(spec: &Yaml) -> Vec<String> {
         if let Some(raw) = team.get("provider_effort").and_then(Yaml::as_str) {
             if crate::model::enums::ProviderEffort::parse(raw).is_none() {
                 e.push(format!(
-                    "/team/provider_effort: unknown effort '{raw}' (allowed: low|medium|high|xhigh|max)"
+                    "/team/provider_effort: unknown effort '{raw}' (allowed: low|medium|high|xhigh|max|ultra)"
                 ));
             }
         }
@@ -460,7 +453,7 @@ fn check_agent(agent: &Yaml, path: &str, errors: &mut Vec<String>) {
         match crate::model::enums::ProviderEffort::parse(raw) {
             None => {
                 errors.push(format!(
-                    "{path}/effort: unknown effort '{raw}' (allowed: low|medium|high|xhigh|max)"
+                    "{path}/effort: unknown effort '{raw}' (allowed: low|medium|high|xhigh|max|ultra)"
                 ));
             }
             Some(effort) => {
@@ -598,7 +591,7 @@ fn check_runtime(runtime: Option<&Yaml>, errors: &mut Vec<String>) {
         "require_user_approval_before_launch",
         "max_active_agents",
         "startup_order",
-        "display_backend",
+        LEGACY_DISPLAY_KEY,
         "auto_attach_leader",
         "fast",
         "tick_interval_sec",
@@ -614,14 +607,6 @@ fn check_runtime(runtime: Option<&Yaml>, errors: &mut Vec<String>) {
     if !matches!(get("backend").and_then(Yaml::as_str), Some("tmux" | "pty")) {
         errors.push("/runtime/backend: invalid backend".to_string());
     }
-    if let Some(db) = get("display_backend") {
-        if !db
-            .as_str()
-            .is_some_and(|s| VALID_DISPLAY_BACKENDS.contains(&s))
-        {
-            errors.push("/runtime/display_backend: invalid display backend".to_string());
-        }
-    }
     if get("auto_trust_own_workspace").is_some_and(|v| !matches!(v, Yaml::Bool(_))) {
         errors.push("/runtime/auto_trust_own_workspace: must be a boolean".to_string());
     }

package/crates/team-agent/src/provider/adapters/codex.rs

@@ -21,8 +21,8 @@ pub(crate) fn codex_base_command(
     // 0.4.x provider effort MVP step 6: when Some, inject
     // `-c model_reasoning_effort=<level>` AFTER existing profile
     // codex_config overrides — explicit launch effort wins over profile.
-    // Codex does not support `max`; the caller filters that case via
-    // `ProviderEffort::is_supported_by` before reaching this point.
+    // Preserve max/ultra verbatim: ultra enables Codex client delegation
+    // on top of max reasoning, rather than a separate model API effort.
     effort: Option<crate::model::enums::ProviderEffort>,
 ) -> Vec<String> {
     let mut argv = vec!["codex".to_string()];

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

@@ -352,11 +352,12 @@ pub struct ProviderCommandContext<'a> {
     /// from role doc / TEAM.md / provider default. `None` means the
     /// framework passes no effort flag (provider default).
     ///   - Claude / ClaudeCode: low|medium|high|xhigh|max → `--effort <level>`
-    ///   - Codex: low|medium|high|xhigh → `-c model_reasoning_effort=<level>`
-    ///   - Grok: low|medium|high|xhigh (NOT max) → `--effort <level>`
-    ///   - Copilot / Gemini / CursorAgent / Fake: ignored, warning event
-    ///     emitted at the caller (lifecycle/launch.rs / lifecycle/restart)
-    ///     before construct.
+    ///   - Codex: low|medium|high|xhigh|max|ultra → `-c model_reasoning_effort=<level>`
+    ///     Ultra enables Codex client delegation on top of max reasoning.
+    ///   - Pi: low|medium|high|xhigh|max → `--thinking <level>`; ultra rejected
+    ///   - Grok: low|medium|high|xhigh → `--effort <level>`; max/ultra rejected
+    ///   - Copilot / Gemini / Fake: low..xhigh ignored with a caller warning;
+    ///     max/ultra rejected. CursorAgent rejects all effort.
     pub effort: Option<crate::model::enums::ProviderEffort>,
 }
 

package/examples/team.spec.yaml

@@ -136,7 +136,6 @@ communication:
     mirror_files: .team/messages
 runtime:
   backend: tmux
-  display_backend: none
   session_name: teamspec-full-example
   auto_launch: true
   require_user_approval_before_launch: true

package/package.json

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

package/schemas/team.schema.json

@@ -59,11 +59,11 @@
     },
     "runtime": {
       "type": "object",
-      "required": ["backend", "display_backend", "session_name", "auto_launch", "require_user_approval_before_launch", "max_active_agents", "startup_order"],
+      "required": ["backend", "session_name", "auto_launch", "require_user_approval_before_launch", "max_active_agents", "startup_order"],
       "additionalProperties": false,
       "properties": {
         "backend": { "enum": ["tmux", "pty"] },
-        "display_backend": { "enum": ["none", "tmux_attach", "iterm", "ghostty", "ghostty_window", "ghostty_workspace"] },
+        "display_backend": {},
         "session_name": { "type": "string", "minLength": 1 },
         "auto_launch": { "type": "boolean" },
         "require_user_approval_before_launch": { "type": "boolean" },

package/skills/team-agent/SKILL.md

@@ -17,7 +17,7 @@ team-agent --help
 team-agent doctor --help
 ```
 
-**Launch** from a tmux-addressable pane: `team-agent claude` or `team-agent codex`, then `team-agent quick-start .team/current`. Do not start a real team from a naked terminal. Existing tmux/Ghostty layouts are valid if `quick-start` runs from the leader pane.
+**Launch** from a tmux-addressable pane: `team-agent claude` or `team-agent codex`, then `team-agent quick-start .team/current`. Do not start a real team from a naked terminal. Workers always run in independent background windows on the workspace-scoped tmux server.
 
 **Operate**