@team-agent/installer 0.5.64 → 0.5.65

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

@@ -74,6 +74,7 @@ pub fn deliver_stored_message(
         stage: None,
         reason: None,
         channel: None,
+        ack_forced_off: false,
     })
 }
 
@@ -181,6 +182,7 @@ pub fn deliver_pending_message(
             stage: None,
             reason: None,
             channel: None,
+            ack_forced_off: false,
         });
     }
     let message = message_for_delivery(store, message_id)?;
@@ -194,6 +196,7 @@ pub fn deliver_pending_message(
             stage: None,
             reason: Some(DeliveryRefusal::UnknownRecipient),
             channel: None,
+            ack_forced_off: false,
         });
     };
     let mut canonical_owner_team_id = message.owner_team_id.clone();
@@ -281,6 +284,7 @@ pub fn deliver_pending_message(
             stage: None,
             reason: Some(DeliveryRefusal::MessageAlreadyClaimed),
             channel: None,
+            ack_forced_off: false,
         });
     };
     if message.recipient == "leader" {
@@ -310,6 +314,7 @@ pub fn deliver_pending_message(
                 stage: None,
                 reason: Some(DeliveryRefusal::LeaderNotAttached),
                 channel: Some("rebind_required".to_string()),
+                ack_forced_off: false,
             });
         };
         if let Some(outcome) = leader_receiver_transport_conflict_outcome(
@@ -340,6 +345,7 @@ pub fn deliver_pending_message(
                     stage: None,
                     reason: None,
                     channel: Some("rebind_required".to_string()),
+                    ack_forced_off: false,
                 });
             }
             crate::messaging::LeaderChannelResolution::Unbound(reason) => {
@@ -378,6 +384,7 @@ pub fn deliver_pending_message(
                     stage: None,
                     reason: Some(refusal),
                     channel: Some("rebind_required".to_string()),
+                    ack_forced_off: false,
                 });
             }
         }
@@ -424,6 +431,7 @@ pub fn deliver_pending_message(
                 stage: None,
                 reason: None,
                 channel: None,
+                ack_forced_off: false,
             });
         }
     };
@@ -471,6 +479,7 @@ pub fn deliver_pending_message(
             stage: Some(DeliveryStage::TrustAutoAnswerDismissalWait),
             reason: None,
             channel: None,
+            ack_forced_off: false,
         });
     }
     let rendered = render_message(
@@ -528,6 +537,7 @@ pub fn deliver_pending_message(
                     stage: None,
                     reason: Some(DeliveryRefusal::LeaderNotAttached),
                     channel: Some("rebind_required".to_string()),
+                    ack_forced_off: false,
                 });
             }
             if transport_error_is_target_missing(&error) {
@@ -571,6 +581,7 @@ pub fn deliver_pending_message(
                     stage: Some(DeliveryStage::Inject),
                     reason: None,
                     channel: None,
+                    ack_forced_off: false,
                 });
             }
             store.mark(message_id, "target_resolved", Some(&reason))?;
@@ -583,6 +594,7 @@ pub fn deliver_pending_message(
                 stage: Some(DeliveryStage::Inject),
                 reason: None,
                 channel: None,
+                ack_forced_off: false,
             });
         }
     };
@@ -642,6 +654,7 @@ pub fn deliver_pending_message(
                 stage: Some(DeliveryStage::Submit),
                 reason: None,
                 channel: None,
+                ack_forced_off: false,
             });
         }
         store.mark(message_id, "submitted_unverified", Some(&reason))?;
@@ -654,6 +667,7 @@ pub fn deliver_pending_message(
             stage: Some(DeliveryStage::Submit),
             reason: None,
             channel: None,
+            ack_forced_off: false,
         });
     }
     // S1-CAPTURE-001 (0.4.8, CR M4 Claude phase-1): for Claude/ClaudeCode
@@ -718,6 +732,7 @@ pub fn deliver_pending_message(
                 stage: Some(DeliveryStage::Submit),
                 reason: None,
                 channel: None,
+                ack_forced_off: false,
             });
         }
     }
@@ -766,6 +781,7 @@ pub fn deliver_pending_message(
         stage: None,
         reason: None,
         channel: None,
+        ack_forced_off: false,
     };
     stamp_first_send_at_if_leader_to_worker_scoped(
         workspace,
@@ -847,6 +863,7 @@ pub(crate) fn mark_worker_target_missing(
         stage: Some(DeliveryStage::Inject),
         reason: Some(DeliveryRefusal::TmuxTargetMissing),
         channel: Some("delivery_blocked".to_string()),
+        ack_forced_off: false,
     })
 }
 
@@ -1000,6 +1017,7 @@ fn deliver_leader_via_app_server(
                 stage: None,
                 reason: None,
                 channel: Some("codex_app_server".to_string()),
+                ack_forced_off: false,
             })
         }
         Err(error) => app_server_delivery_failure(
@@ -1045,6 +1063,7 @@ fn app_server_delivery_failure(
                 stage: None,
                 reason: Some(DeliveryRefusal::RecipientBusy),
                 channel: Some("leader_busy".to_string()),
+                ack_forced_off: false,
             })
         }
         crate::codex_app_server::AppServerError::ThreadStale { expected, actual } => {
@@ -1083,6 +1102,7 @@ fn app_server_delivery_failure(
                 stage: None,
                 reason: Some(DeliveryRefusal::MissingPermissions),
                 channel: Some("codex_app_server".to_string()),
+                ack_forced_off: false,
             })
         }
         crate::codex_app_server::AppServerError::ProtocolMismatch(_)
@@ -1134,6 +1154,7 @@ fn rebind_required_outcome(message_id: &str, action: &str) -> DeliveryOutcome {
         stage: None,
         reason: Some(DeliveryRefusal::LeaderNotAttached),
         channel: Some("rebind_required".to_string()),
+        ack_forced_off: false,
     }
 }
 
@@ -1536,6 +1557,7 @@ fn leader_receiver_transport_conflict_outcome(
                 stage: None,
                 reason: Some(DeliveryRefusal::LeaderNotAttached),
                 channel: Some("rebind_required".to_string()),
+                ack_forced_off: false,
             }));
         }
     }
@@ -2106,6 +2128,7 @@ fn leader_acceptance_pending_outcome(message_id: &str, status: &str) -> Delivery
         stage: Some(DeliveryStage::Submit),
         reason: None,
         channel: Some("leader_acceptance_pending".to_string()),
+        ack_forced_off: false,
     }
 }
 
@@ -2119,6 +2142,7 @@ pub(crate) fn leader_receipt_source_unavailable_outcome(message_id: &str) -> Del
         stage: Some(DeliveryStage::Submit),
         reason: None,
         channel: Some("leader_receipt_source_unavailable".to_string()),
+        ack_forced_off: false,
     }
 }
 
@@ -2159,6 +2183,7 @@ fn observe_pending_leader_acceptance(
         stage: None,
         reason: None,
         channel: Some("leader_receiver".to_string()),
+        ack_forced_off: false,
     })
 }
 
@@ -2188,6 +2213,7 @@ pub fn handle_trust_retry_needed(
             stage: Some(DeliveryStage::TrustAutoAnswerDismissalWait),
             reason: None,
             channel: None,
+            ack_forced_off: false,
         });
     }
     let next_attempt = payload.attempt.saturating_add(1);
@@ -2227,6 +2253,7 @@ pub fn handle_trust_retry_needed(
         stage: Some(DeliveryStage::TrustAutoAnswerDismissalWait),
         reason: None,
         channel: None,
+        ack_forced_off: false,
     })
 }
 
@@ -2723,6 +2750,7 @@ fn refuse_owner_team_resolution(
         stage: None,
         reason: Some(refusal),
         channel: Some("owner_team_resolution".to_string()),
+        ack_forced_off: false,
     })
 }
 
@@ -2779,6 +2807,7 @@ pub fn retry_injection_after_trust_auto_answer(
         stage: Some(DeliveryStage::TrustAutoAnswerDismissalWait),
         reason: None,
         channel: None,
+        ack_forced_off: false,
     })
 }
 

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

@@ -294,6 +294,7 @@ pub(crate) fn fail_leader_delivery(
             stage: None,
             reason: Some(reason),
             channel: Some("fallback_log".to_string()),
+            ack_forced_off: false,
         });
     };
     store.mark(&message_id, "failed", error)?;
@@ -310,6 +311,7 @@ pub(crate) fn fail_leader_delivery(
         stage: None,
         reason: Some(reason),
         channel: Some("fallback_inbox".to_string()),
+        ack_forced_off: false,
     })
 }
 

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

@@ -133,6 +133,7 @@ pub fn send_to_leader_receiver_with_presentation(
                 stage: None,
                 reason: Some(DeliveryRefusal::Duplicate),
                 channel: Some("leader_receiver".to_string()),
+                ack_forced_off: requires_ack,
             });
         }
         PersistResolution::Persisted(persisted) => persisted.message_id,
@@ -174,6 +175,7 @@ pub fn send_to_leader_receiver_with_presentation(
                 stage: None,
                 reason: None,
                 channel: Some("leader_receiver".to_string()),
+                ack_forced_off: requires_ack,
             });
         }
     }
@@ -210,6 +212,7 @@ pub fn send_to_leader_receiver_with_presentation(
         stage: None,
         reason: None,
         channel: Some("leader_receiver".to_string()),
+        ack_forced_off: requires_ack,
     })
 }
 
@@ -255,6 +258,7 @@ pub fn deliver_to_leader_fallback_pane(
             stage: None,
             reason: None,
             channel: Some("leader_receiver".to_string()),
+            ack_forced_off: false,
         });
     }
 
@@ -269,6 +273,7 @@ pub fn deliver_to_leader_fallback_pane(
             stage: None,
             reason: None,
             channel: Some("leader_receiver".to_string()),
+            ack_forced_off: false,
         });
     }
 
@@ -310,6 +315,7 @@ pub fn deliver_to_leader_fallback_pane(
             stage: None,
             reason: Some(DeliveryRefusal::LeaderNotAttached),
             channel: Some("fallback_pane".to_string()),
+            ack_forced_off: false,
         });
     };
 
@@ -383,6 +389,7 @@ pub fn deliver_to_leader_fallback_pane(
             stage: None,
             reason: Some(DeliveryRefusal::LeaderNotAttached),
             channel: Some("rebind_required".to_string()),
+            ack_forced_off: false,
         });
     };
     let target = Target::Pane(PaneId::new(channel.pane_id));
@@ -435,6 +442,7 @@ pub fn deliver_to_leader_fallback_pane(
                             stage: Some(DeliveryStage::Submit),
                             reason: None,
                             channel: Some("leader_acceptance_pending".to_string()),
+                            ack_forced_off: false,
                         });
                     }
                     super::delivery::LeaderReceiptObservation::TokenObserved => {}
@@ -461,6 +469,7 @@ pub fn deliver_to_leader_fallback_pane(
                     stage: None,
                     reason: None,
                     channel: Some("fallback_pane".to_string()),
+                    ack_forced_off: false,
                 })
             } else {
                 let reason = format!(
@@ -486,6 +495,7 @@ pub fn deliver_to_leader_fallback_pane(
                     stage: Some(DeliveryStage::Submit),
                     reason: None,
                     channel: Some("fallback_pane".to_string()),
+                    ack_forced_off: false,
                 })
             }
         }
@@ -527,6 +537,7 @@ pub fn deliver_to_leader_fallback_pane(
                 stage: None,
                 reason: Some(DeliveryRefusal::TmuxTargetMissing),
                 channel: Some(channel),
+                ack_forced_off: false,
             })
         }
     }
@@ -718,5 +729,6 @@ pub fn enqueue_leader_mailbox_until_attach(
         stage: None,
         reason: None,
         channel: Some("leader_mailbox".to_string()),
+        ack_forced_off: false,
     })
 }

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

@@ -76,6 +76,7 @@ pub mod selftest;
 pub mod send;
 pub mod trust;
 pub mod types;
+pub mod wait;
 pub mod watchers;
 
 // ── re-export: 保持 `crate::messaging::X` 与 test `super::X` 解析不变 ──────────
@@ -118,6 +119,7 @@ pub use types::{
     TrustRetryPayload, WatcherNotice, WorkerRuntimeState, RESULT_DELIVERY_MAX_ATTEMPTS,
     SEND_RETRY_MAX_ATTEMPTS, TRUST_RETRY_BACKOFF_SECONDS, TRUST_RETRY_MAX_ATTEMPTS,
 };
+pub use wait::{wait_for_result, WaitResult};
 pub use watchers::{
     format_result_watcher_notification, requeue_after_claim_leader,
     requeue_delivery_exhausted_watchers, result_id_from_text, retry_result_deliveries,

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

@@ -842,6 +842,7 @@ fn report_result_for_owner_team_inner(
         return Ok(serde_json::Value::Object(out));
     }
     let event_log = EventLog::new(workspace);
+    super::watchers::notify_fifo_result_watchers(&conn, &event_log, task_id, &result_id)?;
     if presentation.effective_sink != super::presentation::PresentationSink::Leader {
         event_log.write(
             "presentation.stored_without_live_inject",
@@ -938,6 +939,7 @@ fn report_result_for_owner_team_inner(
                 stage: None,
                 reason: Some(crate::messaging::DeliveryRefusal::LeaderNotAttached),
                 channel: Some("codex_app_server".to_string()),
+                ack_forced_off: false,
             }
         }
         Err(error) => {
@@ -1002,6 +1004,7 @@ fn report_result_for_owner_team_inner(
                         stage: None,
                         reason: None,
                         channel: Some("leader_receiver".to_string()),
+                        ack_forced_off: false,
                     };
                     break;
                 }
@@ -1031,6 +1034,7 @@ fn report_result_for_owner_team_inner(
                         stage: None,
                         reason: None,
                         channel: Some("leader_receiver".to_string()),
+                        ack_forced_off: false,
                     };
                     break;
                 }
@@ -1046,6 +1050,7 @@ fn report_result_for_owner_team_inner(
                         stage: None,
                         reason: None,
                         channel: Some("leader_receiver".to_string()),
+                        ack_forced_off: false,
                     };
                     break;
                 }

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

@@ -214,6 +214,7 @@ pub fn send_message(
                 stage: None,
                 reason: Some(crate::messaging::DeliveryRefusal::EmptyTargetList),
                 channel: None,
+                ack_forced_off: false,
             });
         }
         MessageTarget::Fanout(recipients) => {
@@ -351,6 +352,7 @@ pub fn send_message(
         stage: None,
         reason: None,
         channel: None,
+        ack_forced_off: false,
     })
 }
 
@@ -404,6 +406,7 @@ fn persist_stored_only_send(
         stage: None,
         reason: None,
         channel: Some(presentation.effective_sink.as_str().to_string()),
+        ack_forced_off: false,
     })
 }
 
@@ -451,6 +454,7 @@ fn refused_outcome_with_id(reason: DeliveryRefusal, message_id: Option<String>)
         stage: None,
         reason: Some(reason),
         channel: None,
+        ack_forced_off: false,
     }
 }
 
@@ -467,6 +471,7 @@ fn refused_outcome_with_verification(
         stage: None,
         reason: Some(reason),
         channel: None,
+        ack_forced_off: false,
     }
 }
 
@@ -549,6 +554,7 @@ fn coordinator_unavailable_outcome(
             stage: None,
             reason: Some(DeliveryRefusal::CoordinatorUnavailable),
             channel: Some("coordinator_unavailable".to_string()),
+            ack_forced_off: false,
         },
     }))
 }
@@ -573,6 +579,7 @@ fn rebind_required_outcome_with_verification(
         stage: None,
         reason: Some(DeliveryRefusal::LeaderNotAttached),
         channel: Some("rebind_required".to_string()),
+        ack_forced_off: false,
     }
 }
 
@@ -804,6 +811,7 @@ pub(crate) fn session_drift_refusal(
         stage: None,
         reason: Some(DeliveryRefusal::SessionDrift),
         channel: None,
+        ack_forced_off: false,
     }))
 }
 
@@ -924,5 +932,6 @@ fn fanout_send(
         } else {
             channel_label.to_string()
         }),
+        ack_forced_off: false,
     })
 }

package/crates/team-agent/src/messaging/tests/runtime.rs

@@ -709,6 +709,38 @@ fn report_result_invalid_envelope_errors_validation() {
     );
 }
 
+#[test]
+fn leader_receiver_reports_requires_ack_forced_off() {
+    let ws = tmp_ws("ack-forced-off");
+    let log = EventLog::new(&ws);
+    let state = json(serde_json::json!({
+        "active_team_key": "team-a",
+        "teams": {"team-a": {}}
+    }));
+
+    let outcome = send_to_leader_receiver(
+        &ws,
+        &state,
+        "leader",
+        "ack contract probe",
+        None,
+        "worker",
+        true,
+        None,
+        &log,
+    )
+    .unwrap();
+
+    let value = crate::mcp_server::helpers::delivery_outcome_value(&outcome);
+    assert_eq!(
+        value
+            .get("ack_forced_off")
+            .and_then(serde_json::Value::as_bool),
+        Some(true),
+        "requires_ack=true must report that the unavailable ack guarantee was forced off"
+    );
+}
+
 // ════════════════════════════════════════════════════════════════════════
 // GROUP N — notify_result_watchers dedupe (exactly-once, Gap 32/38).
 // result_delivery.py:38-132. superseded for duplicate watchers same result.

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

@@ -295,6 +295,8 @@ pub enum PaneWidthQuery {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DeliveryOutcome {
     pub ok: bool,
+    /// Whether a caller-requested ack guarantee was unavailable and forced off.
+    pub ack_forced_off: bool,
     /// 投递层结果态 (≠ 行态)。
     pub status: DeliveryStatus,
     /// step 7 `messages.status` 行态原文 (shadow;leader 集成时收口为 step 7 enum)。