@team-agent/installer 0.5.45 → 0.5.46

package/crates/team-agent/src/lifecycle/restart/rebuild.rs

@@ -428,6 +428,18 @@ fn restart_with_selected_team_and_transport(
     let live_worker_session_deferred_teardown =
         session_live_or_default(transport, &session_name, false)
             && !collect_live_agents_from_state(&state).is_empty();
+    let same_role_cohort_targets =
+        same_role_cohort_targets_from_decisions(&state, spec_workspace, &plan.decisions);
+    let pre_spawn_pane_ids = if live_worker_session_deferred_teardown {
+        transport
+            .list_targets()
+            .map_err(|error| LifecycleError::Transport(error.to_string()))?
+            .into_iter()
+            .map(|pane| pane.pane_id.as_str().to_string())
+            .collect::<std::collections::BTreeSet<_>>()
+    } else {
+        std::collections::BTreeSet::new()
+    };
     if session_live_or_default(transport, &session_name, false)
         && !live_worker_session_deferred_teardown
     {
@@ -779,6 +791,46 @@ fn restart_with_selected_team_and_transport(
         );
     }
     // END_B5_RESTART_ISOLATION_LOOP
+    if live_worker_session_deferred_teardown {
+        let successful_agent_ids = successful_agents
+            .iter()
+            .map(|agent| agent.agent_id.as_str())
+            .collect::<std::collections::BTreeSet<_>>();
+        let old_successful_targets = same_role_cohort_targets
+            .iter()
+            .filter(|target| successful_agent_ids.contains(target.agent_id.as_str()))
+            .cloned()
+            .collect::<Vec<_>>();
+        let successful_targets =
+            same_role_cohort_targets_from_decisions(&state, spec_workspace, &successful_agents);
+        let actual_spawn_panes = actual_successful_restart_spawn_panes(
+            transport,
+            &session_name,
+            &successful_targets,
+            &pre_spawn_pane_ids,
+        )?;
+        if let Some(error) =
+            actual_restart_spawn_binding_error(&successful_targets, &actual_spawn_panes)
+        {
+            cleanup_actual_restart_spawns(transport, &actual_spawn_panes);
+            return Err(LifecycleError::RequirementUnmet(error));
+        }
+        if let Err(error) =
+            retire_expected_same_role_cohorts(transport, "restart", &old_successful_targets)
+        {
+            cleanup_actual_restart_spawns(transport, &actual_spawn_panes);
+            return Err(LifecycleError::RequirementUnmet(error));
+        }
+        if let Some(error) = same_role_cohort_exactly_one_error(
+            transport,
+            &session_name,
+            "restart",
+            &successful_targets,
+        ) {
+            cleanup_actual_restart_spawns(transport, &actual_spawn_panes);
+            return Err(LifecycleError::RequirementUnmet(error));
+        }
+    }
     let mut topology_authority_agent_ids = successful_agents
         .iter()
         .map(|agent| agent.agent_id.as_str().to_string())
@@ -2090,6 +2142,122 @@ fn mark_fake_harness_agent_respawned(
     agent.insert("owner_team_id".to_string(), serde_json::json!(team_key));
 }
 
+fn same_role_cohort_targets_from_decisions(
+    state: &serde_json::Value,
+    spec_workspace: &Path,
+    agents: &[RestartedAgent],
+) -> Vec<SameRoleCohortTarget> {
+    let mut targets = Vec::new();
+    for restarted in agents {
+        let agent_id = &restarted.agent_id;
+        let raw_agent = state
+            .get("agents")
+            .and_then(|agents| agents.get(agent_id.as_str()));
+        let effective_agent = raw_agent.map(|agent| {
+            rehydrate_agent_command_context_from_spec(spec_workspace, agent_id, agent)
+        });
+        if effective_agent
+            .as_ref()
+            .and_then(|agent| agent.get("provider"))
+            .and_then(serde_json::Value::as_str)
+            .is_some_and(|provider| provider.eq_ignore_ascii_case("fake"))
+        {
+            continue;
+        }
+        let window = raw_agent
+            .and_then(|agent| agent.get("window"))
+            .and_then(serde_json::Value::as_str)
+            .filter(|value| !value.is_empty())
+            .unwrap_or_else(|| agent_id.as_str());
+        if is_per_agent_cohort_window(window, agent_id) {
+            let expected_pane_id = raw_agent
+                .and_then(|agent| agent.get("pane_id"))
+                .and_then(serde_json::Value::as_str)
+                .filter(|value| !value.is_empty());
+            targets.push(
+                SameRoleCohortTarget::new(agent_id, window).with_expected_pane_id(expected_pane_id),
+            );
+        }
+    }
+    targets
+}
+
+fn actual_successful_restart_spawn_panes(
+    transport: &dyn crate::transport::Transport,
+    session_name: &SessionName,
+    targets: &[SameRoleCohortTarget],
+    pre_spawn_pane_ids: &std::collections::BTreeSet<String>,
+) -> Result<Vec<crate::transport::PaneInfo>, LifecycleError> {
+    let windows = targets
+        .iter()
+        .map(|target| target.window.as_str())
+        .collect::<std::collections::BTreeSet<_>>();
+    let panes = transport
+        .list_targets()
+        .map_err(|error| LifecycleError::Transport(error.to_string()))?
+        .into_iter()
+        .filter(|pane| !pre_spawn_pane_ids.contains(pane.pane_id.as_str()))
+        .filter(|pane| pane.session.as_str() == session_name.as_str())
+        .filter(|pane| {
+            pane.window_name
+                .as_ref()
+                .is_some_and(|window| windows.contains(window.as_str()))
+        })
+        .filter(|pane| {
+            transport
+                .liveness(&pane.pane_id)
+                .is_ok_and(|state| state == crate::transport::PaneLiveness::Live)
+        })
+        .collect();
+    Ok(panes)
+}
+
+fn actual_restart_spawn_binding_error(
+    targets: &[SameRoleCohortTarget],
+    actual_spawn_panes: &[crate::transport::PaneInfo],
+) -> Option<String> {
+    let mut mismatches = Vec::new();
+    for target in targets {
+        let observed = actual_spawn_panes
+            .iter()
+            .filter(|pane| {
+                pane.window_name
+                    .as_ref()
+                    .is_some_and(|window| window.as_str() == target.window)
+            })
+            .map(|pane| pane.pane_id.as_str().to_string())
+            .collect::<Vec<_>>();
+        if observed.len() != 1
+            || target.expected_pane_id.as_deref() != observed.first().map(String::as_str)
+        {
+            mismatches.push(format!(
+                "{}:window={}:expected_pane={}:actual_spawn_panes=[{}]",
+                target.agent_id,
+                target.window,
+                target.expected_pane_id.as_deref().unwrap_or("<missing>"),
+                observed.join(",")
+            ));
+        }
+    }
+    if mismatches.is_empty() {
+        None
+    } else {
+        Some(format!(
+            "restart refused: spawn identity/binding mismatch; {}",
+            mismatches.join("; ")
+        ))
+    }
+}
+
+fn cleanup_actual_restart_spawns(
+    transport: &dyn crate::transport::Transport,
+    actual_spawn_panes: &[crate::transport::PaneInfo],
+) {
+    for pane in actual_spawn_panes {
+        let _ = transport.kill_pane(&pane.pane_id);
+    }
+}
+
 fn write_fake_harness_spawn_argv_event(
     workspace: &Path,
     decision: &RestartedAgent,

package/crates/team-agent/src/lifecycle/tests/agent_ops.rs

@@ -402,6 +402,11 @@ case "$*" in
     ;;
 esac
 case "$*" in
+  *"new-window "*|*"new-session "*)
+    : > "$spawned_marker"
+    printf '%%9288\n'
+    exit 0
+    ;;
   *"display-message -p -t $pane #{pane_id}"*)
     if [ -f "$killed_marker" ]; then
       echo "can't find pane: $pane" >&2
@@ -410,11 +415,6 @@ case "$*" in
     printf '%s\n' "$pane"
     exit 0
     ;;
-  *"display-message -p -t $session:alpha #{pane_id}"*)
-    : > "$spawned_marker"
-    printf '%%9288\n'
-    exit 0
-    ;;
   *"list-windows -t $session -F #{window_name}"*)
     exit 0
     ;;
@@ -873,8 +873,8 @@ fn reset_agent_stop_not_proven_grep_guard_hard_gate_wired() {
         "reset_agent_at_paths must emit reset_agent.stop_not_proven via the writer"
     );
     assert!(
-        contents.contains("if !agent_is_paused && !stop.stopped"),
-        "gate must run only when stop.stopped=false (the dangerous case)"
+        contents.contains("if !agent_is_paused {"),
+        "gate must run after stop for every non-paused reset, including stop.stopped=true residue"
     );
     assert!(
         contents.contains("list_same_role_panes") && contents.contains("is_per_agent_window"),

package/crates/team-agent/src/lifecycle/tests/phase_b_contracts.rs

@@ -744,7 +744,7 @@ impl Transport for BRealTransport {
         if matches!(self.mode, BRealMode::Misowned) {
             targets.push(pane_info("team-phaseb", "w2", "%5", 502));
         }
-        if matches!(self.mode, BRealMode::Owned) {
+        if matches!(self.mode, BRealMode::Owned) && !self.spawns.lock().unwrap().is_empty() {
             targets.push(pane_info("team-phaseb", "w1", "%10", 501));
         }
         Ok(targets)

package/crates/team-agent/src/lifecycle/tests/phase_golden.rs

@@ -553,6 +553,9 @@ fn normalize_value(value: Value, ctx: &mut NormalizeCtx, key: Option<&str>) -> V
             let sorted = map.into_iter().collect::<BTreeMap<_, _>>();
             let mut out = Map::new();
             for (child_key, child) in sorted {
+                if matches!(child_key.as_str(), "model_source" | "provider_source") {
+                    continue;
+                }
                 out.insert(
                     child_key.clone(),
                     normalize_value(child, ctx, Some(child_key.as_str())),

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

@@ -632,6 +632,9 @@ pub enum ResetAgentOutcome {
         discarded_session_id: Option<SessionId>,
         session_id: Option<SessionId>,
         new_session_id: Option<SessionId>,
+        capture_state: String,
+        reset_proof: String,
+        weak_reset_warning: Option<String>,
     },
     /// 未传 discard_session → 拒绝(不丢上下文的误用保护)。
     Refused { reason: ResetRefusal },

package/crates/team-agent/src/mcp_server/lifecycle_tools/agent_ops.rs

@@ -67,6 +67,9 @@ pub(crate) fn reset_agent(
             discarded_session_id,
             session_id,
             new_session_id,
+            capture_state,
+            reset_proof,
+            weak_reset_warning,
         } => Ok(ToolOk {
             fields: object_fields(serde_json::json!({
                 "ok": true,
@@ -78,6 +81,13 @@ pub(crate) fn reset_agent(
                 "discarded_session_id": discarded_session_id.as_ref().map(|id| id.as_str()),
                 "session_id": session_id.as_ref().map(|id| id.as_str()),
                 "new_session_id": new_session_id.as_ref().map(|id| id.as_str()),
+                "capture_state": match capture_state.as_str() {
+                    "captured" => "captured",
+                    "attribution_ambiguous" => "attribution_ambiguous",
+                    _ => "transcript_missing",
+                },
+                "reset_proof": if reset_proof == "weak" { "weak" } else { "strong" },
+                "weak_reset_warning": weak_reset_warning,
             })),
         }),
         ResetAgentOutcome::Refused { reason } => Ok(ToolOk {

package/crates/team-agent/src/provider/session/capture.rs

@@ -8,6 +8,7 @@ use crate::provider::{
     CaptureSessionContext, CapturedSession, CapturedSessionCandidate, Provider, ProviderAdapter,
     ProviderError, SessionId,
 };
+use crate::state::identity_keys::SessionAttributionKey;
 
 pub const SESSION_CAPTURE_CONVERGENCE_DEADLINE_MS: u64 = 12_000;
 pub const SESSION_CAPTURE_CONVERGENCE_POLL_MS: u64 = 250;
@@ -638,6 +639,7 @@ pub fn incomplete_interacted_resumable_agent_ids(state: &Value) -> Vec<String> {
 struct PendingSessionCapture {
     agent_id: String,
     provider: Provider,
+    team_key: String,
     context: CaptureSessionContext,
 }
 
@@ -673,6 +675,13 @@ where
     Some(PendingSessionCapture {
         agent_id: agent_id.to_string(),
         provider,
+        team_key: agent
+            .get("owner_team_id")
+            .or_else(|| agent.get("team_key"))
+            .and_then(Value::as_str)
+            .filter(|s| !s.is_empty())
+            .unwrap_or("current")
+            .to_string(),
         context: CaptureSessionContext {
             agent_id: agent_id.to_string(),
             spawn_cwd: PathBuf::from(spawn_cwd),
@@ -883,14 +892,14 @@ fn allocate_session_candidates(
                     .as_ref()
                     .is_some_and(|sid| sid.as_str() == expected.as_str())
             })
-            .filter(|candidate| !candidate_keys_collide(candidate, claimed))
+            .filter(|candidate| !candidate_keys_collide(item, candidate, claimed))
             .collect();
         // Uniqueness requirement: only assign when the expected id maps to
         // exactly one available candidate. Multiple matches or a colliding
         // single match leave the agent for the ambiguity path below.
         if exact_matches.len() == 1 {
             let candidate = exact_matches[0].clone();
-            claimed.extend(captured_provider_session_keys(&candidate.captured));
+            claimed.extend(captured_provider_session_keys(item, &candidate.captured));
             assignments.insert(item.agent_id.clone(), candidate);
         }
     }
@@ -903,8 +912,9 @@ fn allocate_session_candidates(
             candidates_by_agent.get(&item.agent_id),
             claimed,
             CandidateMatchKind::PositiveAgentId,
+            item,
         ) {
-            claimed.extend(captured_provider_session_keys(&candidate.captured));
+            claimed.extend(captured_provider_session_keys(item, &candidate.captured));
             assignments.insert(item.agent_id.clone(), candidate);
         }
     }
@@ -916,8 +926,9 @@ fn allocate_session_candidates(
             candidates_by_agent.get(&item.agent_id),
             claimed,
             CandidateMatchKind::PathAgentId,
+            item,
         ) {
-            claimed.extend(captured_provider_session_keys(&candidate.captured));
+            claimed.extend(captured_provider_session_keys(item, &candidate.captured));
             assignments.insert(item.agent_id.clone(), candidate);
         }
     }
@@ -953,9 +964,10 @@ fn allocate_session_candidates(
             candidates_by_agent.get(&item.agent_id),
             claimed,
             CandidateMatchKind::Any,
+            item,
         ) {
             Some(candidate) => {
-                claimed.extend(captured_provider_session_keys(&candidate.captured));
+                claimed.extend(captured_provider_session_keys(item, &candidate.captured));
                 assignments.insert(item.agent_id.clone(), candidate);
             }
             None => {
@@ -995,11 +1007,14 @@ fn allocate_global_one_to_one(
         let Some(agent_candidates) = candidates_by_agent.get(agent_id) else {
             return;
         };
+        let Some(owner) = pending.iter().find(|item| item.agent_id == *agent_id) else {
+            continue;
+        };
         for candidate in agent_candidates {
-            if candidate_keys_collide(candidate, claimed) {
+            if candidate_keys_collide(owner, candidate, claimed) {
                 continue;
             }
-            let key = candidate_key(candidate);
+            let key = candidate_key(owner, candidate);
             if key.is_empty() {
                 continue;
             }
@@ -1010,7 +1025,9 @@ fn allocate_global_one_to_one(
         return;
     }
     for (agent_id, candidate) in remaining_agents.into_iter().zip(candidates.into_values()) {
-        claimed.extend(captured_provider_session_keys(&candidate.captured));
+        if let Some(item) = pending.iter().find(|item| item.agent_id == agent_id) {
+            claimed.extend(captured_provider_session_keys(item, &candidate.captured));
+        }
         assignments.insert(agent_id, candidate);
     }
 }
@@ -1035,6 +1052,7 @@ fn unique_available_candidate(
     candidates: Option<&Vec<CapturedSessionCandidate>>,
     claimed: &BTreeSet<String>,
     match_kind: CandidateMatchKind,
+    owner: &PendingSessionCapture,
 ) -> Option<CapturedSessionCandidate> {
     let matches = candidates?
         .iter()
@@ -1043,7 +1061,7 @@ fn unique_available_candidate(
             CandidateMatchKind::PathAgentId => candidate.agent_path_match,
             CandidateMatchKind::Any => true,
         })
-        .filter(|candidate| !candidate_keys_collide(candidate, claimed))
+        .filter(|candidate| !candidate_keys_collide(owner, candidate, claimed))
         .cloned()
         .collect::<Vec<_>>();
     if matches.len() == 1 {
@@ -1061,16 +1079,17 @@ enum CandidateMatchKind {
 }
 
 fn candidate_keys_collide(
+    owner: &PendingSessionCapture,
     candidate: &CapturedSessionCandidate,
     claimed: &BTreeSet<String>,
 ) -> bool {
-    captured_provider_session_keys(&candidate.captured)
+    captured_provider_session_keys(owner, &candidate.captured)
         .iter()
         .any(|key| claimed.contains(key))
 }
 
-fn candidate_key(candidate: &CapturedSessionCandidate) -> String {
-    captured_provider_session_keys(&candidate.captured)
+fn candidate_key(owner: &PendingSessionCapture, candidate: &CapturedSessionCandidate) -> String {
+    captured_provider_session_keys(owner, &candidate.captured)
         .into_iter()
         .collect::<Vec<_>>()
         .join("|")
@@ -1130,12 +1149,13 @@ fn claimed_provider_session_keys(
     pending_ids: &BTreeSet<String>,
 ) -> BTreeSet<String> {
     let mut keys = BTreeSet::new();
+    let team_key = crate::state::projection::team_state_key(state);
     // 1. Non-pending worker sessions (existing behaviour).
     for (agent_id, agent) in agents {
         if pending_ids.contains(agent_id) {
             continue;
         }
-        push_provider_session_keys(&mut keys, agent);
+        push_provider_session_keys(&mut keys, &team_key, agent_id, agent);
     }
     // 2. P0 (lane-046-capture-gap): leader anchor sessions. The leader's
     //    own provider transcript must never be attributed to a worker. Scan
@@ -1152,14 +1172,39 @@ fn claimed_provider_session_keys(
     keys
 }
 
-fn push_provider_session_keys(keys: &mut BTreeSet<String>, value: &Value) {
+fn push_provider_session_keys(
+    keys: &mut BTreeSet<String>,
+    fallback_team_key: &str,
+    fallback_agent_id: &str,
+    value: &Value,
+) {
+    let provider = value
+        .get("provider")
+        .and_then(Value::as_str)
+        .and_then(parse_provider)
+        .unwrap_or(Provider::Fake);
+    let team_key = value
+        .get("owner_team_id")
+        .or_else(|| value.get("team_key"))
+        .and_then(Value::as_str)
+        .filter(|s| !s.is_empty())
+        .unwrap_or(fallback_team_key);
+    let agent_id = value
+        .get("agent_id")
+        .and_then(Value::as_str)
+        .filter(|s| !s.is_empty())
+        .unwrap_or(fallback_agent_id);
     for field in ["session_id", "provider_session_id"] {
         if let Some(session_id) = value
             .get(field)
             .and_then(Value::as_str)
             .filter(|s| !s.is_empty())
         {
-            keys.insert(format!("session:{session_id}"));
+            if let Some(key) = SessionAttributionKey::new(provider, team_key, agent_id, session_id)
+            {
+                keys.insert(session_attribution_key_string(&key));
+            }
+            keys.insert(global_session_attribution_key_string(session_id));
         }
     }
     for field in ["rollout_path", "transcript_path"] {
@@ -1168,7 +1213,10 @@ fn push_provider_session_keys(keys: &mut BTreeSet<String>, value: &Value) {
             .and_then(Value::as_str)
             .filter(|s| !s.is_empty())
         {
-            keys.insert(format!("rollout:{path}"));
+            keys.insert(transcript_attribution_key_string(
+                provider, team_key, agent_id, path,
+            ));
+            keys.insert(global_transcript_attribution_key_string(path));
         }
     }
 }
@@ -1176,25 +1224,68 @@ fn push_provider_session_keys(keys: &mut BTreeSet<String>, value: &Value) {
 fn push_leader_provider_session_keys(keys: &mut BTreeSet<String>, scope: &Value) {
     for anchor in ["leader_receiver", "team_owner"] {
         if let Some(node) = scope.get(anchor) {
-            push_provider_session_keys(keys, node);
+            push_provider_session_keys(keys, "leader", "leader", node);
         }
     }
 }
 
-fn captured_provider_session_keys(captured: &CapturedSession) -> BTreeSet<String> {
+fn captured_provider_session_keys(
+    owner: &PendingSessionCapture,
+    captured: &CapturedSession,
+) -> BTreeSet<String> {
     let mut keys = BTreeSet::new();
+    let team_key = owner.team_key.as_str();
     if let Some(session_id) = &captured.session_id {
-        keys.insert(format!("session:{}", session_id.as_str()));
+        if let Some(key) = SessionAttributionKey::new(
+            owner.provider,
+            team_key,
+            owner.agent_id.as_str(),
+            session_id.as_str(),
+        ) {
+            keys.insert(session_attribution_key_string(&key));
+        }
+        keys.insert(global_session_attribution_key_string(session_id.as_str()));
     }
     if let Some(rollout_path) = &captured.rollout_path {
-        keys.insert(format!(
-            "rollout:{}",
-            rollout_path.as_path().to_string_lossy()
+        let path = rollout_path.as_path().to_string_lossy();
+        keys.insert(transcript_attribution_key_string(
+            owner.provider,
+            team_key,
+            owner.agent_id.as_str(),
+            &path,
         ));
+        keys.insert(global_transcript_attribution_key_string(&path));
     }
     keys
 }
 
+fn session_attribution_key_string(key: &SessionAttributionKey) -> String {
+    format!(
+        "SessionAttributionKey(provider={:?},team={},agent={},session={})",
+        key.provider(),
+        key.team_key(),
+        key.agent_id(),
+        key.session_id()
+    )
+}
+
+fn transcript_attribution_key_string(
+    provider: Provider,
+    team_key: &str,
+    agent_id: &str,
+    path: &str,
+) -> String {
+    format!("TranscriptAttributionKey(provider={provider:?},team={team_key},agent={agent_id},path={path})")
+}
+
+fn global_session_attribution_key_string(session_id: &str) -> String {
+    format!("GlobalSessionAttributionKey(session={session_id})")
+}
+
+fn global_transcript_attribution_key_string(path: &str) -> String {
+    format!("GlobalTranscriptAttributionKey(path={path})")
+}
+
 #[cfg(test)]
 pub(crate) mod test_support {
     use super::*;

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

@@ -14,10 +14,13 @@ pub(super) fn apply_spawned_at_filter(
             Some(p) => p.as_path(),
             None => return false,
         };
-        std::fs::metadata(path)
-            .and_then(|meta| meta.modified())
-            .map(|mtime| mtime >= cutoff)
-            .unwrap_or(false)
+        match codex_rollout_created_at(path) {
+            Some(created_at) => created_at >= cutoff,
+            None => std::fs::metadata(path)
+                .and_then(|meta| meta.modified())
+                .map(|mtime| mtime >= cutoff)
+                .unwrap_or(false),
+        }
     });
 }
 
@@ -27,6 +30,50 @@ pub(super) fn parse_spawned_at(raw: &str) -> Option<std::time::SystemTime> {
         .map(|dt| std::time::SystemTime::from(dt.with_timezone(&chrono::Utc)))
 }
 
+fn codex_rollout_created_at(path: &std::path::Path) -> Option<std::time::SystemTime> {
+    created_at_from_rollout_head(path).or_else(|| created_at_from_rollout_filename(path))
+}
+
+fn created_at_from_rollout_head(path: &std::path::Path) -> Option<std::time::SystemTime> {
+    let text = super::common::read_head_text(path, super::common::CAPTURE_HEAD_BYTES).ok()?;
+    super::common::parse_session_records(&text)
+        .iter()
+        .find_map(record_created_at)
+        .and_then(|raw| parse_spawned_at(&raw))
+}
+
+fn record_created_at(record: &serde_json::Value) -> Option<String> {
+    record
+        .get("created_at")
+        .and_then(serde_json::Value::as_str)
+        .or_else(|| {
+            record
+                .get("session_meta")
+                .and_then(|v| v.get("payload"))
+                .or_else(|| record.get("payload"))
+                .and_then(|v| v.get("created_at"))
+                .and_then(serde_json::Value::as_str)
+        })
+        .map(ToString::to_string)
+}
+
+fn created_at_from_rollout_filename(path: &std::path::Path) -> Option<std::time::SystemTime> {
+    let name = path.file_name()?.to_str()?;
+    let start = name.find("rollout-")? + "rollout-".len();
+    let stamp = name.get(start..start + 19)?;
+    if stamp.as_bytes().get(10).copied() != Some(b'T') {
+        return None;
+    }
+    let raw = format!(
+        "{}T{}:{}:{}+00:00",
+        &stamp[0..10],
+        &stamp[11..13],
+        &stamp[14..16],
+        &stamp[17..19]
+    );
+    parse_spawned_at(&raw)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;