meerkat_core/

session.rs

//! Session management for Meerkat
//!
//! A session represents a conversation history that can be persisted and resumed.
//!
//! # Performance
//!
//! Sessions use Arc-based copy-on-write for message storage:
//! - `fork()` shares the message buffer (O(1), no clone)
//! - Mutation (push) triggers CoW only when refcount > 1
//! - `push_batch()` adds multiple messages with a single timestamp update

use crate::Provider;
use crate::generated::{session_document, session_persistence_version_authority};
use crate::lifecycle::run_primitive::TurnMetadataOverride;
use crate::lifecycle::{CoreBoundaryStageError, RunId};
use crate::peer_meta::PeerMeta;
use crate::realtime_transcript::{
    RealtimeTranscriptApplyOutcome, RealtimeTranscriptEvent, RealtimeUserContentIdentity,
    SESSION_REALTIME_TRANSCRIPT_STATE_KEY,
};
use crate::realtime_transcript_revision::{self, SessionRealtimeTranscriptState};
use crate::service::{AppendSystemContextRequest, MobToolAuthorityContext};
use crate::session_durable_config_authority;
use crate::time_compat::SystemTime;
#[cfg(target_arch = "wasm32")]
use crate::tokio;
use crate::tool_scope::ToolFilter;
use crate::types::{
    AssistantBlock, BlockAssistantMessage, ContentBlock, ContentInput, Message, SessionId,
    StopReason, ToolDef, ToolName, ToolProvenance, ToolResult, Usage, UserMessage,
};
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use sha2::{Digest, Sha256};
use std::collections::{BTreeMap, BTreeSet, HashMap};
use std::sync::Arc;

/// Current session format version.
///
/// The persisted `version` byte is mandatory and fail-closed: a stored row
/// with a missing or non-current version (including pre-typed-owner v0/v1
/// rows) is rejected at the serde boundary by the generated persistence
/// version authority — it never silently defaults or upgrades on read.
pub use crate::generated::session_persistence_version_authority::SESSION_VERSION;

/// Current `SessionMetadata` schema version. Distinct from `SESSION_VERSION`
/// so `SessionMetadata` can evolve independently of the Session envelope.
///
/// Mandatory and fail-closed on read, same contract as `SESSION_VERSION`.
pub use crate::generated::session_persistence_version_authority::SESSION_METADATA_SCHEMA_VERSION;

/// Current session format version accepted by generated persistence authority.
pub fn session_version() -> u32 {
    session_persistence_version_authority::session_envelope_version()
}

/// Current `SessionMetadata` schema version accepted by generated persistence authority.
pub fn session_metadata_schema_version() -> u32 {
    session_persistence_version_authority::session_metadata_schema_version()
}

/// Typed transcript replacement used to create an edited fork.
///
/// Replacements never mutate the source session in place. The owning service
/// applies this to a forked prefix, producing a new `SessionId`.
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum TranscriptReplacement {
    /// Replace the addressed message with a full canonical message.
    Message { message: Message },
    /// Replace one user-message content block.
    UserContentBlock {
        block_index: usize,
        block: ContentBlock,
    },
    /// Replace one block in a block-assistant message.
    AssistantBlock {
        block_index: usize,
        block: AssistantBlock,
    },
    /// Replace one content block inside one tool-result payload.
    ToolResultContentBlock {
        result_index: usize,
        block_index: usize,
        block: ContentBlock,
    },
}

/// Session metadata key for the typed transcript revision graph head.
pub const SESSION_TRANSCRIPT_HISTORY_STATE_KEY: &str = "session_transcript_history_state_v1";

/// Storage-representation witness for transcript history that an incremental
/// session store keeps out of line.
///
/// A full session carries [`SESSION_TRANSCRIPT_HISTORY_STATE_KEY`]. A slim
/// incremental projection carries this digest instead, allowing the typed
/// checkpoint digest to bind the same semantic history without rehydrating
/// every retained revision on each read. Only typed store code may author it.
pub const SESSION_TRANSCRIPT_HISTORY_CHECKPOINT_DIGEST_KEY: &str =
    "session_transcript_history_checkpoint_digest_v1";

/// A concrete transcript span selected for same-session rewrite.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum TranscriptRewriteSelection {
    /// Pre-semantic-marker range retained for source/API compatibility and
    /// decoding prior durable records. New commits canonicalize this input to
    /// [`TranscriptRewriteSelection::EditMessageRange`] before persistence.
    MessageRange { start: usize, end: usize },
    /// Current typed ordinary-edit semantic.
    EditMessageRange { range: TranscriptEditRewriteRange },
    /// Replace a full transcript from a core-validated compaction rebuild.
    ///
    /// The range payload has no public constructor. New values are minted only
    /// by the validated compaction path; deserialization exists solely for the
    /// durable transcript graph and is revalidated against its retained bodies.
    CompactionMessageRange { range: CompactionRewriteRange },
}

/// Opaque current-format range carried by an ordinary transcript edit.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
pub struct TranscriptEditRewriteRange {
    start: usize,
    end: usize,
}

/// Opaque range carried by the typed compaction rewrite semantic.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
pub struct CompactionRewriteRange {
    start: usize,
    end: usize,
}

/// Canonical semantic class of a transcript rewrite.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum TranscriptRewriteSemantic {
    /// Ordinary same-session edit.
    Edit,
    /// Core-validated context compaction.
    Compaction,
}

impl TranscriptRewriteSelection {
    /// Return the selected half-open message range without exposing the
    /// authority-bearing representation used to classify the rewrite.
    pub fn bounds(&self) -> (usize, usize) {
        match self {
            Self::MessageRange { start, end } => (*start, *end),
            Self::EditMessageRange { range } => (range.start, range.end),
            Self::CompactionMessageRange { range } => (range.start, range.end),
        }
    }

    pub fn semantic(&self) -> TranscriptRewriteSemantic {
        match self {
            Self::MessageRange { .. } | Self::EditMessageRange { .. } => {
                TranscriptRewriteSemantic::Edit
            }
            Self::CompactionMessageRange { .. } => TranscriptRewriteSemantic::Compaction,
        }
    }

    fn into_current_edit_semantic(self) -> Self {
        match self {
            Self::MessageRange { start, end } => Self::EditMessageRange {
                range: TranscriptEditRewriteRange { start, end },
            },
            current => current,
        }
    }

    fn is_legacy_untyped(&self) -> bool {
        matches!(self, Self::MessageRange { .. })
    }

    fn validated_compaction(
        start: usize,
        end: usize,
        _authority: &crate::agent::compact::ValidatedCompactionRewrite,
    ) -> Self {
        Self::CompactionMessageRange {
            range: CompactionRewriteRange { start, end },
        }
    }

    fn migrated_legacy_compaction(start: usize, end: usize) -> Self {
        Self::CompactionMessageRange {
            range: CompactionRewriteRange { start, end },
        }
    }

    #[cfg(test)]
    pub(crate) fn typed_compaction_for_test(start: usize, end: usize) -> Self {
        Self::CompactionMessageRange {
            range: CompactionRewriteRange { start, end },
        }
    }
}

/// Audit annotation carried with a transcript rewrite commit.
///
/// The free-form kind is for review, debugging, and provenance only. It never
/// classifies a rewrite as compaction; [`TranscriptRewriteSelection`] owns that
/// semantic through its opaque typed compaction range.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[serde(rename_all = "snake_case")]
pub struct TranscriptRewriteReason {
    pub kind: String,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub note: Option<String>,
}

impl TranscriptRewriteReason {
    pub fn new(kind: impl Into<String>) -> Self {
        Self {
            kind: kind.into(),
            note: None,
        }
    }
}

/// Typed rewrite-commit reason for a resume-time base-prompt refresh
/// committed by [`Session::reconcile_resumed_system_prompt`].
pub const RESUME_SYSTEM_PROMPT_REFRESH_REWRITE_REASON: &str = "resume-system-prompt-refresh";

/// Typed outcome of [`Session::reconcile_resumed_system_prompt`].
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum ResumedSystemPromptReconciliation {
    /// The persisted System message already carries the assembled base prompt
    /// (identical, or extended only by runtime system-context appends). The
    /// transcript was left untouched, so the resumed projection digests to
    /// the persisted revision.
    PreservedContinuation,
    /// The assembled base prompt diverged from the persisted System message;
    /// the replacement was committed as a typed transcript rewrite so the
    /// first post-resume persist proves a graph edge from the persisted head.
    RewrittenBase,
    /// The resumed transcript has no leading System message and the assembled
    /// prompt is empty — nothing to reconcile.
    NoChange,
}

impl std::fmt::Display for TranscriptRewriteReason {
    /// Human-facing projection consumed by revision-list reads. The typed
    /// `{kind, note}` audit value is retained; this rendering is derived only
    /// and never supplies rewrite semantic authority.
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        match &self.note {
            Some(note) => write!(f, "{}: {note}", self.kind),
            None => f.write_str(&self.kind),
        }
    }
}

/// Immutable rewrite commit that advances a session transcript head.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[serde(rename_all = "snake_case")]
pub struct TranscriptRewriteCommit {
    pub parent_revision: String,
    pub revision: String,
    pub selection: TranscriptRewriteSelection,
    pub original_span_digest: String,
    pub replacement_digest: String,
    pub messages_before: usize,
    pub messages_after: usize,
    pub reason: TranscriptRewriteReason,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub actor: Option<String>,
    #[cfg_attr(feature = "schema", schemars(with = "SchemaSystemTime"))]
    pub committed_at: SystemTime,
}

/// Immutable transcript revision body retained by the session-local graph.
#[derive(Debug, Clone, Serialize, Deserialize)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[serde(rename_all = "snake_case")]
pub struct TranscriptRevisionBody {
    pub revision: String,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub parent_revision: Option<String>,
    #[cfg_attr(feature = "schema", schemars(with = "Vec<serde_json::Value>"))]
    pub messages: Vec<Message>,
    #[cfg_attr(feature = "schema", schemars(with = "SchemaSystemTime"))]
    pub created_at: SystemTime,
}

#[cfg(feature = "schema")]
#[allow(dead_code)]
#[derive(schemars::JsonSchema)]
#[schemars(rename = "SystemTime")]
struct SchemaSystemTime {
    secs_since_epoch: u64,
    nanos_since_epoch: u32,
}

/// Self-contained append-only transcript rewrite record.
#[derive(Debug, Clone, Serialize)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[serde(rename_all = "snake_case")]
pub struct TranscriptRewriteRecord {
    pub commit: TranscriptRewriteCommit,
    pub parent_body: TranscriptRevisionBody,
    pub revision_body: TranscriptRevisionBody,
}

impl<'de> Deserialize<'de> for TranscriptRewriteRecord {
    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
    where
        D: Deserializer<'de>,
    {
        #[derive(Deserialize)]
        #[serde(rename_all = "snake_case")]
        struct Wire {
            commit: TranscriptRewriteCommit,
            parent_body: TranscriptRevisionBody,
            revision_body: TranscriptRevisionBody,
        }
        let wire = Wire::deserialize(deserializer)?;
        let mut revisions = vec![wire.parent_body, wire.revision_body];
        let mut commits = vec![wire.commit];
        heal_legacy_revision_strings(&mut revisions, &mut commits, None)
            .map_err(serde::de::Error::custom)?;
        heal_legacy_compaction_rewrite_semantics(&mut commits, &revisions);
        let mut revisions = revisions.into_iter();
        let parent_body = revisions
            .next()
            .ok_or_else(|| serde::de::Error::custom("rewrite record lost its parent body"))?;
        let revision_body = revisions
            .next()
            .ok_or_else(|| serde::de::Error::custom("rewrite record lost its revision body"))?;
        let commit = commits
            .into_iter()
            .next()
            .ok_or_else(|| serde::de::Error::custom("rewrite record lost its commit"))?;
        Ok(Self {
            commit,
            parent_body,
            revision_body,
        })
    }
}

impl TranscriptRewriteRecord {
    pub fn new(
        commit: TranscriptRewriteCommit,
        parent_body: TranscriptRevisionBody,
        revision_body: TranscriptRevisionBody,
    ) -> Result<Self, TranscriptEditError> {
        validate_transcript_rewrite_record(&commit, &parent_body, &revision_body)?;
        Ok(Self {
            commit,
            parent_body,
            revision_body,
        })
    }
}

/// Typed session-local transcript revision graph state.
#[derive(Debug, Clone, Serialize)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[serde(rename_all = "snake_case")]
pub struct TranscriptHistoryState {
    pub head: String,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub commits: Vec<TranscriptRewriteCommit>,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub revisions: Vec<TranscriptRevisionBody>,
    /// Digest-format generation of the revision strings. Documents stamped
    /// `>= 2` were written by the content-addressed digest format, so decode
    /// skips the per-decode legacy-heal probe (a full-transcript hash);
    /// absent/0 means unknown provenance and the probe runs once — the next
    /// save persists the marker. A compatibility convenience, not an
    /// integrity boundary (checkpoint stamps own integrity).
    #[serde(default, skip_serializing_if = "digest_format_is_unknown")]
    pub digest_format: u32,
}

fn digest_format_is_unknown(format: &u32) -> bool {
    *format == 0
}

/// The digest-format generation minted by [`transcript_messages_digest`].
pub(crate) const TRANSCRIPT_DIGEST_FORMAT_CURRENT: u32 = 2;

impl<'de> Deserialize<'de> for TranscriptHistoryState {
    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
    where
        D: Deserializer<'de>,
    {
        #[derive(Deserialize)]
        #[serde(rename_all = "snake_case")]
        struct Wire {
            head: String,
            #[serde(default)]
            commits: Vec<TranscriptRewriteCommit>,
            #[serde(default)]
            revisions: Vec<TranscriptRevisionBody>,
            #[serde(default)]
            digest_format: u32,
        }
        let wire = Wire::deserialize(deserializer)?;
        let mut state = TranscriptHistoryState {
            head: wire.head,
            commits: wire.commits,
            revisions: wire.revisions,
            digest_format: wire.digest_format,
        };
        // Pre-parent-pointer v1 snapshots serialized each body as
        // {created_at,messages,revision}. When every non-root body lacks a
        // parent, the append order is the only lineage the old format
        // carried; reconstruct that exact linear order before digest healing
        // and full validation.
        if state.revisions.len() > 1
            && state
                .revisions
                .iter()
                .skip(1)
                .all(|body| body.parent_revision.is_none())
        {
            for index in 1..state.revisions.len() {
                let parent = state.revisions[index - 1].revision.clone();
                state.revisions[index].parent_revision = Some(parent);
            }
        }
        // Fast path: a graph stamped with the current digest format skips the
        // heal probe outright — the probe hashes the full head transcript,
        // which is decode-hot (every session load). Unstamped graphs (legacy
        // or pre-marker writers) pay the probe once; their next save
        // persists the marker.
        let head_is_current = state.digest_format >= TRANSCRIPT_DIGEST_FORMAT_CURRENT
            || match state
                .revisions
                .iter()
                .find(|body| body.revision == state.head)
            {
                Some(head_body) => {
                    transcript_messages_digest(&head_body.messages)
                        .map_err(serde::de::Error::custom)?
                        == state.head
                }
                None => true,
            };
        state.digest_format = TRANSCRIPT_DIGEST_FORMAT_CURRENT;
        if !head_is_current {
            let TranscriptHistoryState {
                head,
                commits,
                digest_format: _,
                revisions,
            } = &mut state;
            heal_legacy_revision_strings(revisions, commits, Some(head))
                .map_err(serde::de::Error::custom)?;
        }
        heal_legacy_compaction_rewrite_semantics(&mut state.commits, &state.revisions);
        Ok(state)
    }
}

impl TranscriptHistoryState {
    /// Drop mechanical append-head snapshots while preserving every body that
    /// is an endpoint of an audited rewrite plus the current live head.
    ///
    /// Ordinary appends previously accumulated a complete transcript body on
    /// every message mutation once any rewrite had occurred. Those bodies are
    /// not rewrite history and are never selected for restore. Repointing the
    /// live head directly at the latest rewrite endpoint keeps the existing
    /// full-body lineage validator intact after the intermediate append heads
    /// are removed.
    fn compact_mechanical_revision_bodies(&mut self) -> Result<(), TranscriptEditError> {
        validate_transcript_history_state(self)?;

        let mut retained = BTreeSet::from([self.head.clone()]);
        for commit in &self.commits {
            retained.insert(commit.parent_revision.clone());
            retained.insert(commit.revision.clone());
        }

        let head_is_audited_endpoint = self
            .commits
            .iter()
            .any(|commit| commit.parent_revision == self.head || commit.revision == self.head);
        if !head_is_audited_endpoint
            && let Some(last_commit) = self
                .commits
                .last()
                .filter(|commit| commit.revision != self.head)
            && let Some(head_body) = self
                .revisions
                .iter_mut()
                .find(|body| body.revision == self.head)
        {
            head_body.parent_revision = Some(last_commit.revision.clone());
        }

        let mut seen = BTreeSet::new();
        self.revisions
            .retain(|body| retained.contains(&body.revision) && seen.insert(body.revision.clone()));

        // The full graph was validated before any pruning, so corrupt bodies
        // cannot be laundered by dropping them. The transformation changes no
        // message, revision digest, commit, or audited endpoint: it only
        // de-duplicates bodies by revision, removes non-endpoint mechanical
        // bodies, and points an unaudited live head directly at the already
        // validated latest commit. Re-hashing every retained transcript here
        // would repeat the dominant snapshot cost without adding evidence.
        Ok(())
    }
}

/// Re-derive pre-0.7.14 (bookkeeping-inclusive) transcript revision strings to
/// the current content-addressed format at the durable-format parse boundary.
///
/// Retained revision bodies carry their full message lists, so every legacy
/// string can be re-verified against the bytes it was computed from. Only
/// strings that verify under the legacy digest of their own retained body are
/// rewritten; anything else is left untouched for the validators to reject
/// exactly as they would have before.
fn heal_legacy_revision_strings(
    revisions: &mut [TranscriptRevisionBody],
    commits: &mut [TranscriptRewriteCommit],
    head: Option<&mut String>,
) -> Result<(), serde_json::Error> {
    let mut remap: BTreeMap<String, String> = BTreeMap::new();
    for body in revisions.iter() {
        let content = transcript_messages_digest(&body.messages)?;
        if body.revision == content {
            continue;
        }
        if body.revision == legacy_transcript_messages_digest(&body.messages)? {
            remap.insert(body.revision.clone(), content);
        }
    }
    if remap.is_empty() {
        return Ok(());
    }
    for body in revisions.iter_mut() {
        if let Some(current) = remap.get(&body.revision) {
            body.revision = current.clone();
        }
        if let Some(parent) = body.parent_revision.as_ref()
            && let Some(current) = remap.get(parent)
        {
            body.parent_revision = Some(current.clone());
        }
    }
    for commit in commits.iter_mut() {
        if let Some(current) = remap.get(&commit.parent_revision) {
            commit.parent_revision = current.clone();
        }
        if let Some(current) = remap.get(&commit.revision) {
            commit.revision = current.clone();
        }
        heal_legacy_commit_span_digests(commit, revisions)?;
    }
    if let Some(head) = head
        && let Some(current) = remap.get(head.as_str())
    {
        *head = current.clone();
    }
    Ok(())
}

/// Re-derive a legacy commit's span digests from its retained bodies.
///
/// Span digests are only rewritten when the stored value verifies under the
/// legacy digest of the same span; malformed commits keep their stored bytes
/// so [`validate_transcript_rewrite_record`] rejects them unchanged.
fn heal_legacy_commit_span_digests(
    commit: &mut TranscriptRewriteCommit,
    revisions: &[TranscriptRevisionBody],
) -> Result<(), serde_json::Error> {
    let Some(parent_body) = revisions
        .iter()
        .find(|body| body.revision == commit.parent_revision)
    else {
        return Ok(());
    };
    let Some(revision_body) = revisions
        .iter()
        .find(|body| body.revision == commit.revision)
    else {
        return Ok(());
    };
    let (start, end) = commit.selection.bounds();
    if start > end || end > parent_body.messages.len() {
        return Ok(());
    }
    let removed_len = end - start;
    let Some(retained_len) = commit.messages_before.checked_sub(removed_len) else {
        return Ok(());
    };
    let Some(replacement_len) = commit.messages_after.checked_sub(retained_len) else {
        return Ok(());
    };
    let Some(replacement_end) = start.checked_add(replacement_len) else {
        return Ok(());
    };
    if replacement_end > revision_body.messages.len() {
        return Ok(());
    }
    let original_span = &parent_body.messages[start..end];
    if commit.original_span_digest == legacy_transcript_messages_digest(original_span)? {
        commit.original_span_digest = transcript_messages_digest(original_span)?;
    }
    let replacement_span = &revision_body.messages[start..replacement_end];
    if commit.replacement_digest == legacy_transcript_messages_digest(replacement_span)? {
        commit.replacement_digest = transcript_messages_digest(replacement_span)?;
    }
    Ok(())
}

/// Upgrade pre-semantic-field compaction records from retained typed transcript
/// evidence, never from the free-form audit reason.
///
/// Old compaction commits used the generic `message_range` selection, but their
/// revision body already carries the runtime-minted `CompactionSummary` role.
/// A full-transcript, shrinking rewrite with exactly one such summary is the
/// complete legacy witness. Other edits remain ordinary edits even when their
/// display reason happens to say "compaction".
fn heal_legacy_compaction_rewrite_semantics(
    commits: &mut [TranscriptRewriteCommit],
    revisions: &[TranscriptRevisionBody],
) {
    for commit in commits {
        if !commit.selection.is_legacy_untyped() {
            continue;
        }
        let (start, end) = commit.selection.bounds();
        if start != 0
            || end != commit.messages_before
            || commit.messages_after >= commit.messages_before
        {
            continue;
        }
        let Some(parent) = revisions
            .iter()
            .find(|body| body.revision == commit.parent_revision)
        else {
            continue;
        };
        let Some(revision) = revisions
            .iter()
            .find(|body| body.revision == commit.revision)
        else {
            continue;
        };
        if parent.messages.len() != commit.messages_before
            || revision.messages.len() != commit.messages_after
        {
            continue;
        }
        let summary_count = revision
            .messages
            .iter()
            .filter(|message| {
                matches!(message, Message::User(user) if user.transcript_role.is_compaction_summary())
            })
            .count();
        if summary_count == 1 {
            commit.selection = TranscriptRewriteSelection::migrated_legacy_compaction(start, end);
        }
    }
}

impl TranscriptHistoryState {
    /// Rebuild transcript revision graph state from append-only rewrite records.
    pub fn from_rewrite_records<I>(records: I) -> Result<Option<Self>, TranscriptEditError>
    where
        I: IntoIterator<Item = TranscriptRewriteRecord>,
    {
        let mut state: Option<Self> = None;
        for record in records {
            validate_transcript_rewrite_record(
                &record.commit,
                &record.parent_body,
                &record.revision_body,
            )?;
            let state = state.get_or_insert_with(|| Self {
                head: record.commit.parent_revision.clone(),
                commits: Vec::new(),
                revisions: Vec::new(),
                digest_format: TRANSCRIPT_DIGEST_FORMAT_CURRENT,
            });
            if record.commit.parent_revision != state.head {
                if revision_body_extends_head(&record.parent_body, &state.revisions, &state.head)? {
                    state.head = record.commit.parent_revision.clone();
                } else {
                    return Err(TranscriptEditError::HistoryStateMalformed(format!(
                        "rewrite record parent {} does not extend transcript head {}",
                        record.commit.parent_revision, state.head
                    )));
                }
            }
            if !state
                .revisions
                .iter()
                .any(|body| body.revision == record.parent_body.revision)
            {
                state.revisions.push(record.parent_body);
            }
            if !state
                .revisions
                .iter()
                .any(|body| body.revision == record.revision_body.revision)
            {
                state.revisions.push(record.revision_body);
            }
            state.head = record.commit.revision.clone();
            state.commits.push(record.commit);
        }
        Ok(state)
    }
}

/// Invalid typed transcript edit request.
#[derive(Debug, Clone, thiserror::Error)]
pub enum TranscriptEditError {
    #[error("message index {message_index} out of bounds for {message_count} messages")]
    MessageIndexOutOfBounds {
        message_index: usize,
        message_count: usize,
    },
    #[error("{block_kind} index {block_index} out of bounds for {block_count} blocks")]
    BlockIndexOutOfBounds {
        block_kind: &'static str,
        block_index: usize,
        block_count: usize,
    },
    #[error("replacement expected {expected} at message index {message_index}, found {actual}")]
    MessageRoleMismatch {
        message_index: usize,
        expected: &'static str,
        actual: &'static str,
    },
    #[error("invalid transcript rewrite range {start}..{end} for {message_count} messages")]
    InvalidRewriteRange {
        start: usize,
        end: usize,
        message_count: usize,
    },
    #[error("transcript rewrite does not change transcript revision {revision}")]
    NoOpRewrite { revision: String },
    #[error("transcript rewrite parent revision mismatch: expected {expected}, actual {actual}")]
    RevisionConflict { expected: String, actual: String },
    #[error("transcript history state is malformed: {0}")]
    HistoryStateMalformed(String),
    #[error("invalid transcript shape after rewrite: {0}")]
    InvalidTranscriptShape(String),
}

fn message_role_name(message: &Message) -> &'static str {
    match message {
        Message::System(_) => "system",
        Message::SystemNotice(_) => "system_notice",
        Message::User(_) => "user",
        Message::BlockAssistant(_) => "block_assistant",
        Message::ToolResults { .. } => "tool_results",
    }
}

fn assistant_tool_use_ids(message: &Message) -> Vec<&str> {
    match message {
        Message::BlockAssistant(assistant) => assistant
            .blocks
            .iter()
            .filter_map(|block| match block {
                AssistantBlock::ToolUse { id, .. } => Some(id.as_str()),
                _ => None,
            })
            .collect(),
        _ => Vec::new(),
    }
}

fn validate_transcript_tool_result_shape(messages: &[Message]) -> Result<(), TranscriptEditError> {
    for (index, message) in messages.iter().enumerate() {
        if let Message::ToolResults { results, .. } = message {
            let Some(previous) = index
                .checked_sub(1)
                .and_then(|previous| messages.get(previous))
            else {
                return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                    "tool_results at message {index} has no preceding assistant tool-use message"
                )));
            };
            let expected = assistant_tool_use_ids(previous);
            if expected.is_empty() {
                return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                    "tool_results at message {index} follows {}, not an assistant tool-use message",
                    message_role_name(previous)
                )));
            }
            let actual = results
                .iter()
                .map(|result| result.tool_use_id.as_str())
                .collect::<Vec<_>>();
            let actual_set = actual.iter().copied().collect::<BTreeSet<_>>();
            let expected_set = expected.iter().copied().collect::<BTreeSet<_>>();
            if actual.len() != actual_set.len() {
                return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                    "tool_results at message {index} contains duplicate tool ids"
                )));
            }
            if expected.len() != expected_set.len() {
                return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                    "assistant tool-use message before tool_results at message {index} contains duplicate tool ids"
                )));
            }
            if actual_set != expected_set {
                return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                    "tool_results at message {index} resolve tool ids {actual_set:?}, expected {expected_set:?}"
                )));
            }
        }

        let tool_use_ids = assistant_tool_use_ids(message);
        if tool_use_ids.is_empty() {
            continue;
        }
        let Some(next) = messages.get(index + 1) else {
            return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                "assistant tool-use message {index} has no following tool_results"
            )));
        };
        if !matches!(next, Message::ToolResults { .. }) {
            return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                "assistant tool-use message {index} is followed by {}, not tool_results",
                message_role_name(next)
            )));
        }
    }
    Ok(())
}

fn canonicalize_digest_image_blocks(blocks: &mut [crate::types::ContentBlock]) {
    for block in blocks.iter_mut() {
        if let crate::types::ContentBlock::Image {
            media_type,
            data: crate::types::ImageData::Inline { data },
        } = block
        {
            // An inline image hydrates from its blob's own bytes, so its
            // content-addressed identity equals the blob id the store minted.
            let blob_id = crate::blob::content_blob_id(media_type, data);
            *block = crate::types::ContentBlock::Image {
                media_type: media_type.clone(),
                data: crate::types::ImageData::Blob { blob_id },
            };
        }
    }
}

/// Canonicalize image payloads to their content-addressed blob identity so the
/// transcript digest is invariant to inline-vs-blob representation.
///
/// The same image hydrated inline for model execution and externalized to a
/// blob for persistence must share one transcript revision; otherwise a live
/// session and its durable snapshot would appear "diverged" purely because of
/// image storage form, and a runtime-backed live session would be discarded as
/// stale mid-turn.
fn canonicalize_message_images_for_digest(messages: &[Message]) -> Vec<Message> {
    let mut canonical = messages.to_vec();
    for message in &mut canonical {
        match message {
            Message::User(user) => canonicalize_digest_image_blocks(&mut user.content),
            Message::ToolResults { results, .. } => {
                for result in results.iter_mut() {
                    canonicalize_digest_image_blocks(&mut result.content);
                }
            }
            Message::SystemNotice(notice) => {
                for block in &mut notice.blocks {
                    match block {
                        crate::types::SystemNoticeBlock::Comms { content, .. }
                        | crate::types::SystemNoticeBlock::ExternalEvent { content, .. } => {
                            canonicalize_digest_image_blocks(content);
                        }
                        _ => {}
                    }
                }
            }
            _ => {}
        }
    }
    canonical
}

/// Canonical checkpoint representation of the retained transcript graph.
///
/// Revision bodies are content-addressed by `revision`; their cached parent
/// pointers and construction timestamps are storage bookkeeping. The ordered
/// commit log remains intact because it is durable audit/selection history.
pub(crate) fn canonicalize_checkpoint_history_value(
    value: &serde_json::Value,
) -> Result<serde_json::Value, serde_json::Error> {
    let state: TranscriptHistoryState = serde_json::from_value(value.clone())?;
    let mut revisions = state
        .revisions
        .into_iter()
        .map(|body| {
            serde_json::json!({
                "revision": body.revision,
                "messages": canonicalize_messages_for_digest(&body.messages),
            })
        })
        .collect::<Vec<_>>();
    revisions.sort_by(|left, right| {
        left.get("revision")
            .and_then(serde_json::Value::as_str)
            .cmp(&right.get("revision").and_then(serde_json::Value::as_str))
    });
    Ok(serde_json::json!({
        "head": state.head,
        "commits": state.commits,
        "revisions": revisions,
    }))
}

fn canonicalize_checkpoint_deferred_turn_value(
    value: &serde_json::Value,
) -> Result<serde_json::Value, serde_json::Error> {
    let mut state: SessionDeferredTurnState = serde_json::from_value(value.clone())?;
    if let Some(prompt) = state.pending_initial_prompt_mut_for_blob_rewrite()
        && let crate::types::ContentInput::Blocks(blocks) = &mut prompt.prompt
    {
        canonicalize_digest_image_blocks(blocks);
    }
    for pending in state.pending_tool_results_mut_for_blob_rewrite() {
        for result in &mut pending.results {
            canonicalize_digest_image_blocks(&mut result.content);
        }
    }
    serde_json::to_value(state)
}

/// Timestamp sentinel used when erasing construction bookkeeping from the
/// digest form. `created_at` always serializes, so a fixed value keeps the
/// canonical bytes deterministic.
fn digest_timestamp_sentinel() -> crate::types::MessageTimestamp {
    chrono::DateTime::<chrono::Utc>::UNIX_EPOCH
}

/// Canonicalize messages to their conversational content before hashing so the
/// transcript revision is a content address, not a construction record.
///
/// Two normalizations compose:
/// - image payloads collapse to their content-addressed blob identity
///   ([`canonicalize_message_images_for_digest`]);
/// - per-construction bookkeeping is erased: [`TranscriptMessageIdentity`]
///   (run/interaction ids are runtime-binding atoms — a re-created authority
///   re-stamps them) and `created_at` timestamps. A resume that re-projects
///   the same conversation through a new runtime authority must digest to the
///   same revision as the persisted row, or the append-only save guard
///   strands the session on restart (fails closed with
///   `TranscriptContinuityViolation`).
///
/// Typed semantic facts stay in the digest — `transcript_role`,
/// `mutation_kind`, `render_metadata`, notice kinds and blocks — because
/// changing them changes the transcript's meaning.
fn canonicalize_messages_for_digest(messages: &[Message]) -> Vec<Message> {
    let mut canonical = canonicalize_message_images_for_digest(messages);
    for message in &mut canonical {
        match message {
            Message::System(system) => {
                system.created_at = digest_timestamp_sentinel();
            }
            Message::SystemNotice(notice) => {
                notice.created_at = digest_timestamp_sentinel();
            }
            Message::User(user) => {
                user.identity = crate::types::TranscriptMessageIdentity::default();
                user.created_at = digest_timestamp_sentinel();
            }
            Message::BlockAssistant(assistant) => {
                assistant.identity = crate::types::TranscriptMessageIdentity::default();
                assistant.created_at = digest_timestamp_sentinel();
            }
            Message::ToolResults { created_at, .. } => {
                *created_at = digest_timestamp_sentinel();
            }
        }
    }
    canonical
}

pub fn transcript_messages_digest(messages: &[Message]) -> Result<String, serde_json::Error> {
    sha256_json_digest(&canonicalize_messages_for_digest(messages))
}

/// Digest format used by pre-0.7.14 transcript revision strings.
///
/// The legacy canonicalization only normalized image payloads, so persisted
/// revision strings from older stores include construction bookkeeping
/// (`identity`, `created_at`). This is a durable-format decoder: it exists
/// solely so [`heal_legacy_revision_strings`] can verify a stored string
/// against its retained body before re-deriving it to the current
/// content-addressed format. Never mint new revisions with it.
fn legacy_transcript_messages_digest(messages: &[Message]) -> Result<String, serde_json::Error> {
    sha256_json_digest(&canonicalize_message_images_for_digest(messages))
}

fn validate_transcript_rewrite_record(
    commit: &TranscriptRewriteCommit,
    parent_body: &TranscriptRevisionBody,
    revision_body: &TranscriptRevisionBody,
) -> Result<(), TranscriptEditError> {
    if parent_body.revision != commit.parent_revision {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "parent body revision {} does not match commit parent {}",
            parent_body.revision, commit.parent_revision
        )));
    }
    if revision_body.revision != commit.revision {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "revision body {} does not match commit revision {}",
            revision_body.revision, commit.revision
        )));
    }
    if commit.parent_revision == commit.revision {
        return Err(TranscriptEditError::NoOpRewrite {
            revision: commit.revision.clone(),
        });
    }
    let parent_digest = transcript_messages_digest(&parent_body.messages)
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    if parent_digest != commit.parent_revision {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "parent body digest {parent_digest} does not match commit parent {}",
            commit.parent_revision
        )));
    }
    let revision_digest = transcript_messages_digest(&revision_body.messages)
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    if revision_digest != commit.revision {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "revision body digest {revision_digest} does not match commit revision {}",
            commit.revision
        )));
    }
    let (start, end) = commit.selection.bounds();
    if start > end || end > parent_body.messages.len() {
        return Err(TranscriptEditError::InvalidRewriteRange {
            start,
            end,
            message_count: parent_body.messages.len(),
        });
    }
    if commit.messages_before != parent_body.messages.len()
        || commit.messages_after != revision_body.messages.len()
    {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "commit message counts {} -> {} do not match revision bodies {} -> {}",
            commit.messages_before,
            commit.messages_after,
            parent_body.messages.len(),
            revision_body.messages.len()
        )));
    }
    let original_span_digest = transcript_messages_digest(&parent_body.messages[start..end])
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    if original_span_digest != commit.original_span_digest {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "original span digest {original_span_digest} does not match commit digest {}",
            commit.original_span_digest
        )));
    }
    let removed_len = end - start;
    let retained_len = commit
        .messages_before
        .checked_sub(removed_len)
        .ok_or_else(|| {
            TranscriptEditError::HistoryStateMalformed(
                "commit removed more messages than it recorded before rewrite".to_string(),
            )
        })?;
    let replacement_len = commit
        .messages_after
        .checked_sub(retained_len)
        .ok_or_else(|| {
            TranscriptEditError::HistoryStateMalformed(
                "commit message counts cannot describe a replacement span".to_string(),
            )
        })?;
    let replacement_end = start.checked_add(replacement_len).ok_or_else(|| {
        TranscriptEditError::HistoryStateMalformed("replacement span end overflowed".to_string())
    })?;
    if replacement_end > revision_body.messages.len() {
        return Err(TranscriptEditError::InvalidRewriteRange {
            start,
            end: replacement_end,
            message_count: revision_body.messages.len(),
        });
    }
    if commit.selection.semantic() == TranscriptRewriteSemantic::Compaction {
        let summary_count = revision_body.messages[start..replacement_end]
            .iter()
            .filter(|message| {
                matches!(message, Message::User(user) if user.transcript_role.is_compaction_summary())
            })
            .count();
        if start != 0
            || end != commit.messages_before
            || commit.messages_after >= commit.messages_before
            || summary_count != 1
        {
            return Err(TranscriptEditError::HistoryStateMalformed(
                "typed compaction rewrite must shrink the full transcript and carry exactly one CompactionSummary"
                    .to_string(),
            ));
        }
    }
    let parent_prefix_digest = transcript_messages_digest(&parent_body.messages[..start])
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    let revision_prefix_digest = transcript_messages_digest(&revision_body.messages[..start])
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    if parent_prefix_digest != revision_prefix_digest {
        return Err(TranscriptEditError::HistoryStateMalformed(
            "rewrite revision changed messages before the selected span".to_string(),
        ));
    }
    let parent_suffix_digest = transcript_messages_digest(&parent_body.messages[end..])
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    let revision_suffix_digest =
        transcript_messages_digest(&revision_body.messages[replacement_end..])
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    if parent_suffix_digest != revision_suffix_digest {
        return Err(TranscriptEditError::HistoryStateMalformed(
            "rewrite revision changed messages after the selected span".to_string(),
        ));
    }
    let replacement_digest =
        transcript_messages_digest(&revision_body.messages[start..replacement_end])
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    if replacement_digest != commit.replacement_digest {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "replacement span digest {replacement_digest} does not match commit digest {}",
            commit.replacement_digest
        )));
    }
    Ok(())
}

pub(crate) fn validate_transcript_history_state(
    state: &TranscriptHistoryState,
) -> Result<(), TranscriptEditError> {
    if state
        .revisions
        .iter()
        .all(|body| body.revision != state.head)
    {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "missing transcript head body {}",
            state.head
        )));
    }
    for body in &state.revisions {
        let digest = transcript_messages_digest(&body.messages)
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
        if digest != body.revision {
            return Err(TranscriptEditError::HistoryStateMalformed(format!(
                "transcript revision body {} has digest {digest}",
                body.revision
            )));
        }
    }
    for commit in &state.commits {
        let parent_body = state
            .revisions
            .iter()
            .find(|body| body.revision == commit.parent_revision)
            .ok_or_else(|| {
                TranscriptEditError::HistoryStateMalformed(format!(
                    "missing parent transcript body {}",
                    commit.parent_revision
                ))
            })?;
        let revision_body = state
            .revisions
            .iter()
            .find(|body| body.revision == commit.revision)
            .ok_or_else(|| {
                TranscriptEditError::HistoryStateMalformed(format!(
                    "missing transcript revision body {}",
                    commit.revision
                ))
            })?;
        validate_transcript_rewrite_record(commit, parent_body, revision_body)?;
    }
    let Some(first_commit) = state.commits.first() else {
        return Ok(());
    };
    let mut expected_head = first_commit.parent_revision.clone();
    for commit in &state.commits {
        let parent_body = state
            .revisions
            .iter()
            .find(|body| body.revision == commit.parent_revision)
            .ok_or_else(|| {
                TranscriptEditError::HistoryStateMalformed(format!(
                    "missing parent transcript body {}",
                    commit.parent_revision
                ))
            })?;
        if commit.parent_revision != expected_head
            && !revision_body_extends_head(parent_body, &state.revisions, &expected_head)?
        {
            return Err(TranscriptEditError::HistoryStateMalformed(format!(
                "rewrite commit parent {} does not extend transcript head {}",
                commit.parent_revision, expected_head
            )));
        }
        expected_head = commit.revision.clone();
    }
    let head_is_audited_endpoint = state
        .commits
        .iter()
        .any(|commit| commit.parent_revision == state.head || commit.revision == state.head);
    let head_extends_latest_commit = if head_is_audited_endpoint {
        let Some(head_body) = state
            .revisions
            .iter()
            .find(|body| body.revision == state.head)
        else {
            return Err(TranscriptEditError::HistoryStateMalformed(format!(
                "missing transcript head body {}",
                state.head
            )));
        };
        revision_body_extends_head(head_body, &state.revisions, &expected_head)?
    } else {
        let mut cursor = state.head.as_str();
        let mut visited = BTreeSet::new();
        while cursor != expected_head {
            if !visited.insert(cursor.to_string()) {
                break;
            }
            let Some(head_body) = state.revisions.iter().find(|body| body.revision == cursor)
            else {
                break;
            };
            let Some(parent) = head_body.parent_revision.as_deref() else {
                break;
            };
            cursor = parent;
        }
        cursor == expected_head
    };
    if !head_extends_latest_commit {
        return Err(TranscriptEditError::HistoryStateMalformed(format!(
            "transcript head {} does not extend the rewrite chain",
            state.head
        )));
    }
    Ok(())
}

fn revision_body_extends_head(
    candidate: &TranscriptRevisionBody,
    revisions: &[TranscriptRevisionBody],
    head: &str,
) -> Result<bool, TranscriptEditError> {
    let Some(head_body) = revisions.iter().find(|body| body.revision == head) else {
        return Ok(false);
    };
    if candidate.revision == head {
        return Ok(true);
    }
    if candidate.messages.len() < head_body.messages.len() {
        return Ok(false);
    }
    let prefix_digest = transcript_messages_digest(&candidate.messages[..head_body.messages.len()])
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    if prefix_digest == head {
        return Ok(true);
    }

    // A resume-time system refresh may replace the single leading System
    // projection while preserving (and possibly appending to) the exact
    // conversation tail. Prove that content shape directly; a historical
    // parent_revision pointer is not occurrence identity and must never, by
    // itself, authorize a later commit after a digest has recurred.
    let (Some(Message::System(_)), Some(Message::System(_))) =
        (candidate.messages.first(), head_body.messages.first())
    else {
        return Ok(false);
    };
    let head_tail_len = head_body.messages.len().saturating_sub(1);
    if head_tail_len == 0 {
        return Ok(true);
    }
    let candidate_tail = &candidate.messages[1..];
    if candidate_tail.len() < head_tail_len {
        return Ok(false);
    }
    let head_tail_digest = transcript_messages_digest(&head_body.messages[1..])
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    let candidate_tail_prefix_digest = transcript_messages_digest(&candidate_tail[..head_tail_len])
        .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
    Ok(candidate_tail_prefix_digest == head_tail_digest)
}

fn sha256_json_digest<T: Serialize + ?Sized>(value: &T) -> Result<String, serde_json::Error> {
    crate::checkpoint::record_content_digest_computation();
    let bytes = serde_json::to_vec(value)?;
    let digest = Sha256::digest(bytes);
    let mut out = String::with_capacity(digest.len() * 2);
    const HEX: &[u8; 16] = b"0123456789abcdef";
    for byte in digest {
        out.push(HEX[(byte >> 4) as usize] as char);
        out.push(HEX[(byte & 0x0f) as usize] as char);
    }
    Ok(format!("sha256:{out}"))
}

/// A conversation session with full history
///
/// Uses Arc<Vec<Message>> internally for efficient forking (copy-on-write).
#[derive(Debug, Clone)]
pub struct Session {
    /// Persisted envelope format version, validated fail-closed on read by
    /// the generated persistence version authority.
    version: u32,
    /// Unique identifier
    id: SessionId,
    /// All messages in order (Arc for CoW on fork)
    pub(crate) messages: Arc<Vec<Message>>,
    /// When the session was created
    created_at: SystemTime,
    /// When the session was last updated
    updated_at: SystemTime,
    /// Arbitrary metadata
    metadata: serde_json::Map<String, serde_json::Value>,
    /// Whether transcript-history metadata has already crossed a validating,
    /// compacting authority boundary in this in-memory session.
    ///
    /// This is derived cache state only, never persisted authority. Typed
    /// transcript mutations install validated state; deserialization validates
    /// before setting it. Any unchecked history mutation invalidates the cache
    /// so serialization retains the fail-closed corrupt-snapshot contract.
    transcript_history_metadata_validation: TranscriptHistoryMetadataValidation,
    /// Cumulative token usage across all LLM calls in this session
    usage: Usage,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum TranscriptHistoryMetadataValidation {
    Validated,
    RequiresValidation,
}

/// Serde helper for Session serialization (flattens Arc)
#[derive(Deserialize)]
#[serde(rename_all = "snake_case")]
struct SessionSerde {
    version: u32,
    id: SessionId,
    messages: Vec<Message>,
    created_at: SystemTime,
    updated_at: SystemTime,
    #[serde(default)]
    metadata: serde_json::Map<String, serde_json::Value>,
    #[serde(default)]
    usage: Usage,
}

/// Borrowed serialization view for Session. The persisted shape deliberately
/// stays lockstep with `SessionSerde`, but large transcripts and metadata are
/// streamed directly instead of being deep-cloned before serde sees them.
#[derive(Serialize)]
#[serde(rename_all = "snake_case")]
struct SessionSerdeRef<'a> {
    version: u32,
    id: &'a SessionId,
    messages: &'a [Message],
    created_at: &'a SystemTime,
    updated_at: &'a SystemTime,
    metadata: &'a serde_json::Map<String, serde_json::Value>,
    usage: &'a Usage,
}

impl Serialize for Session {
    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
    where
        S: Serializer,
    {
        let compacted_metadata = if self.transcript_history_metadata_validation
            == TranscriptHistoryMetadataValidation::RequiresValidation
        {
            let mut metadata = self.metadata.clone();
            compact_transcript_history_metadata_for_snapshot(&mut metadata)
                .map_err(<S::Error as serde::ser::Error>::custom)?;
            Some(metadata)
        } else {
            None
        };
        let metadata = compacted_metadata.as_ref().unwrap_or(&self.metadata);
        let serde_repr = SessionSerdeRef {
            version: self.version,
            id: &self.id,
            messages: self.messages(),
            created_at: &self.created_at,
            updated_at: &self.updated_at,
            metadata,
            usage: &self.usage,
        };
        serde_repr.serialize(serializer)
    }
}

fn compact_transcript_history_metadata_for_snapshot(
    metadata: &mut serde_json::Map<String, serde_json::Value>,
) -> Result<(), String> {
    let Some(value) = metadata.remove(SESSION_TRANSCRIPT_HISTORY_STATE_KEY) else {
        return Ok(());
    };
    let mut state: TranscriptHistoryState =
        serde_json::from_value(value).map_err(|error| error.to_string())?;
    state
        .compact_mechanical_revision_bodies()
        .map_err(|error| error.to_string())?;
    metadata.insert(
        SESSION_TRANSCRIPT_HISTORY_STATE_KEY.to_string(),
        serde_json::to_value(state).map_err(|error| error.to_string())?,
    );
    Ok(())
}

impl<'de> Deserialize<'de> for Session {
    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
    where
        D: Deserializer<'de>,
    {
        let serde_repr = SessionSerde::deserialize(deserializer)?;
        let version = session_persistence_version_authority::restore_session_envelope_version(
            serde_repr.version,
        )
        .map_err(<D::Error as serde::de::Error>::custom)?;
        let mut metadata = serde_repr.metadata;
        compact_transcript_history_metadata_for_snapshot(&mut metadata)
            .map_err(<D::Error as serde::de::Error>::custom)?;
        Ok(Session {
            version,
            id: serde_repr.id,
            messages: Arc::new(serde_repr.messages),
            created_at: serde_repr.created_at,
            updated_at: serde_repr.updated_at,
            metadata,
            transcript_history_metadata_validation: TranscriptHistoryMetadataValidation::Validated,
            usage: serde_repr.usage,
        })
    }
}

/// Serde helper for the metadata-only partial decode of a persisted session
/// envelope.
///
/// LOCKSTEP with [`SessionSerde`]: this struct must decode exactly the field
/// names and serde shapes that `SessionSerde` persists for `version`, `id`,
/// and `metadata` (`rename_all = "snake_case"`, `#[serde(default)]` on
/// `metadata`). The `session_metadata_document_lockstep_with_full_envelope`
/// pin test fails if the two drift.
#[derive(Deserialize)]
#[serde(rename_all = "snake_case")]
struct SessionMetadataDocumentSerde {
    version: u32,
    id: SessionId,
    #[serde(default)]
    metadata: serde_json::Map<String, serde_json::Value>,
}

/// Metadata-only projection of a persisted session envelope.
///
/// Produced by [`session_metadata_document_from_slice`] without materializing
/// the transcript. Exposes ONLY the two session-authority facts the metadata
/// read seam is allowed to observe ([`SESSION_METADATA_KEY`] and
/// [`SESSION_LIFECYCLE_TERMINAL_KEY`]) — deliberately no raw metadata-map
/// accessor, so the partial decode can never grow into an untyped side
/// channel around [`Session`]'s authority-gated reads.
#[derive(Debug, Clone)]
pub struct SessionMetadataDocument {
    session_id: SessionId,
    metadata: serde_json::Map<String, serde_json::Value>,
}

impl SessionMetadataDocument {
    /// Session identity carried by the envelope.
    pub fn session_id(&self) -> &SessionId {
        &self.session_id
    }

    /// Raw projected [`SESSION_METADATA_KEY`] value, for divergence
    /// comparison against another projection of the same fact.
    pub fn session_metadata_value(&self) -> Option<&serde_json::Value> {
        self.metadata.get(SESSION_METADATA_KEY)
    }

    /// Raw projected [`SESSION_LIFECYCLE_TERMINAL_KEY`] value, for divergence
    /// comparison against another projection of the same fact.
    pub fn lifecycle_terminal_value(&self) -> Option<&serde_json::Value> {
        self.metadata.get(SESSION_LIFECYCLE_TERMINAL_KEY)
    }

    /// Decode typed checkpoint metadata without materializing the transcript.
    ///
    /// This validates schema and session identity and preserves explicit
    /// legacy-unverified state. Digest verification still requires the full
    /// document through [`Session::try_checkpoint_state`].
    pub fn try_checkpoint_metadata_state(
        &self,
    ) -> Result<
        crate::checkpoint::SessionCheckpointMetadataState,
        crate::checkpoint::SessionCheckpointError,
    > {
        crate::checkpoint::session_checkpoint_metadata_state(&self.session_id, &self.metadata)
    }

    /// Decode the typed metadata view through the canonical map-level
    /// decoders, failing closed on corrupt values.
    pub fn try_into_view(self) -> Result<PersistedSessionMetadataView, serde_json::Error> {
        PersistedSessionMetadataView::try_from_metadata_map(self.session_id, &self.metadata)
    }
}

/// Partially decode a persisted session envelope into its metadata-only
/// document, without materializing the transcript.
///
/// Fail-closed on the envelope format version through the generated
/// persistence version authority — exactly like the full [`Session`]
/// deserializer.
pub fn session_metadata_document_from_slice(
    bytes: &[u8],
) -> Result<SessionMetadataDocument, serde_json::Error> {
    let serde_repr: SessionMetadataDocumentSerde = serde_json::from_slice(bytes)?;
    session_persistence_version_authority::restore_session_envelope_version(serde_repr.version)
        .map_err(<serde_json::Error as serde::de::Error>::custom)?;
    Ok(SessionMetadataDocument {
        session_id: serde_repr.id,
        metadata: serde_repr.metadata,
    })
}

impl Session {
    /// Rebuild a slim `Session` from persisted head-row parts.
    ///
    /// Used by [`crate::session_store::SessionHead::into_session`] to
    /// materialize a session from an incremental store's head row plus its
    /// strand messages. The envelope version is restored fail-closed through
    /// the generated persistence version authority, exactly like
    /// [`Session::deserialize`].
    pub(crate) fn from_head_parts(
        version: u32,
        id: SessionId,
        messages: Vec<Message>,
        created_at: SystemTime,
        updated_at: SystemTime,
        metadata: serde_json::Map<String, serde_json::Value>,
        usage: Usage,
    ) -> Result<Self, String> {
        let version =
            session_persistence_version_authority::restore_session_envelope_version(version)
                .map_err(|err| err.to_string())?;
        Ok(Self {
            version,
            id,
            messages: Arc::new(messages),
            created_at,
            updated_at,
            transcript_history_metadata_validation: if metadata
                .contains_key(SESSION_TRANSCRIPT_HISTORY_STATE_KEY)
            {
                TranscriptHistoryMetadataValidation::RequiresValidation
            } else {
                TranscriptHistoryMetadataValidation::Validated
            },
            metadata,
            usage,
        })
    }

    /// Build the canonical, storage-representation-invariant document used by
    /// the typed checkpoint digest.
    pub(crate) fn checkpoint_digest_document(
        &self,
    ) -> Result<serde_json::Value, serde_json::Error> {
        let messages = canonicalize_messages_for_digest(self.messages());
        let mut metadata = self.metadata.clone();
        if self.transcript_history_metadata_validation
            == TranscriptHistoryMetadataValidation::RequiresValidation
        {
            compact_transcript_history_metadata_for_snapshot(&mut metadata)
                .map_err(<serde_json::Error as serde::ser::Error>::custom)?;
        }
        if let Some(history) = metadata.get_mut(SESSION_TRANSCRIPT_HISTORY_STATE_KEY) {
            *history = canonicalize_checkpoint_history_value(history)?;
        }
        if let Some(deferred) = metadata.get_mut(SESSION_DEFERRED_TURN_STATE_KEY) {
            *deferred = canonicalize_checkpoint_deferred_turn_value(deferred)?;
        }
        serde_json::to_value(SessionSerdeRef {
            version: self.version,
            id: &self.id,
            messages: &messages,
            created_at: &self.created_at,
            updated_at: &self.updated_at,
            metadata: &metadata,
            usage: &self.usage,
        })
    }
}

/// Metadata key used to store durable system-context control state.
pub const SESSION_SYSTEM_CONTEXT_STATE_KEY: &str = "session_system_context_state";

/// Metadata key used to store deferred-turn control state.
pub const SESSION_DEFERRED_TURN_STATE_KEY: &str = "session_deferred_turn_state";

/// Metadata key used to store recoverable build-only session state.
pub const SESSION_BUILD_STATE_KEY: &str = "session_build_state";

/// Metadata key used to store durable session-local tool visibility intent.
pub const SESSION_TOOL_VISIBILITY_STATE_KEY: &str = "session_tool_visibility_state_v1";

/// Metadata key used to store the typed session lifecycle-terminal fact.
pub const SESSION_LIFECYCLE_TERMINAL_KEY: &str = "session_lifecycle_terminal";

/// Single canonical metadata key for the typed session checkpoint stamp.
pub const SESSION_CHECKPOINT_STAMP_KEY: &str = "session_checkpoint_stamp_v1";

/// Legacy compatibility marker for a session-store row written by the
/// pre-typed intra-turn checkpointer.
///
/// This Boolean is decoded only as explicit legacy-unverified evidence. It
/// never grants rollback authority; typed writers and recovery use the exact
/// [`crate::checkpoint::SessionCheckpointStamp`] instead.
pub const SESSION_RUNTIME_CHECKPOINT_PROVENANCE_KEY: &str =
    "session_runtime_checkpoint_provenance_v1";

/// Canonical tool name gated by `image_tool_results` capability.
pub const VIEW_IMAGE_TOOL_NAME: &str = "view_image";

/// Canonical separator between appended runtime system-context blocks.
pub const SYSTEM_CONTEXT_SEPARATOR: &str = "\n\n---\n\n";

#[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]
#[error("metadata key `{key}` is reserved for session authority")]
pub struct ReservedSessionMetadataKey {
    key: String,
}

impl ReservedSessionMetadataKey {
    fn new(key: &str) -> Self {
        Self {
            key: key.to_string(),
        }
    }
}

fn is_session_authority_metadata_key(key: &str) -> bool {
    // Single reserved-key authority: the typed classifier owns the
    // session-authority key set (the `session_*` state constants).
    crate::surface_metadata::ReservedMetadataKey::is_session_authority(key)
}

#[allow(clippy::panic)]
fn fail_closed_generated_restore(authority: &'static str, err: serde_json::Error) -> ! {
    tracing::error!(
        authority,
        error = %err,
        "generated authority rejected durable restore"
    );
    panic!("generated {authority} authority rejected durable restore: {err}");
}

/// Shared runtime system-context authority handle.
///
/// This handle is intentionally narrower than `Arc<Mutex<SessionSystemContextState>>`:
/// callers can read snapshots or request generated-authority transitions, but
/// cannot replace the machine-owned state by taking a mutable guard.
#[derive(Clone)]
pub struct SystemContextStateHandle {
    inner: Arc<std::sync::Mutex<SessionSystemContextState>>,
    boundary: Arc<SystemContextBoundaryCoordinator>,
}

struct SystemContextBoundaryCoordinator {
    incarnation_id: uuid::Uuid,
    lifecycle: std::sync::Mutex<SystemContextBoundaryLifecycle>,
    notify: tokio::sync::Notify,
}

struct SystemContextBoundaryLifecycle {
    actor_live: bool,
    next_generation: u64,
    next_request_id: u64,
    window: SystemContextBoundaryWindow,
}

enum SystemContextBoundaryWindow {
    Closed,
    Open {
        run_id: RunId,
        generation: u64,
        request: Option<RegisteredSystemContextBoundaryRequest>,
    },
    Parked {
        run_id: RunId,
        generation: u64,
        request_id: u64,
        candidate_state: SessionSystemContextState,
    },
    Resolved {
        run_id: RunId,
        generation: u64,
        request_id: u64,
        resolution: SystemContextBoundaryResolution,
    },
    /// The external prepare authority has resolved (or runner-first won), and
    /// the runner is preprocessing the exact request immediately before the
    /// model call. Canonical pending state remains unapplied until the runner
    /// consumes this witness synchronously at that final call seam.
    Consuming {
        run_id: RunId,
        generation: u64,
        request_id: Option<u64>,
    },
}

struct RegisteredSystemContextBoundaryRequest {
    request_id: u64,
    appends: Vec<(AppendSystemContextRequest, SystemTime)>,
}

#[derive(Clone)]
enum SystemContextBoundaryResolution {
    Committed,
    Aborted,
    Failed(CoreBoundaryStageError),
}

impl Default for SystemContextBoundaryCoordinator {
    fn default() -> Self {
        Self {
            incarnation_id: uuid::Uuid::new_v4(),
            lifecycle: std::sync::Mutex::new(SystemContextBoundaryLifecycle {
                actor_live: true,
                next_generation: 0,
                next_request_id: 0,
                window: SystemContextBoundaryWindow::Closed,
            }),
            notify: tokio::sync::Notify::new(),
        }
    }
}

impl SystemContextBoundaryCoordinator {
    fn lock(&self) -> std::sync::MutexGuard<'_, SystemContextBoundaryLifecycle> {
        self.lifecycle.lock().unwrap_or_else(|poisoned| {
            tracing::warn!(
                "system-context boundary coordinator lock poisoned; retaining exact authority"
            );
            poisoned.into_inner()
        })
    }

    fn abort_request(&self, request_id: u64) -> Result<(), CoreBoundaryStageError> {
        let mut lifecycle = self.lock();
        let parked_owner = match &lifecycle.window {
            SystemContextBoundaryWindow::Parked {
                run_id,
                generation,
                request_id: current_request_id,
                ..
            } if *current_request_id == request_id => Some((run_id.clone(), *generation)),
            _ => None,
        };
        if let Some((run_id, generation)) = parked_owner {
            lifecycle.window = SystemContextBoundaryWindow::Resolved {
                run_id,
                generation,
                request_id,
                resolution: SystemContextBoundaryResolution::Aborted,
            };
            drop(lifecycle);
            self.notify.notify_waiters();
            return Ok(());
        }
        match &mut lifecycle.window {
            SystemContextBoundaryWindow::Open { request, .. }
                if request
                    .as_ref()
                    .is_some_and(|request| request.request_id == request_id) =>
            {
                *request = None;
            }
            SystemContextBoundaryWindow::Resolved {
                request_id: current_request_id,
                ..
            } if *current_request_id == request_id => return Ok(()),
            _ => {
                return Err(CoreBoundaryStageError::stale(format!(
                    "boundary request {request_id} no longer owns its actor window"
                )));
            }
        }
        drop(lifecycle);
        self.notify.notify_waiters();
        Ok(())
    }

    fn close_run(&self, run_id: &RunId) {
        let mut lifecycle = self.lock();
        let owns_window = match &lifecycle.window {
            SystemContextBoundaryWindow::Open {
                run_id: current, ..
            }
            | SystemContextBoundaryWindow::Parked {
                run_id: current, ..
            }
            | SystemContextBoundaryWindow::Resolved {
                run_id: current, ..
            }
            | SystemContextBoundaryWindow::Consuming {
                run_id: current, ..
            } => current == run_id,
            SystemContextBoundaryWindow::Closed => false,
        };
        if owns_window {
            lifecycle.window = SystemContextBoundaryWindow::Closed;
            drop(lifecycle);
            self.notify.notify_waiters();
        }
    }

    fn revoke_actor(&self) {
        let mut lifecycle = self.lock();
        lifecycle.actor_live = false;
        lifecycle.window = SystemContextBoundaryWindow::Closed;
        drop(lifecycle);
        self.notify.notify_waiters();
    }
}

/// Run-scoped closure guard for the exact actor's cooperative model boundary.
/// Every normal return, error, hard-cancel drop, and task abort closes any
/// registered or parked request for this run.
#[must_use]
pub(crate) struct SystemContextBoundaryRunGuard {
    boundary: Arc<SystemContextBoundaryCoordinator>,
    run_id: RunId,
}

impl Drop for SystemContextBoundaryRunGuard {
    fn drop(&mut self) {
        self.boundary.close_run(&self.run_id);
    }
}

struct PendingSystemContextBoundaryPreparation {
    boundary: Arc<SystemContextBoundaryCoordinator>,
    request_id: u64,
    armed: bool,
}

impl Drop for PendingSystemContextBoundaryPreparation {
    fn drop(&mut self) {
        if self.armed {
            let _ = self.boundary.abort_request(self.request_id);
        }
    }
}

/// Runner-owned witness for the exact model request currently being prepared.
///
/// External commit only publishes the candidate as canonical pending state; it
/// does not claim that the model has consumed it. The runner retains this
/// second, actor-local witness across fallible/async request preprocessing and
/// marks the pending state applied synchronously at the final LLM call seam.
/// Dropping the witness closes the generation without marking anything applied.
#[must_use = "model-boundary context must be consumed or dropped before opening another boundary"]
pub(crate) struct ModelBoundarySystemContext {
    state: SystemContextStateHandle,
    run_id: RunId,
    generation: u64,
    request_id: Option<u64>,
    appends: Vec<PendingSystemContextAppend>,
    armed: bool,
}

impl ModelBoundarySystemContext {
    pub(crate) fn appends(&self) -> &[PendingSystemContextAppend] {
        &self.appends
    }

    /// Pre-serialize the exact post-consumption metadata state while failure is
    /// still harmless. The consuming window rejects concurrent mutation, so
    /// this projection remains exact until [`Self::consume`].
    pub(crate) fn projected_state_after_consume(&self) -> SessionSystemContextState {
        let mut projected = self.state.snapshot();
        projected.mark_pending_applied();
        projected
    }

    pub(crate) fn consume(
        mut self,
    ) -> Result<Vec<PendingSystemContextAppend>, CoreBoundaryStageError> {
        self.state.finish_model_boundary_consumption(
            &self.run_id,
            self.generation,
            self.request_id,
            true,
        )?;
        self.armed = false;
        Ok(std::mem::take(&mut self.appends))
    }
}

impl Drop for ModelBoundarySystemContext {
    fn drop(&mut self) {
        if self.armed {
            let _ = self.state.finish_model_boundary_consumption(
                &self.run_id,
                self.generation,
                self.request_id,
                false,
            );
            self.armed = false;
        }
    }
}

/// Unforgeable exact `{actor incarnation, run, boundary generation}`
/// preparation. It is created only by the shared system-context authority
/// after the runner has parked at the named boundary.
///
/// ```compile_fail
/// use meerkat_core::PreparedSystemContextBoundary;
/// fn cannot_duplicate(authority: &PreparedSystemContextBoundary) {
///     let _duplicate = authority.clone();
/// }
/// ```
#[must_use = "prepared system context must be committed or aborted"]
pub struct PreparedSystemContextBoundary {
    state: SystemContextStateHandle,
    expected_run_id: RunId,
    generation: u64,
    request_id: u64,
    candidate_state: SessionSystemContextState,
    armed: bool,
    // The unique resolution authority may move to an owned commit task, but
    // sharing one authority by reference across threads is unnecessary and
    // obscures its exactly-once ownership contract.
    _not_sync: std::marker::PhantomData<std::cell::Cell<()>>,
}

impl std::fmt::Debug for PreparedSystemContextBoundary {
    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        formatter
            .debug_struct("PreparedSystemContextBoundary")
            .field("actor_incarnation", &self.state.boundary.incarnation_id)
            .field("expected_run_id", &self.expected_run_id)
            .field("generation", &self.generation)
            .field("request_id", &self.request_id)
            .finish_non_exhaustive()
    }
}

impl PreparedSystemContextBoundary {
    #[must_use]
    pub fn expected_run_id(&self) -> &RunId {
        &self.expected_run_id
    }

    #[must_use]
    pub fn boundary_generation(&self) -> u64 {
        self.generation
    }

    #[must_use]
    pub fn candidate_state(&self) -> &SessionSystemContextState {
        &self.candidate_state
    }

    /// Bind the unforgeable parked authority to its optional durable session
    /// snapshot. Surfaces cannot manufacture a successful output without this
    /// core-minted preparation value.
    pub fn into_stage_output(
        self,
        session_snapshot: Option<Vec<u8>>,
    ) -> crate::lifecycle::CoreBoundaryStageOutput {
        crate::lifecycle::CoreBoundaryStageOutput::prepared(session_snapshot, Box::new(self))
    }

    fn resolve(
        &mut self,
        resolution: SystemContextBoundaryResolution,
    ) -> Result<(), CoreBoundaryStageError> {
        if !self.armed {
            return Err(CoreBoundaryStageError::stale(
                "prepared boundary authority was already resolved",
            ));
        }
        let mut lifecycle = self.state.boundary.lock();
        if !lifecycle.actor_live {
            self.armed = false;
            return Err(CoreBoundaryStageError::stale(format!(
                "actor incarnation {} was revoked",
                self.state.boundary.incarnation_id
            )));
        }
        let matches_exact = matches!(
            &lifecycle.window,
            SystemContextBoundaryWindow::Parked {
                run_id,
                generation,
                request_id,
                ..
            } if run_id == &self.expected_run_id
                && *generation == self.generation
                && *request_id == self.request_id
        );
        if !matches_exact {
            self.armed = false;
            return Err(CoreBoundaryStageError::stale(format!(
                "actor/run/boundary witness no longer matches request {}",
                self.request_id
            )));
        }
        if matches!(&resolution, SystemContextBoundaryResolution::Committed) {
            let mut state = self
                .state
                .inner
                .lock()
                .unwrap_or_else(std::sync::PoisonError::into_inner);
            *state = self.candidate_state.clone();
        }
        lifecycle.window = SystemContextBoundaryWindow::Resolved {
            run_id: self.expected_run_id.clone(),
            generation: self.generation,
            request_id: self.request_id,
            resolution,
        };
        self.armed = false;
        drop(lifecycle);
        self.state.boundary.notify.notify_waiters();
        Ok(())
    }
}

impl crate::lifecycle::core_executor::CoreBoundaryStageCommitAuthority
    for PreparedSystemContextBoundary
{
    fn commit(&mut self) -> Result<(), CoreBoundaryStageError> {
        self.resolve(SystemContextBoundaryResolution::Committed)
    }

    fn abort(&mut self) -> Result<(), CoreBoundaryStageError> {
        self.resolve(SystemContextBoundaryResolution::Aborted)
    }
}

impl Drop for PreparedSystemContextBoundary {
    fn drop(&mut self) {
        if self.armed {
            let _ = self.state.boundary.abort_request(self.request_id);
            self.armed = false;
        }
    }
}

impl std::fmt::Debug for SystemContextStateHandle {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        f.debug_struct("SystemContextStateHandle")
            .field("inner", &"<Arc<Mutex<SessionSystemContextState>>>")
            .field("actor_incarnation", &self.boundary.incarnation_id)
            .finish()
    }
}

impl SystemContextStateHandle {
    fn boundary_reserves_state(lifecycle: &SystemContextBoundaryLifecycle) -> bool {
        matches!(
            &lifecycle.window,
            SystemContextBoundaryWindow::Parked { .. }
                | SystemContextBoundaryWindow::Resolved { .. }
                | SystemContextBoundaryWindow::Consuming { .. }
        )
    }

    pub fn new(state: SessionSystemContextState) -> Result<Self, serde_json::Error> {
        let state = system_context_authority::restore_system_context_state(state)
            .map_err(<serde_json::Error as serde::de::Error>::custom)?;
        Ok(Self {
            inner: Arc::new(std::sync::Mutex::new(state)),
            boundary: Arc::new(SystemContextBoundaryCoordinator::default()),
        })
    }

    /// Open the first exact cooperative model-boundary window for `run_id` and
    /// return a guard that closes it on every exit, including future drop.
    pub(crate) fn begin_boundary_run(
        &self,
        run_id: RunId,
    ) -> Result<SystemContextBoundaryRunGuard, CoreBoundaryStageError> {
        self.open_next_boundary(&run_id)?;
        Ok(SystemContextBoundaryRunGuard {
            boundary: Arc::clone(&self.boundary),
            run_id,
        })
    }

    /// Ensure an exact next-boundary window is open for the active run. Calling
    /// this twice before consumption is idempotent; after consumption it mints
    /// the next monotonically increasing actor-local generation.
    pub(crate) fn open_next_boundary(&self, run_id: &RunId) -> Result<u64, CoreBoundaryStageError> {
        let mut lifecycle = self.boundary.lock();
        if !lifecycle.actor_live {
            return Err(CoreBoundaryStageError::stale(format!(
                "actor incarnation {} was revoked",
                self.boundary.incarnation_id
            )));
        }
        match &lifecycle.window {
            SystemContextBoundaryWindow::Open {
                run_id: current,
                generation,
                ..
            } if current == run_id => return Ok(*generation),
            SystemContextBoundaryWindow::Parked { .. }
            | SystemContextBoundaryWindow::Resolved { .. }
            | SystemContextBoundaryWindow::Consuming { .. } => {
                return Err(CoreBoundaryStageError::fault(
                    "runner attempted to open a new boundary while the prior boundary was unresolved",
                ));
            }
            SystemContextBoundaryWindow::Open {
                run_id: current, ..
            } => {
                return Err(CoreBoundaryStageError::stale(format!(
                    "run {run_id} cannot replace still-open boundary owned by {current}"
                )));
            }
            SystemContextBoundaryWindow::Closed => {}
        }
        lifecycle.next_generation = lifecycle
            .next_generation
            .checked_add(1)
            .ok_or_else(|| CoreBoundaryStageError::fault("boundary generation overflow"))?;
        let generation = lifecycle.next_generation;
        lifecycle.window = SystemContextBoundaryWindow::Open {
            run_id: run_id.clone(),
            generation,
            request: None,
        };
        drop(lifecycle);
        self.boundary.notify.notify_waiters();
        Ok(generation)
    }

    /// Register context for the exact currently-open generation, then wait
    /// until the runner is parked immediately before consuming it. The lock
    /// linearization makes runner-first return `Unavailable` and prepare-first
    /// park; no snapshot/boolean sampling participates in the verdict.
    pub async fn prepare_active_turn_boundary(
        &self,
        expected_run_id: &RunId,
        appends: Vec<PendingSystemContextAppend>,
    ) -> Result<PreparedSystemContextBoundary, CoreBoundaryStageError> {
        if appends.is_empty() {
            return Err(CoreBoundaryStageError::fault(
                "boundary preparation requires at least one context append",
            ));
        }
        let stage_inputs = appends
            .into_iter()
            .map(|append| {
                (
                    AppendSystemContextRequest {
                        content: append.content,
                        source: append.source,
                        idempotency_key: append.idempotency_key,
                        source_kind: append.source_kind,
                        peer_response_terminal: append.peer_response_terminal,
                    },
                    append.accepted_at,
                )
            })
            .collect::<Vec<_>>();

        let request_id = {
            let mut lifecycle = self.boundary.lock();
            if !lifecycle.actor_live {
                return Err(CoreBoundaryStageError::stale(format!(
                    "actor incarnation {} was revoked",
                    self.boundary.incarnation_id
                )));
            }
            let (run_id, request) = match &mut lifecycle.window {
                SystemContextBoundaryWindow::Open {
                    run_id, request, ..
                } => (run_id, request),
                SystemContextBoundaryWindow::Closed => {
                    return Err(CoreBoundaryStageError::unavailable(format!(
                        "run {expected_run_id} has no open cooperative model boundary"
                    )));
                }
                SystemContextBoundaryWindow::Parked { .. }
                | SystemContextBoundaryWindow::Resolved { .. }
                | SystemContextBoundaryWindow::Consuming { .. } => {
                    return Err(CoreBoundaryStageError::unavailable(format!(
                        "the open boundary for run {expected_run_id} was already claimed or consumed"
                    )));
                }
            };
            if run_id != expected_run_id {
                return Err(CoreBoundaryStageError::stale(format!(
                    "open boundary belongs to run {run_id}, not {expected_run_id}"
                )));
            }
            if request.is_some() {
                return Err(CoreBoundaryStageError::unavailable(format!(
                    "the next boundary for run {expected_run_id} already has a preparation"
                )));
            }
            // Validate idempotency/conflict semantics against the exact state
            // observed at registration without publishing the candidate.
            let state = self
                .inner
                .lock()
                .unwrap_or_else(std::sync::PoisonError::into_inner);
            let mut candidate = state.clone();
            for (append, accepted_at) in &stage_inputs {
                candidate
                    .stage_active_turn_append(append, *accepted_at)
                    .map_err(|error| CoreBoundaryStageError::fault(error.to_string()))?;
            }
            drop(state);
            lifecycle.next_request_id = lifecycle
                .next_request_id
                .checked_add(1)
                .ok_or_else(|| CoreBoundaryStageError::fault("boundary request id overflow"))?;
            let request_id = lifecycle.next_request_id;
            let SystemContextBoundaryWindow::Open { request, .. } = &mut lifecycle.window else {
                return Err(CoreBoundaryStageError::fault(
                    "boundary window changed while registering preparation",
                ));
            };
            *request = Some(RegisteredSystemContextBoundaryRequest {
                request_id,
                appends: stage_inputs,
            });
            request_id
        };

        let mut pending = PendingSystemContextBoundaryPreparation {
            boundary: Arc::clone(&self.boundary),
            request_id,
            armed: true,
        };
        self.boundary.notify.notify_waiters();

        loop {
            let notified = self.boundary.notify.notified();
            tokio::pin!(notified);
            notified.as_mut().enable();
            let poll = {
                let lifecycle = self.boundary.lock();
                if lifecycle.actor_live {
                    match &lifecycle.window {
                        SystemContextBoundaryWindow::Parked {
                            run_id,
                            generation,
                            request_id: parked_request_id,
                            candidate_state,
                        } if *parked_request_id == request_id => {
                            Ok(Some(PreparedSystemContextBoundary {
                                state: self.clone(),
                                expected_run_id: run_id.clone(),
                                generation: *generation,
                                request_id,
                                candidate_state: candidate_state.clone(),
                                armed: true,
                                _not_sync: std::marker::PhantomData,
                            }))
                        }
                        SystemContextBoundaryWindow::Open { request, .. }
                            if request
                                .as_ref()
                                .is_some_and(|request| request.request_id == request_id) =>
                        {
                            Ok(None)
                        }
                        SystemContextBoundaryWindow::Resolved {
                            request_id: resolved_request_id,
                            resolution,
                            ..
                        } if *resolved_request_id == request_id => match resolution {
                            SystemContextBoundaryResolution::Failed(error) => Err(error.clone()),
                            SystemContextBoundaryResolution::Committed
                            | SystemContextBoundaryResolution::Aborted => {
                                Err(CoreBoundaryStageError::stale(format!(
                                    "boundary request {request_id} resolved before its authority was delivered"
                                )))
                            }
                        },
                        _ => Err(CoreBoundaryStageError::unavailable(format!(
                            "run {expected_run_id} ended before boundary request {request_id} parked"
                        ))),
                    }
                } else {
                    Err(CoreBoundaryStageError::stale(format!(
                        "actor incarnation {} was revoked while preparing boundary",
                        self.boundary.incarnation_id
                    )))
                }
            };
            match poll {
                Ok(Some(prepared)) => {
                    pending.armed = false;
                    return Ok(prepared);
                }
                Ok(None) => notified.as_mut().await,
                Err(error) => return Err(error),
            }
        }
    }

    /// Park at the exact model boundary and return a runner-owned consumption
    /// witness. Once a preparation has registered, this future cannot return
    /// until its authority commits, aborts, is dropped, or the run/actor closes.
    /// Returned pending state is not marked applied until the witness is
    /// synchronously consumed at the final LLM call seam.
    pub(crate) async fn take_pending_at_exact_boundary(
        &self,
        run_id: &RunId,
    ) -> Result<ModelBoundarySystemContext, CoreBoundaryStageError> {
        let parked_request_id;
        {
            let mut lifecycle = self.boundary.lock();
            if !lifecycle.actor_live {
                return Err(CoreBoundaryStageError::stale(format!(
                    "actor incarnation {} was revoked",
                    self.boundary.incarnation_id
                )));
            }
            let (generation, request) = match &mut lifecycle.window {
                SystemContextBoundaryWindow::Open {
                    run_id: current,
                    generation,
                    request,
                } if current == run_id => (*generation, request.take()),
                SystemContextBoundaryWindow::Open {
                    run_id: current, ..
                } => {
                    return Err(CoreBoundaryStageError::stale(format!(
                        "runner {run_id} reached boundary owned by {current}"
                    )));
                }
                SystemContextBoundaryWindow::Closed => {
                    return Err(CoreBoundaryStageError::unavailable(format!(
                        "run {run_id} reached a boundary with no open generation"
                    )));
                }
                SystemContextBoundaryWindow::Parked { .. }
                | SystemContextBoundaryWindow::Resolved { .. }
                | SystemContextBoundaryWindow::Consuming { .. } => {
                    return Err(CoreBoundaryStageError::fault(
                        "runner re-entered an unresolved model boundary",
                    ));
                }
            };
            if let Some(request) = request {
                let RegisteredSystemContextBoundaryRequest {
                    request_id,
                    appends,
                } = request;
                let state = self
                    .inner
                    .lock()
                    .unwrap_or_else(std::sync::PoisonError::into_inner);
                let mut candidate_state = state.clone();
                let candidate_result = appends.into_iter().try_for_each(|(append, accepted_at)| {
                    candidate_state
                        .stage_active_turn_append(&append, accepted_at)
                        .map(|_| ())
                });
                if let Err(error) = candidate_result {
                    drop(state);
                    let error = CoreBoundaryStageError::fault(error.to_string());
                    lifecycle.window = SystemContextBoundaryWindow::Resolved {
                        run_id: run_id.clone(),
                        generation,
                        request_id,
                        resolution: SystemContextBoundaryResolution::Failed(error.clone()),
                    };
                    drop(lifecycle);
                    self.boundary.notify.notify_waiters();
                    return Err(error);
                }
                drop(state);
                parked_request_id = request_id;
                lifecycle.window = SystemContextBoundaryWindow::Parked {
                    run_id: run_id.clone(),
                    generation,
                    request_id,
                    candidate_state,
                };
            } else {
                let state = self
                    .inner
                    .lock()
                    .unwrap_or_else(std::sync::PoisonError::into_inner);
                let pending = state.pending().to_vec();
                drop(state);
                lifecycle.window = SystemContextBoundaryWindow::Consuming {
                    run_id: run_id.clone(),
                    generation,
                    request_id: None,
                };
                return Ok(ModelBoundarySystemContext {
                    state: self.clone(),
                    run_id: run_id.clone(),
                    generation,
                    request_id: None,
                    appends: pending,
                    armed: true,
                });
            }
        }
        self.boundary.notify.notify_waiters();

        let request_id = parked_request_id;
        struct RunnerParkGuard {
            boundary: Arc<SystemContextBoundaryCoordinator>,
            request_id: u64,
            armed: bool,
        }
        impl Drop for RunnerParkGuard {
            fn drop(&mut self) {
                if self.armed {
                    let _ = self.boundary.abort_request(self.request_id);
                }
            }
        }
        let mut park_guard = RunnerParkGuard {
            boundary: Arc::clone(&self.boundary),
            request_id,
            armed: true,
        };

        loop {
            let notified = self.boundary.notify.notified();
            tokio::pin!(notified);
            notified.as_mut().enable();
            let poll = {
                let mut lifecycle = self.boundary.lock();
                if lifecycle.actor_live {
                    match &lifecycle.window {
                        SystemContextBoundaryWindow::Parked {
                            request_id: parked_request_id,
                            ..
                        } if *parked_request_id == request_id => Ok(None),
                        SystemContextBoundaryWindow::Resolved {
                            run_id: resolved_run_id,
                            generation,
                            request_id: resolved_request_id,
                            resolution,
                        } if resolved_run_id == run_id && *resolved_request_id == request_id => {
                            let resolution = resolution.clone();
                            let generation = *generation;
                            if let SystemContextBoundaryResolution::Failed(error) = resolution {
                                Err(error)
                            } else {
                                let pending = {
                                    let state = self
                                        .inner
                                        .lock()
                                        .unwrap_or_else(std::sync::PoisonError::into_inner);
                                    state.pending().to_vec()
                                };
                                lifecycle.window = SystemContextBoundaryWindow::Consuming {
                                    run_id: run_id.clone(),
                                    generation,
                                    request_id: Some(request_id),
                                };
                                Ok(Some((
                                    ModelBoundarySystemContext {
                                        state: self.clone(),
                                        run_id: run_id.clone(),
                                        generation,
                                        request_id: Some(request_id),
                                        appends: pending,
                                        armed: true,
                                    },
                                    resolution,
                                )))
                            }
                        }
                        _ => Err(CoreBoundaryStageError::stale(format!(
                            "parked boundary request {request_id} lost exact run/generation authority"
                        ))),
                    }
                } else {
                    Err(CoreBoundaryStageError::stale(format!(
                        "actor incarnation {} was revoked while parked",
                        self.boundary.incarnation_id
                    )))
                }
            };
            match poll {
                Ok(Some((context, resolution))) => {
                    park_guard.armed = false;
                    self.boundary.notify.notify_waiters();
                    if matches!(resolution, SystemContextBoundaryResolution::Aborted) {
                        tracing::debug!(
                            actor_incarnation = %self.boundary.incarnation_id,
                            run_id = %run_id,
                            request_id,
                            "exact model-boundary preparation aborted; consuming ordinary pending context only"
                        );
                    }
                    return Ok(context);
                }
                Ok(None) => notified.as_mut().await,
                Err(error) => {
                    park_guard.armed = false;
                    return Err(error);
                }
            }
        }
    }

    fn finish_model_boundary_consumption(
        &self,
        run_id: &RunId,
        generation: u64,
        request_id: Option<u64>,
        apply: bool,
    ) -> Result<(), CoreBoundaryStageError> {
        let mut lifecycle = self.boundary.lock();
        if !lifecycle.actor_live {
            return Err(CoreBoundaryStageError::stale(format!(
                "actor incarnation {} was revoked before model-boundary consumption",
                self.boundary.incarnation_id
            )));
        }
        let matches_exact = matches!(
            &lifecycle.window,
            SystemContextBoundaryWindow::Consuming {
                run_id: current_run_id,
                generation: current_generation,
                request_id: current_request_id,
            } if current_run_id == run_id
                && *current_generation == generation
                && *current_request_id == request_id
        );
        if !matches_exact {
            return Err(CoreBoundaryStageError::stale(format!(
                "runner model-boundary witness for run {run_id} generation {generation} is no longer current"
            )));
        }
        if apply {
            let mut state = self
                .inner
                .lock()
                .unwrap_or_else(std::sync::PoisonError::into_inner);
            state.mark_pending_applied();
        }
        lifecycle.window = SystemContextBoundaryWindow::Closed;
        drop(lifecycle);
        self.boundary.notify.notify_waiters();
        Ok(())
    }

    /// Revoke this exact actor allocation. Existing prepared authorities can
    /// no longer publish, and all runner/preparer waiters are synchronously
    /// released before actor-registry removal awaits anything.
    pub fn revoke_boundary_actor(&self) {
        self.boundary.revoke_actor();
    }

    pub fn snapshot(&self) -> SessionSystemContextState {
        match self.inner.lock() {
            Ok(guard) => guard.clone(),
            Err(poisoned) => {
                tracing::warn!("system-context state lock poisoned while reading snapshot");
                poisoned.into_inner().clone()
            }
        }
    }

    pub fn replace_from_generated_restore(
        &self,
        state: SessionSystemContextState,
    ) -> Result<(), serde_json::Error> {
        let state = system_context_authority::restore_system_context_state(state)
            .map_err(<serde_json::Error as serde::de::Error>::custom)?;
        let boundary = self.boundary.lock();
        if Self::boundary_reserves_state(&boundary) {
            return Err(<serde_json::Error as serde::de::Error>::custom(
                "system-context state is reserved by an exact parked boundary",
            ));
        }
        match self.inner.lock() {
            Ok(mut guard) => {
                *guard = state;
            }
            Err(poisoned) => {
                tracing::warn!("system-context state lock poisoned while restoring state");
                *poisoned.into_inner() = state;
            }
        }
        Ok(())
    }

    pub fn replace_from_generated_restore_if_changed(
        &self,
        state: SessionSystemContextState,
    ) -> Result<bool, serde_json::Error> {
        let state = system_context_authority::restore_system_context_state(state)
            .map_err(<serde_json::Error as serde::de::Error>::custom)?;
        let boundary = self.boundary.lock();
        if Self::boundary_reserves_state(&boundary) {
            return Err(<serde_json::Error as serde::de::Error>::custom(
                "system-context state is reserved by an exact parked boundary",
            ));
        }
        let mut guard = match self.inner.lock() {
            Ok(guard) => guard,
            Err(poisoned) => {
                tracing::warn!(
                    "system-context state lock poisoned while replacing generated-restored state"
                );
                poisoned.into_inner()
            }
        };
        if *guard == state {
            return Ok(false);
        }
        *guard = state;
        Ok(true)
    }

    pub fn replace_from_generated_restore_if_current(
        &self,
        current: &SessionSystemContextState,
        replacement: SessionSystemContextState,
    ) -> Result<bool, serde_json::Error> {
        let replacement = system_context_authority::restore_system_context_state(replacement)
            .map_err(<serde_json::Error as serde::de::Error>::custom)?;
        let boundary = self.boundary.lock();
        if Self::boundary_reserves_state(&boundary) {
            return Err(<serde_json::Error as serde::de::Error>::custom(
                "system-context state is reserved by an exact parked boundary",
            ));
        }
        let mut guard = match self.inner.lock() {
            Ok(guard) => guard,
            Err(poisoned) => {
                tracing::warn!(
                    "system-context state lock poisoned while conditionally replacing generated-restored state"
                );
                poisoned.into_inner()
            }
        };
        if *guard != *current {
            return Ok(false);
        }
        *guard = replacement;
        Ok(true)
    }

    pub fn stage_append_with_snapshot(
        &self,
        req: &AppendSystemContextRequest,
        accepted_at: SystemTime,
    ) -> Result<
        (
            crate::service::AppendSystemContextStatus,
            SessionSystemContextState,
            SessionSystemContextState,
        ),
        SystemContextStageError,
    > {
        let boundary = self.boundary.lock();
        if Self::boundary_reserves_state(&boundary) {
            return Err(SystemContextStageError::InvalidRequest(
                "system-context state is reserved by an exact parked boundary".to_string(),
            ));
        }
        let mut guard = match self.inner.lock() {
            Ok(guard) => guard,
            Err(poisoned) => {
                tracing::warn!("system-context state lock poisoned while staging append");
                poisoned.into_inner()
            }
        };
        let snapshot = guard.clone();
        let status = guard.stage_append(req, accepted_at)?;
        let staged = guard.clone();
        Ok((status, snapshot, staged))
    }

    pub fn stage_active_turn_appends_with_snapshot(
        &self,
        appends: Vec<(AppendSystemContextRequest, SystemTime)>,
    ) -> Result<(SessionSystemContextState, SessionSystemContextState), SystemContextStageError>
    {
        let boundary = self.boundary.lock();
        if Self::boundary_reserves_state(&boundary) {
            return Err(SystemContextStageError::InvalidRequest(
                "system-context state is reserved by an exact parked boundary".to_string(),
            ));
        }
        let mut guard = match self.inner.lock() {
            Ok(guard) => guard,
            Err(poisoned) => {
                tracing::warn!(
                    "system-context state lock poisoned while staging active-turn appends"
                );
                poisoned.into_inner()
            }
        };
        let snapshot = guard.clone();
        let mut candidate = snapshot.clone();
        for (req, accepted_at) in appends {
            candidate.stage_active_turn_append(&req, accepted_at)?;
        }
        *guard = candidate.clone();
        let staged = candidate;
        Ok((snapshot, staged))
    }

    pub fn discard_unapplied_active_turn_pending(&self) -> Result<usize, CoreBoundaryStageError> {
        let boundary = self.boundary.lock();
        if Self::boundary_reserves_state(&boundary) {
            return Err(CoreBoundaryStageError::fault(format!(
                "cannot discard active-turn system context while exact actor incarnation {} owns a parked or consuming boundary",
                self.boundary.incarnation_id
            )));
        }
        let discarded = match self.inner.lock() {
            Ok(mut guard) => guard.discard_unapplied_active_turn_pending(),
            Err(poisoned) => {
                tracing::warn!(
                    "system-context state lock poisoned while discarding active-turn context"
                );
                poisoned
                    .into_inner()
                    .discard_unapplied_active_turn_pending()
            }
        };
        Ok(discarded.len())
    }

    pub fn discard_active_turn_pending_by_keys(
        &self,
        idempotency_keys: &[String],
    ) -> Result<Vec<PendingSystemContextAppend>, CoreBoundaryStageError> {
        let boundary = self.boundary.lock();
        if Self::boundary_reserves_state(&boundary) {
            return Err(CoreBoundaryStageError::fault(format!(
                "cannot discard keyed active-turn system context while exact actor incarnation {} owns a parked or consuming boundary",
                self.boundary.incarnation_id
            )));
        }
        let discarded = match self.inner.lock() {
            Ok(mut guard) => guard.discard_active_turn_pending_by_keys(idempotency_keys),
            Err(poisoned) => {
                tracing::warn!(
                    "system-context state lock poisoned while discarding active-turn pending appends"
                );
                poisoned
                    .into_inner()
                    .discard_active_turn_pending_by_keys(idempotency_keys)
            }
        };
        Ok(discarded)
    }

    pub fn stage_active_turn_append(
        &self,
        req: &AppendSystemContextRequest,
        accepted_at: SystemTime,
    ) -> Result<crate::service::AppendSystemContextStatus, SystemContextStageError> {
        let boundary = self.boundary.lock();
        if Self::boundary_reserves_state(&boundary) {
            return Err(SystemContextStageError::InvalidRequest(
                "system-context state is reserved by an exact parked boundary".to_string(),
            ));
        }
        match self.inner.lock() {
            Ok(mut guard) => guard.stage_active_turn_append(req, accepted_at),
            Err(poisoned) => {
                tracing::warn!(
                    "system-context state lock poisoned while staging active-turn context"
                );
                poisoned
                    .into_inner()
                    .stage_active_turn_append(req, accepted_at)
            }
        }
    }
}

/// Durable control state for runtime system-context append requests.
// Cannot derive `Eq`: `PendingSystemContextAppend` carries a typed
// `peer_response_terminal` fact whose render payload is a `serde_json::Value`.
#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
#[serde(rename_all = "snake_case")]
pub struct SessionSystemContextState {
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub(crate) pending: Vec<PendingSystemContextAppend>,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub(crate) applied: Vec<PendingSystemContextAppend>,
    #[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")]
    pub(crate) seen: std::collections::BTreeMap<String, SeenSystemContextKey>,
    /// Keyed projection used for idempotency-aware rollback. This is not the
    /// lifetime owner because active-turn appends may be keyless.
    #[serde(default, skip_serializing_if = "std::collections::BTreeSet::is_empty")]
    pub(crate) active_turn_pending_keys: std::collections::BTreeSet<String>,
    /// Exact positions in `pending` that belong to the active turn.
    ///
    /// Idempotency keys are optional, so they cannot carry lifetime ownership.
    /// The positional witness is durable and independent of deduplication;
    /// every pending-queue mutation rebases it atomically with the queue.
    #[serde(default, skip_serializing_if = "std::collections::BTreeSet::is_empty")]
    pub(crate) active_turn_pending_indices: std::collections::BTreeSet<u64>,
}

/// Typed provenance class for a runtime system-context append.
///
/// Canonical replacement for the retired `runtime:steer:` string-prefix
/// folklore. The PRODUCER of a runtime-steer append (the runtime input
/// projection in `meerkat-runtime`) constructs it with
/// [`SystemContextSource::RuntimeSteer`]; everything else is
/// [`SystemContextSource::Normal`]. No code reclassifies a `source` string
/// into this fact — it is set once at construction and the machine guards the
/// typed field.
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
#[serde(rename_all = "snake_case")]
pub enum SystemContextSource {
    /// A durable, non-transient runtime context append (peer responses, etc.).
    #[default]
    Normal,
    /// A transient operator/peer steer append that must not survive past the
    /// turn it steers and must not be promoted to the durable applied set.
    RuntimeSteer,
}

impl From<SystemContextSource> for session_document::SystemContextSource {
    fn from(value: SystemContextSource) -> Self {
        match value {
            SystemContextSource::Normal => Self::Normal,
            SystemContextSource::RuntimeSteer => Self::RuntimeSteer,
        }
    }
}

impl SystemContextSource {
    /// Whether this is the default (`Normal`) provenance. Used by
    /// `skip_serializing_if` so durable appends serialize without the field.
    #[must_use]
    pub fn is_normal(&self) -> bool {
        matches!(self, Self::Normal)
    }

    /// Whether this append is a transient runtime steer.
    #[must_use]
    pub fn is_runtime_steer(&self) -> bool {
        matches!(self, Self::RuntimeSteer)
    }
}

/// Pending append request accepted by the control plane but not yet applied at an LLM boundary.
// Cannot derive `Eq`: the typed `peer_response_terminal` fact carries a
// `serde_json::Value` render payload, which is `PartialEq` but not `Eq`.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
#[serde(rename_all = "snake_case")]
pub struct PendingSystemContextAppend {
    /// Typed renderable append content, carried end-to-end from the surface
    /// request ([`AppendSystemContextRequest.content`]). The ONE lowering to
    /// model-facing prompt text happens where the transcript consumes the
    /// append ([`CoreRenderable::render_text`] inside the render seam) —
    /// surfaces never pre-flatten this into a string.
    ///
    /// [`CoreRenderable::render_text`]: crate::lifecycle::run_primitive::CoreRenderable::render_text
    pub content: crate::lifecycle::run_primitive::CoreRenderable,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub source: Option<String>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub idempotency_key: Option<String>,
    /// Typed provenance: whether this append is a transient runtime steer.
    #[serde(default, skip_serializing_if = "SystemContextSource::is_normal")]
    pub source_kind: SystemContextSource,
    /// Typed terminal-peer-response fact this append carries, when the append
    /// projects a `PeerResponseTerminalFact`. The producer stamps the typed
    /// fact here at construction; realtime/live consumers read the typed fact
    /// directly instead of re-parsing the flattened prompt `text`/`source`
    /// string (the `peer_response_terminal:` prefix + `Payload:` split). This
    /// mirrors the `source_kind` precedent that retired the `runtime:steer:`
    /// string-prefix re-derivation.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub peer_response_terminal: Option<crate::handles::PeerResponseTerminalFact>,
    pub accepted_at: SystemTime,
}

/// Typed terminal-lifecycle projection of the canonical
/// [`session_document::SessionDocumentMachine`] `session_lifecycle_terminal`
/// fact.
///
/// The machine owns archive lifecycle truth for ALL profiles (LUC-524 R004
/// fold): both the runtime-backed and the store-only archive paths drive the
/// machine's `ArchiveSessionDocument` input, and this reserved-key field is
/// the machine-realized durable projection of the emitted verdict — the shell
/// realizes it, it never decides it. `RuntimeState::Retired` is the runtime
/// realization of the SAME verdict; the fail-closed realization order (durable
/// document commit first, runtime retire second) keeps the two projections
/// convergent. A two-variant enum (rather than a bare bool) keeps future
/// terminal classes — e.g. `Destroyed` — extending the type rather than the
/// call sites.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum SessionLifecycleTerminal {
    /// The session is live / resumable.
    Active,
    /// The session has been archived and is terminal.
    Archived,
}

impl SessionLifecycleTerminal {
    /// Whether this terminal fact marks the session as archived.
    #[must_use]
    pub fn is_archived(self) -> bool {
        matches!(self, Self::Archived)
    }
}

impl From<SessionLifecycleTerminal> for session_document::SessionDocumentLifecycle {
    fn from(value: SessionLifecycleTerminal) -> Self {
        match value {
            SessionLifecycleTerminal::Active => Self::Active,
            SessionLifecycleTerminal::Archived => Self::Archived,
        }
    }
}

impl From<session_document::SessionDocumentLifecycle> for SessionLifecycleTerminal {
    fn from(value: session_document::SessionDocumentLifecycle) -> Self {
        match value {
            session_document::SessionDocumentLifecycle::Active => Self::Active,
            session_document::SessionDocumentLifecycle::Archived => Self::Archived,
        }
    }
}

/// Durable control state for deferred first-turn prompt and staged callback tool results.
#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
#[serde(rename_all = "snake_case")]
pub struct SessionDeferredTurnState {
    #[serde(default, skip_serializing_if = "DeferredFirstTurnPhase::is_inactive")]
    pub(crate) first_turn_phase: DeferredFirstTurnPhase,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub(crate) pending_initial_prompt: Option<PendingDeferredPrompt>,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub(crate) pending_tool_results: Vec<PendingToolResultsMessage>,
}

/// Canonical lifecycle phase for the session's deferred first turn.
#[derive(Debug, Clone, Copy, Serialize, Deserialize, Default, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub enum DeferredFirstTurnPhase {
    /// The session was not created in deferred-first-turn mode.
    #[default]
    Inactive,
    /// The session exists durably but the first turn has not started yet.
    Pending,
    /// The first turn has started; build-only overrides are no longer legal.
    Consumed,
}

impl DeferredFirstTurnPhase {
    pub fn is_inactive(&self) -> bool {
        matches!(self, Self::Inactive)
    }
}

impl From<DeferredFirstTurnPhase> for session_document::SessionFirstTurnPhase {
    fn from(value: DeferredFirstTurnPhase) -> Self {
        match value {
            DeferredFirstTurnPhase::Inactive => Self::Inactive,
            DeferredFirstTurnPhase::Pending => Self::Pending,
            DeferredFirstTurnPhase::Consumed => Self::Consumed,
        }
    }
}

impl From<session_document::SessionFirstTurnPhase> for DeferredFirstTurnPhase {
    fn from(value: session_document::SessionFirstTurnPhase) -> Self {
        match value {
            session_document::SessionFirstTurnPhase::Inactive => Self::Inactive,
            session_document::SessionFirstTurnPhase::Pending => Self::Pending,
            session_document::SessionFirstTurnPhase::Consumed => Self::Consumed,
        }
    }
}

fn is_default_hook_run_overrides(value: &crate::HookRunOverrides) -> bool {
    value == &crate::HookRunOverrides::default()
}

fn is_default_call_timeout_override(value: &crate::CallTimeoutOverride) -> bool {
    value == &crate::CallTimeoutOverride::default()
}

fn is_tool_filter_all(value: &ToolFilter) -> bool {
    matches!(value, ToolFilter::All)
}

fn is_zero(value: &u64) -> bool {
    *value == 0
}

/// Derive the machine-owned capability base filter from the current image-tool-results support.
pub fn capability_base_filter_for_image_tool_results(image_tool_results: bool) -> ToolFilter {
    if image_tool_results {
        ToolFilter::All
    } else {
        ToolFilter::Deny([VIEW_IMAGE_TOOL_NAME.to_string()].into_iter().collect())
    }
}

/// Persisted witness for a durable tool-visibility name.
///
/// `last_seen_provenance` is the single typed identity owner. The formatted
/// `stable_owner_key` string is a read-only projection derived on demand via
/// [`crate::tool_catalog::stable_owner_key_from_provenance`], never stored
/// beside the owner.
#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub struct ToolVisibilityWitness {
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub last_seen_provenance: Option<ToolProvenance>,
}

impl ToolVisibilityWitness {
    pub fn has_identity_witness(&self) -> bool {
        self.last_seen_provenance.is_some()
    }
}

/// Typed authority value for a deferred-tool load request.
///
/// The public/effect seam carries the requested route name and provenance
/// witness as one value. Canonical owners may project this into name-indexed
/// maps internally, but callers do not get to make a map key the authority.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub struct DeferredToolLoadAuthority {
    pub name: ToolName,
    pub witness: ToolVisibilityWitness,
}

impl DeferredToolLoadAuthority {
    pub fn new(name: impl Into<ToolName>, witness: ToolVisibilityWitness) -> Self {
        Self {
            name: name.into(),
            witness,
        }
    }

    pub fn into_parts(self) -> (ToolName, ToolVisibilityWitness) {
        (self.name, self.witness)
    }
}

/// Durable tool-filter intent paired with the witnesses that made the names
/// authoritative at capture time.
#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub struct WitnessedToolFilter {
    pub filter: ToolFilter,
    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
    pub witnesses: BTreeMap<ToolName, ToolVisibilityWitness>,
}

impl WitnessedToolFilter {
    pub fn new(filter: ToolFilter, witnesses: BTreeMap<ToolName, ToolVisibilityWitness>) -> Self {
        Self { filter, witnesses }
    }

    pub fn into_parts(self) -> (ToolFilter, BTreeMap<ToolName, ToolVisibilityWitness>) {
        (self.filter, self.witnesses)
    }
}

/// Opaque parent/composition-authorized inherited tool visibility handoff.
///
/// The filter and witnesses are intentionally not public fields. Callers that
/// need to hand inherited visibility to a child build must obtain this from an
/// AgentFactory-minted parent composition authority; they cannot write
/// canonical session visibility state directly.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct InheritedToolVisibilityAuthority {
    filter: ToolFilter,
    witnesses: BTreeMap<ToolName, ToolVisibilityWitness>,
}

impl InheritedToolVisibilityAuthority {
    pub(crate) fn from_generated_composition_authority(
        filter: ToolFilter,
        witnesses: BTreeMap<ToolName, ToolVisibilityWitness>,
    ) -> Self {
        Self { filter, witnesses }
    }

    pub fn filter(&self) -> &ToolFilter {
        &self.filter
    }

    pub fn witnesses(&self) -> &BTreeMap<ToolName, ToolVisibilityWitness> {
        &self.witnesses
    }

    pub(crate) fn into_initial_visibility_state(self) -> SessionToolVisibilityState {
        SessionToolVisibilityState {
            inherited_base_filter: self.filter,
            filter_witnesses: self.witnesses,
            ..Default::default()
        }
    }
}

/// Canonical durable session-local tool visibility intent.
#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub struct SessionToolVisibilityState {
    #[serde(default, skip_serializing_if = "is_tool_filter_all")]
    pub capability_base_filter: ToolFilter,
    #[serde(default, skip_serializing_if = "is_tool_filter_all")]
    pub inherited_base_filter: ToolFilter,
    #[serde(default, skip_serializing_if = "is_tool_filter_all")]
    pub active_filter: ToolFilter,
    #[serde(default, skip_serializing_if = "is_tool_filter_all")]
    pub staged_filter: ToolFilter,
    #[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
    pub active_requested_deferred_names: BTreeSet<ToolName>,
    #[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
    pub staged_requested_deferred_names: BTreeSet<ToolName>,
    #[serde(default, skip_serializing_if = "is_zero")]
    pub active_revision: u64,
    #[serde(default, skip_serializing_if = "is_zero")]
    pub staged_revision: u64,
    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
    pub requested_witnesses: BTreeMap<ToolName, ToolVisibilityWitness>,
    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
    pub filter_witnesses: BTreeMap<ToolName, ToolVisibilityWitness>,
}

impl SessionToolVisibilityState {
    /// Deterministic projection of the generated CallingLlm visibility
    /// boundary. This is a comparison witness only: semantic promotion still
    /// belongs to the generated visibility owner.
    #[cfg(test)]
    pub(crate) fn projected_boundary_applied(&self) -> Self {
        let mut projected = self.clone();
        projected.active_filter = self.staged_filter.clone();
        projected.active_requested_deferred_names = self.staged_requested_deferred_names.clone();
        projected.active_revision = self.staged_revision;
        projected
    }
}

/// Generated-authority-approved durable tool visibility projection.
///
/// Session metadata stores this as a projection of the generated visibility
/// owner. Code that only has raw `SessionToolVisibilityState` must first route
/// it through a `ToolVisibilityOwner`/`ToolScope` restore path.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct AuthorizedSessionToolVisibilityState {
    state: SessionToolVisibilityState,
}

impl AuthorizedSessionToolVisibilityState {
    pub(crate) fn from_generated_authority(state: SessionToolVisibilityState) -> Self {
        Self { state }
    }

    pub fn as_state(&self) -> &SessionToolVisibilityState {
        &self.state
    }

    pub fn into_state(self) -> SessionToolVisibilityState {
        self.state
    }
}

/// Durable build-only session state required to faithfully recover and rebuild
/// a persisted session without surface-local shadow config.
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
pub struct SessionBuildState {
    #[serde(
        default,
        skip_serializing_if = "crate::config::SystemPromptOverride::is_inherit"
    )]
    pub system_prompt: crate::config::SystemPromptOverride,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub output_schema: Option<crate::OutputSchema>,
    #[serde(default, skip_serializing_if = "is_default_hook_run_overrides")]
    pub hooks_override: crate::HookRunOverrides,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub budget_limits: Option<crate::BudgetLimits>,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub recoverable_tool_defs: Vec<ToolDef>,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub silent_comms_intents: Vec<String>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub max_inline_peer_notifications: Option<i32>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub app_context: Option<serde_json::Value>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub additional_instructions: Option<Vec<String>>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub shell_env: Option<HashMap<String, String>>,
    /// Compatibility projection of mob operator authority.
    ///
    /// `MobToolAuthorityContext` deliberately loses its generated authority
    /// seal when serialized; restored behavior must be approved by the
    /// generated runtime bridge before this projection can affect tools.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub mob_tool_authority_context: Option<MobToolAuthorityContext>,
    #[serde(default, skip_serializing_if = "is_default_call_timeout_override")]
    pub call_timeout_override: crate::CallTimeoutOverride,
    /// Exact assembled base-prompt bytes the last build applied (or verified)
    /// for this session. Runtime system-context appends extend the leading
    /// System message past this base; recording the base lets a later resume
    /// split the persisted content into `base + appended tail` byte-exactly
    /// (see [`Session::reconcile_resumed_system_prompt`]) instead of
    /// re-deriving append renders.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub assembled_system_prompt: Option<String>,
}

/// Deferred create-time prompt staged for the next turn.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
#[serde(rename_all = "snake_case")]
pub struct PendingDeferredPrompt {
    pub prompt: ContentInput,
    pub accepted_at: SystemTime,
}

/// Staged callback tool results waiting to be admitted on the next turn seam.
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub struct PendingToolResultsMessage {
    pub results: Vec<ToolResult>,
    pub accepted_at: SystemTime,
}

impl PartialEq for PendingToolResultsMessage {
    fn eq(&self, other: &Self) -> bool {
        self.accepted_at == other.accepted_at
            && serde_json::to_value(&self.results).ok() == serde_json::to_value(&other.results).ok()
    }
}

/// Deferred first-turn inputs consumed at the generated start-turn authority seam.
#[derive(Debug, Clone, Default, PartialEq)]
pub struct ConsumedDeferredTurnInputs {
    pub(crate) restore_first_turn_pending: bool,
    pub(crate) pending_initial_prompt: Option<PendingDeferredPrompt>,
    pub(crate) pending_tool_results: Vec<PendingToolResultsMessage>,
}

impl ConsumedDeferredTurnInputs {
    pub fn is_empty(&self) -> bool {
        !self.restore_first_turn_pending
            && self.pending_initial_prompt.is_none()
            && self.pending_tool_results.is_empty()
    }

    pub fn pending_initial_prompt(&self) -> Option<&PendingDeferredPrompt> {
        self.pending_initial_prompt.as_ref()
    }

    pub fn pending_tool_results(&self) -> &[PendingToolResultsMessage] {
        &self.pending_tool_results
    }
}

/// Seen idempotency-key entry for system-context append requests.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub struct SeenSystemContextKey {
    /// Typed renderable content of the accepted append for this key.
    pub content: crate::lifecycle::run_primitive::CoreRenderable,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub source: Option<String>,
    /// Typed provenance carried from the append, so runtime-steer cleanup can
    /// match seen entries by the typed marker rather than a `source` prefix.
    #[serde(default, skip_serializing_if = "SystemContextSource::is_normal")]
    pub source_kind: SystemContextSource,
    pub state: SeenSystemContextState,
}

/// Lifecycle state for an accepted idempotency key.
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub enum SeenSystemContextState {
    Pending,
    Applied,
}

impl SessionSystemContextState {
    pub fn pending(&self) -> &[PendingSystemContextAppend] {
        &self.pending
    }

    pub fn applied(&self) -> &[PendingSystemContextAppend] {
        &self.applied
    }

    pub fn seen(&self) -> &BTreeMap<String, SeenSystemContextKey> {
        &self.seen
    }

    pub fn active_turn_pending_keys(&self) -> &BTreeSet<String> {
        &self.active_turn_pending_keys
    }

    pub fn pending_len(&self) -> usize {
        self.pending.len()
    }

    pub fn applied_len(&self) -> usize {
        self.applied.len()
    }

    pub fn active_turn_pending_len(&self) -> usize {
        if self.active_turn_pending_indices.is_empty() && !self.active_turn_pending_keys.is_empty()
        {
            return self
                .pending
                .iter()
                .filter(|append| {
                    append
                        .idempotency_key
                        .as_ref()
                        .is_some_and(|key| self.active_turn_pending_keys.contains(key))
                })
                .count();
        }
        self.active_turn_pending_indices.len()
    }

    pub fn realtime_projection_appends(&self) -> Vec<PendingSystemContextAppend> {
        self.applied
            .iter()
            .chain(self.pending.iter())
            .cloned()
            .collect()
    }

    /// Stage an append request, enforcing per-session idempotency.
    pub fn stage_append(
        &mut self,
        req: &AppendSystemContextRequest,
        accepted_at: SystemTime,
    ) -> Result<crate::service::AppendSystemContextStatus, SystemContextStageError> {
        system_context_authority::stage_append(self, req, accepted_at, false)
    }

    fn stage_append_with_generated_authority(
        &mut self,
        req: &AppendSystemContextRequest,
        accepted_at: SystemTime,
        active_turn_scoped: bool,
    ) -> Result<crate::service::AppendSystemContextStatus, SystemContextStageError> {
        system_context_authority::stage_append(self, req, accepted_at, active_turn_scoped)
    }

    /// Stage an append that is scoped to the currently-active turn only.
    ///
    /// If the active turn reaches another model boundary, normal pending
    /// consumption moves it to `applied`. If the turn completes first, callers
    /// should discard the still-pending active-turn keys so the context cannot
    /// leak into an unrelated later run.
    pub fn stage_active_turn_append(
        &mut self,
        req: &AppendSystemContextRequest,
        accepted_at: SystemTime,
    ) -> Result<crate::service::AppendSystemContextStatus, SystemContextStageError> {
        self.stage_append_with_generated_authority(req, accepted_at, true)
    }

    /// Mark all currently-pending appends as applied and clear the pending queue.
    pub fn mark_pending_applied(&mut self) {
        system_context_authority::mark_pending_applied(self);
    }

    /// Discard active-turn-only appends that were not consumed by the turn's
    /// next LLM boundary.
    pub fn discard_unapplied_active_turn_pending(&mut self) -> Vec<PendingSystemContextAppend> {
        system_context_authority::discard_unapplied_active_turn_pending(self)
    }

    /// Discard specific active-turn-only appends that are still pending.
    ///
    /// This is the rollback companion for live-boundary staging. The runtime
    /// owns the accepted input, so if that commit fails after the session has
    /// staged context, the session-side projection must be removed by the same
    /// idempotency keys before the caller reports failure.
    pub fn discard_active_turn_pending_by_keys(
        &mut self,
        idempotency_keys: &[String],
    ) -> Vec<PendingSystemContextAppend> {
        system_context_authority::discard_active_turn_pending_by_keys(self, idempotency_keys)
    }

    /// Authorize this snapshot through the canonical
    /// [`session_document::SessionDocumentMachine`] system-context restore
    /// transition, returning the state unchanged on success.
    pub fn restore_from_snapshot(self) -> Result<Self, SystemContextStageError> {
        system_context_authority::restore_system_context_state(self)
    }

    /// Record the machine-authorized applied system-context blocks, returning
    /// the appends that are newly applied (and thus need rendering into the
    /// system prompt by the caller).
    pub fn record_applied_blocks(
        &mut self,
        appends: &[PendingSystemContextAppend],
        current_system_prompt: &str,
    ) -> Vec<PendingSystemContextAppend> {
        system_context_authority::record_applied_system_context_blocks(
            self,
            appends,
            current_system_prompt,
        )
    }
}

/// Per-session registry key for the first-turn region of the
/// [`session_document::SessionDocumentMachine`]. Each
/// [`SessionDeferredTurnState`] is a single session's projection, so its
/// machine instance carries exactly one registry entry under this key.
const SESSION_DOCUMENT_FIRST_TURN_KEY: &str = "first_turn";

fn usize_to_u64(value: usize) -> u64 {
    u64::try_from(value).unwrap_or(u64::MAX)
}

/// Authorize a durable deferred-turn snapshot through the canonical
/// [`session_document::SessionDocumentMachine`] recovery transition.
///
/// The machine validates that the persisted first-turn phase is a legal
/// recovery target and adopts it into its per-session registry, emitting
/// `SessionFirstTurnPhaseRecovered`. The snapshot is returned unchanged on
/// success; the machine — not this shell — owns the recovery legality.
fn validate_deferred_turn_snapshot(
    state: SessionDeferredTurnState,
) -> Result<SessionDeferredTurnState, session_document::SessionDocumentError> {
    let mut authority = session_document::SessionDocumentMachineAuthority::new();
    let key = session_document::SessionDocumentKey::new(SESSION_DOCUMENT_FIRST_TURN_KEY);
    // The recovery transition fails closed for any illegal first-turn phase
    // (its guard admits only the three known phases); a rejection surfaces as
    // `Err` here. On success the machine has adopted the snapshot.
    authority.recover_session_first_turn_phase(
        key,
        state.first_turn_phase.into(),
        state.pending_initial_prompt.is_some(),
        usize_to_u64(state.pending_tool_results.len()),
    )?;
    Ok(state)
}

impl SessionDeferredTurnState {
    pub fn first_turn_phase(&self) -> DeferredFirstTurnPhase {
        self.first_turn_phase
    }

    pub fn pending_initial_prompt(&self) -> Option<&PendingDeferredPrompt> {
        self.pending_initial_prompt.as_ref()
    }

    pub fn pending_tool_results(&self) -> &[PendingToolResultsMessage] {
        &self.pending_tool_results
    }

    pub fn pending_tool_results_len(&self) -> usize {
        self.pending_tool_results.len()
    }

    pub(crate) fn pending_initial_prompt_mut_for_blob_rewrite(
        &mut self,
    ) -> Option<&mut PendingDeferredPrompt> {
        self.pending_initial_prompt.as_mut()
    }

    pub(crate) fn pending_tool_results_mut_for_blob_rewrite(
        &mut self,
    ) -> &mut [PendingToolResultsMessage] {
        &mut self.pending_tool_results
    }

    /// Build a [`SessionDocumentMachineAuthority`] seeded with this session's
    /// current durable first-turn projection.
    ///
    /// The machine owns the canonical first-turn phase + presence/count in its
    /// own per-session `Map`; the durable [`SessionDeferredTurnState`] is its
    /// projection. We recover the machine-owned registry from that projection
    /// before driving an operation so every subsequent decision reads the
    /// machine's own state — the shell never passes a phase conclusion as an
    /// operation input.
    fn document_authority(
        &self,
    ) -> (
        session_document::SessionDocumentMachineAuthority,
        session_document::SessionDocumentKey,
    ) {
        let mut authority = session_document::SessionDocumentMachineAuthority::new();
        let key = session_document::SessionDocumentKey::new(SESSION_DOCUMENT_FIRST_TURN_KEY);
        if let Err(err) = authority.recover_session_first_turn_phase(
            key.clone(),
            self.first_turn_phase.into(),
            self.pending_initial_prompt.is_some(),
            usize_to_u64(self.pending_tool_results.len()),
        ) {
            tracing::warn!(
                error = %err,
                "generated session document authority rejected first-turn recovery"
            );
        }
        (authority, key)
    }

    /// Mirror the machine-resolved first-turn phase from one effect batch onto
    /// the durable projection, returning `was_pending` when present.
    fn mirror_first_turn_phase(
        &mut self,
        effects: &[session_document::SessionDocumentEffect],
    ) -> Option<bool> {
        for effect in effects {
            if let session_document::SessionDocumentEffect::SessionFirstTurnPhaseResolved {
                phase,
                was_pending,
            } = effect
            {
                self.first_turn_phase = (*phase).into();
                return Some(*was_pending);
            }
        }
        None
    }

    /// Mark that this session has a deferred first turn waiting to start.
    pub fn mark_initial_turn_pending(&mut self) {
        let (mut authority, key) = self.document_authority();
        match authority.mark_session_initial_turn_pending(key) {
            Ok(effects) => {
                self.mirror_first_turn_phase(&effects);
            }
            Err(err) => tracing::warn!(
                error = %err,
                "generated session document authority rejected pending mark"
            ),
        }
    }

    /// Mark the deferred first turn as started.
    ///
    /// Returns true when the phase transitioned from `Pending`.
    pub fn mark_initial_turn_started(&mut self) -> bool {
        let (mut authority, key) = self.document_authority();
        match authority.start_session_initial_turn(key) {
            Ok(effects) => self.mirror_first_turn_phase(&effects).unwrap_or(false),
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated session document authority rejected first-turn start"
                );
                false
            }
        }
    }

    /// Restore the deferred first-turn pending phase after a failed pre-run setup.
    pub fn restore_initial_turn_pending(&mut self) {
        // The restore-to-pending decision is the machine's
        // `RestoreSessionConsumedInputs` transition with phase rollback
        // requested; presence/count mirrors are left untouched here because the
        // bulky payloads are restored separately by the caller.
        let (mut authority, key) = self.document_authority();
        match authority.restore_session_consumed_inputs(
            key.clone(),
            true,
            self.pending_initial_prompt.is_some(),
            usize_to_u64(self.pending_tool_results.len()),
        ) {
            Ok(_) => {
                // Mirror the machine-owned phase the restore transition wrote
                // into its per-session registry rather than re-deriving it.
                if let Some(phase) = authority.session_first_turn_phase_for(&key) {
                    self.first_turn_phase = phase.into();
                }
            }
            Err(err) => tracing::warn!(
                error = %err,
                "generated session document authority rejected pending restore"
            ),
        }
    }

    /// Whether build-only first-turn overrides are still legal for this session.
    pub fn allows_initial_turn_overrides(&self) -> bool {
        let (mut authority, key) = self.document_authority();
        match authority.resolve_session_first_turn_overrides_allowed(key) {
            Ok(effects) => effects
                .iter()
                .find_map(|effect| {
                    match effect {
                session_document::SessionDocumentEffect::SessionFirstTurnOverridesResolved {
                    allowed,
                } => Some(*allowed),
                _ => None,
            }
                })
                .unwrap_or(false),
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated session document authority rejected override resolution"
                );
                false
            }
        }
    }

    /// Stage the create-time prompt for a later first turn.
    pub fn stage_initial_prompt(&mut self, prompt: ContentInput, accepted_at: SystemTime) {
        let prompt_has_content = prompt.has_images() || !prompt.text_content().trim().is_empty();
        let (mut authority, key) = self.document_authority();
        match authority.stage_session_initial_prompt(key, prompt_has_content) {
            Ok(effects) => {
                let decision = effects.iter().find_map(|effect| {
                    match effect {
                    session_document::SessionDocumentEffect::SessionInitialPromptStageResolved {
                        decision,
                    } => Some(*decision),
                    _ => None,
                }
                });
                match decision {
                    Some(session_document::SessionInitialPromptStageDecision::Store) => {
                        self.pending_initial_prompt = Some(PendingDeferredPrompt {
                            prompt,
                            accepted_at,
                        });
                    }
                    Some(session_document::SessionInitialPromptStageDecision::Clear) => {
                        self.pending_initial_prompt = None;
                    }
                    None => tracing::warn!(
                        "generated session document authority returned no prompt-stage decision"
                    ),
                }
            }
            Err(err) => tracing::warn!(
                error = %err,
                "generated session document authority rejected initial prompt stage"
            ),
        }
    }

    /// Stage one callback tool-results message for the next turn.
    pub fn stage_tool_results(
        &mut self,
        results: Vec<ToolResult>,
        accepted_at: SystemTime,
    ) -> usize {
        let (mut authority, key) = self.document_authority();
        let accepted = match authority.stage_session_tool_results(key, usize_to_u64(results.len()))
        {
            Ok(effects) => effects.iter().find_map(|effect| match effect {
                session_document::SessionDocumentEffect::SessionToolResultsStageResolved {
                    accepted_count,
                } => Some(*accepted_count),
                _ => None,
            }),
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated session document authority rejected tool-results stage"
                );
                return 0;
            }
        };
        let Some(accepted) = accepted else {
            tracing::warn!(
                "generated session document authority returned no tool-results decision"
            );
            return 0;
        };
        if accepted == 0 {
            return 0;
        }
        let accepted = usize::try_from(accepted).unwrap_or(usize::MAX);
        self.pending_tool_results.push(PendingToolResultsMessage {
            results,
            accepted_at,
        });
        accepted
    }

    /// Whether any callback tool results are currently staged.
    pub fn has_pending_tool_results(&self) -> bool {
        !self.pending_tool_results.is_empty()
    }

    /// Start a turn and consume all inputs generated-authorized for that seam.
    pub fn consume_for_started_turn(&mut self) -> ConsumedDeferredTurnInputs {
        let (mut authority, key) = self.document_authority();
        let was_pending = match authority.consume_session_deferred_inputs(key) {
            Ok(effects) => self.mirror_first_turn_phase(&effects).unwrap_or(false),
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated session document authority rejected started-turn consumption"
                );
                return ConsumedDeferredTurnInputs::default();
            }
        };
        ConsumedDeferredTurnInputs {
            restore_first_turn_pending: was_pending,
            pending_initial_prompt: self.pending_initial_prompt.take(),
            pending_tool_results: std::mem::take(&mut self.pending_tool_results),
        }
    }

    /// Restore inputs previously consumed by `consume_for_started_turn`.
    pub fn restore_consumed_turn_inputs(&mut self, consumed: ConsumedDeferredTurnInputs) {
        if consumed.is_empty() {
            return;
        }
        let (mut authority, key) = self.document_authority();
        let effects = match authority.restore_session_consumed_inputs(
            key,
            consumed.restore_first_turn_pending,
            consumed.pending_initial_prompt.is_some(),
            usize_to_u64(consumed.pending_tool_results.len()),
        ) {
            Ok(effects) => effects,
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated session document authority rejected consumed input restore"
                );
                return;
            }
        };
        let Some((restore_first_turn_pending, restore_initial_prompt, restore_tool_results)) =
            effects.iter().find_map(|effect| match effect {
                session_document::SessionDocumentEffect::SessionConsumedInputsRestoreResolved {
                    restore_first_turn_pending,
                    restore_initial_prompt,
                    restore_tool_results,
                } => Some((
                    *restore_first_turn_pending,
                    *restore_initial_prompt,
                    *restore_tool_results,
                )),
                _ => None,
            })
        else {
            tracing::warn!(
                "generated session document authority returned no consumed-input restore decision"
            );
            return;
        };
        if restore_first_turn_pending {
            self.restore_initial_turn_pending();
        }
        if restore_initial_prompt && self.pending_initial_prompt.is_none() {
            self.pending_initial_prompt = consumed.pending_initial_prompt;
        }
        if restore_tool_results {
            let mut restored = consumed.pending_tool_results;
            restored.extend(std::mem::take(&mut self.pending_tool_results));
            self.pending_tool_results = restored;
        }
    }
}

/// Failure when staging a system-context append request.
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum SystemContextStageError {
    InvalidRequest(String),
    Conflict {
        key: String,
        existing_text: String,
        existing_source: Option<String>,
    },
}

impl std::fmt::Display for SystemContextStageError {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        match self {
            Self::InvalidRequest(message) => {
                write!(f, "invalid system-context append request: {message}")
            }
            Self::Conflict { key, .. } => {
                write!(
                    f,
                    "system-context append conflict for idempotency key `{key}`"
                )
            }
        }
    }
}

impl std::error::Error for SystemContextStageError {}

/// Mechanical PRESENTATION helper: render a system-context append into the
/// display block string that is concatenated into the model-facing system
/// prompt. This is NOT a decision — it builds the `[Runtime System Context]`
/// label text for OUTPUT only. The authority for which appends to render and
/// whether one is a runtime steer lives in the
/// [`session_document::SessionDocumentMachine`]; this function never inspects
/// the `source` string to classify anything.
fn render_system_context_block(append: &PendingSystemContextAppend) -> String {
    let mut rendered = String::from(SYSTEM_CONTEXT_RENDER_LABEL);
    if let Some(source) = &append.source {
        rendered.push_str("\nsource: ");
        rendered.push_str(source);
    }
    rendered.push_str("\n\n");
    // The single CoreRenderable -> prompt-text lowering for system-context
    // appends. Surfaces carry the typed renderable through untouched.
    rendered.push_str(append.content.render_text().trim());
    rendered
}

/// Display label prefix for a rendered runtime system-context block.
///
/// PRESENTATION only — this is the human/model-facing heading, not a
/// classification key. Nothing reads this back to make a semantic decision.
const SYSTEM_CONTEXT_RENDER_LABEL: &str = "[Runtime System Context]";

/// Render a sequence of system-context appends into the
/// [`SYSTEM_CONTEXT_SEPARATOR`]-joined block text that
/// [`Session::append_system_context_blocks`] concatenates onto the system
/// prompt. The single composition rule — shared by the append path and the
/// resume-time tail verification so the two can never drift apart.
fn render_system_context_blocks_joined(appends: &[PendingSystemContextAppend]) -> String {
    appends
        .iter()
        .map(render_system_context_block)
        .collect::<Vec<_>>()
        .join(SYSTEM_CONTEXT_SEPARATOR)
}

/// Compose a system prompt from a base and a verified runtime-context tail
/// (leading [`SYSTEM_CONTEXT_SEPARATOR`] included; empty = no tail),
/// mirroring [`Session::append_system_context_blocks`]' rule that an empty
/// base renders the blocks without a separator prefix.
fn compose_system_prompt_with_context_tail(base: &str, tail: &str) -> String {
    if tail.is_empty() {
        return base.to_string();
    }
    if base.is_empty() {
        return tail
            .strip_prefix(SYSTEM_CONTEXT_SEPARATOR)
            .unwrap_or(tail)
            .to_string();
    }
    format!("{base}{tail}")
}

/// Drive the canonical [`session_document::SessionDocumentMachine`]
/// persist-append admission for the resume fast path: may the persisted
/// System prompt be admitted as a runtime-context-append continuation of the
/// freshly assembled base?
///
/// Mirrors the save-guard shell (`session_store::system_context_is_append`):
/// this extracts only pure structural observations plus the typed
/// [`crate::types::SystemPromptMutationKind`] provenance; the machine owns
/// the verdict. A machine error fails closed — the caller falls back to the
/// audited rewrite path.
fn persisted_prompt_is_admitted_context_append_continuation(
    assembled_base: &str,
    persisted_content: &str,
    persisted_mutation_kind: crate::types::SystemPromptMutationKind,
) -> bool {
    let content_identical = persisted_content == assembled_base;
    let content_extends = persisted_content.starts_with(assembled_base);
    let appended_starts_with_separator = content_extends
        && persisted_content[assembled_base.len()..].starts_with(SYSTEM_CONTEXT_SEPARATOR);
    let mut authority = session_document::SessionDocumentMachineAuthority::new();
    match authority.resolve_system_context_persist_append_admission(
        true,
        content_identical,
        content_extends,
        appended_starts_with_separator,
        persisted_mutation_kind.is_runtime_context_append(),
    ) {
        Ok(effects) => effects.into_iter().any(|effect| {
            matches!(
                effect,
                session_document::SessionDocumentEffect::SystemContextPersistAppendAdmissionResolved {
                    admission: session_document::SystemContextPersistAppendAdmission::Admit,
                }
            )
        }),
        Err(error) => {
            tracing::warn!(
                error = %error,
                "session document authority refused resume prompt continuation admission; \
                 falling back to audited rewrite"
            );
            false
        }
    }
}

/// Shell adapter that drives the canonical
/// [`session_document::SessionDocumentMachine`] system-context region and
/// mirrors its emitted decisions onto the bulky `SessionSystemContextState`.
///
/// The machine owns every SEMANTIC decision (append disposition, per-append
/// apply/discard from the typed [`SystemContextSource`] marker, snapshot
/// restore legality). This module performs only the mechanical collection
/// work — iterating the shell's pending/applied/seen collections and applying
/// the machine's per-item verdict. It never decides; in particular it never
/// inspects a `source` string to classify a runtime steer.
mod system_context_authority {
    use super::{
        AppendSystemContextRequest, BTreeSet, PendingSystemContextAppend, SeenSystemContextKey,
        SeenSystemContextState, SessionSystemContextState, SystemContextSource,
        SystemContextStageError, SystemTime, render_system_context_block, session_document,
        usize_to_u64,
    };
    use crate::service::AppendSystemContextStatus;

    fn document_authority() -> session_document::SessionDocumentMachineAuthority {
        session_document::SessionDocumentMachineAuthority::new()
    }

    /// Resolve the four-way append disposition through the machine.
    fn resolve_append_decision(
        trimmed_text_byte_count: u64,
        idempotency_key_present: bool,
        existing_key_matches: bool,
        existing_key_conflicts: bool,
        active_turn_scoped: bool,
    ) -> Result<session_document::SystemContextAppendDecision, SystemContextStageError> {
        let mut authority = document_authority();
        let effects = authority
            .resolve_system_context_append(
                trimmed_text_byte_count,
                idempotency_key_present,
                existing_key_matches,
                existing_key_conflicts,
                active_turn_scoped,
            )
            .map_err(|err| SystemContextStageError::InvalidRequest(err.to_string()))?;
        effects
            .into_iter()
            .find_map(|effect| match effect {
                session_document::SessionDocumentEffect::SystemContextAppendResolved {
                    decision,
                    ..
                } => Some(decision),
                _ => None,
            })
            .ok_or_else(|| {
                SystemContextStageError::InvalidRequest(
                    "generated session document authority returned no append decision".to_string(),
                )
            })
    }

    /// Per-pending-append apply verdict, decided by the machine from the typed
    /// `source_kind` marker (NOT a `source` string prefix).
    fn pending_apply_item(source_kind: SystemContextSource) -> Option<(bool, bool, bool)> {
        let mut authority = document_authority();
        match authority.resolve_system_context_pending_apply_item(source_kind.into()) {
            Ok(effects) => effects.into_iter().find_map(|effect| {
                match effect {
                session_document::SessionDocumentEffect::SystemContextPendingApplyItemResolved {
                    promote_to_applied,
                    mark_seen_applied,
                    remove_seen,
                } => Some((promote_to_applied, mark_seen_applied, remove_seen)),
                _ => None,
            }
            }),
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated session document authority rejected system-context apply item"
                );
                None
            }
        }
    }

    /// Per-item transient-steer discard verdict, decided by the machine from
    /// the typed `source_kind` marker.
    fn steer_cleanup_discards(source_kind: SystemContextSource) -> bool {
        let mut authority = document_authority();
        match authority.resolve_system_context_steer_cleanup_item(source_kind.into()) {
            Ok(effects) => effects
                .into_iter()
                .find_map(|effect| {
                    match effect {
                    session_document::SessionDocumentEffect::SystemContextSteerCleanupItemResolved {
                        discard,
                    } => Some(discard),
                    _ => None,
                }
                })
                .unwrap_or(false),
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated session document authority rejected system-context steer cleanup item"
                );
                false
            }
        }
    }

    fn discard_pending_where(
        state: &mut SessionSystemContextState,
        mut should_discard: impl FnMut(&PendingSystemContextAppend, bool) -> bool,
    ) -> Vec<PendingSystemContextAppend> {
        reconstruct_legacy_active_turn_indices(state);
        let active_indices = std::mem::take(&mut state.active_turn_pending_indices);
        let pending = std::mem::take(&mut state.pending);
        let mut retained = Vec::with_capacity(pending.len());
        let mut retained_active_indices = BTreeSet::new();
        let mut retained_active_keys = BTreeSet::new();
        let mut discarded = Vec::new();

        for (index, append) in pending.into_iter().enumerate() {
            let is_active_turn = active_indices.contains(&usize_to_u64(index));
            if should_discard(&append, is_active_turn) {
                discarded.push(append);
                continue;
            }
            if is_active_turn {
                retained_active_indices.insert(usize_to_u64(retained.len()));
                if let Some(key) = append.idempotency_key.as_ref() {
                    retained_active_keys.insert(key.clone());
                }
            }
            retained.push(append);
        }

        state.pending = retained;
        state.active_turn_pending_indices = retained_active_indices;
        state.active_turn_pending_keys = retained_active_keys;
        discarded
    }

    fn reconstruct_legacy_active_turn_indices(state: &mut SessionSystemContextState) {
        if !state.active_turn_pending_indices.is_empty()
            || state.active_turn_pending_keys.is_empty()
        {
            return;
        }
        state.active_turn_pending_indices = state
            .pending
            .iter()
            .enumerate()
            .filter(|(_index, append)| {
                append
                    .idempotency_key
                    .as_ref()
                    .is_some_and(|key| state.active_turn_pending_keys.contains(key))
            })
            .map(|(index, _append)| usize_to_u64(index))
            .collect();
    }

    pub(super) fn restore_system_context_state(
        mut state: SessionSystemContextState,
    ) -> Result<SessionSystemContextState, SystemContextStageError> {
        // Backward compatibility for snapshots written before active-turn
        // membership had an identity independent of idempotency. Keyed
        // members can be reconstructed exactly from the pending queue.
        reconstruct_legacy_active_turn_indices(&mut state);
        let active_indices_are_in_bounds = state
            .active_turn_pending_indices
            .iter()
            .all(|index| usize::try_from(*index).is_ok_and(|index| index < state.pending.len()));
        let active_keys_have_indexed_pending = state.active_turn_pending_keys.iter().all(|key| {
            state.active_turn_pending_indices.iter().any(|index| {
                usize::try_from(*index)
                    .ok()
                    .and_then(|index| state.pending.get(index))
                    .and_then(|append| append.idempotency_key.as_ref())
                    == Some(key)
            })
        });
        let indexed_pending_keys_are_active =
            state.active_turn_pending_indices.iter().all(|index| {
                usize::try_from(*index)
                    .ok()
                    .and_then(|index| state.pending.get(index))
                    .is_some_and(|append| {
                        append
                            .idempotency_key
                            .as_ref()
                            .is_none_or(|key| state.active_turn_pending_keys.contains(key))
                    })
            });
        let active_turn_membership_is_consistent = active_indices_are_in_bounds
            && active_keys_have_indexed_pending
            && indexed_pending_keys_are_active;
        let seen_keys_match_known_appends = state.seen.iter().all(|(key, seen)| {
            state
                .pending
                .iter()
                .chain(state.applied.iter())
                .any(|append| {
                    append.idempotency_key.as_ref() == Some(key)
                        && seen.content == append.content
                        && seen.source.as_deref() == append.source.as_deref()
                })
        });
        let mut authority = document_authority();
        authority
            .restore_system_context_snapshot(
                active_turn_membership_is_consistent,
                seen_keys_match_known_appends,
            )
            .map_err(|err| SystemContextStageError::InvalidRequest(err.to_string()))?;
        Ok(state)
    }

    pub(super) fn stage_append(
        state: &mut SessionSystemContextState,
        req: &AppendSystemContextRequest,
        accepted_at: SystemTime,
        active_turn_scoped: bool,
    ) -> Result<AppendSystemContextStatus, SystemContextStageError> {
        // Emptiness is judged on the canonical text projection; the typed
        // renderable itself is what gets stored (lowering happens once, at
        // the transcript render seam).
        let rendered_text = req.content.render_text();
        let rendered_len = rendered_text.trim().len();
        let existing = req
            .idempotency_key
            .as_ref()
            .and_then(|key| state.seen.get(key));
        let existing_key_matches = existing.is_some_and(|existing| {
            existing.content == req.content && existing.source.as_deref() == req.source.as_deref()
        });
        let existing_key_conflicts = existing.is_some() && !existing_key_matches;
        let decision = resolve_append_decision(
            usize_to_u64(rendered_len),
            req.idempotency_key.is_some(),
            existing_key_matches,
            existing_key_conflicts,
            active_turn_scoped,
        )?;

        match decision {
            session_document::SystemContextAppendDecision::RejectEmpty => {
                return Err(SystemContextStageError::InvalidRequest(
                    "system context text must not be empty".to_string(),
                ));
            }
            session_document::SystemContextAppendDecision::RejectConflict => {
                let Some(key) = req.idempotency_key.as_ref() else {
                    return Err(SystemContextStageError::InvalidRequest(
                        "generated system-context authority rejected append without a key"
                            .to_string(),
                    ));
                };
                let Some(existing) = existing else {
                    return Err(SystemContextStageError::InvalidRequest(
                        "generated system-context authority rejected append without a conflict"
                            .to_string(),
                    ));
                };
                return Err(SystemContextStageError::Conflict {
                    key: key.clone(),
                    existing_text: existing.content.render_text(),
                    existing_source: existing.source.clone(),
                });
            }
            session_document::SystemContextAppendDecision::Duplicate => {
                return Ok(AppendSystemContextStatus::Duplicate);
            }
            session_document::SystemContextAppendDecision::Staged => {}
        }

        let append = PendingSystemContextAppend {
            content: req.content.clone(),
            source: req.source.clone(),
            idempotency_key: req.idempotency_key.clone(),
            source_kind: req.source_kind,
            // Carry the typed `PeerResponseTerminalFact` so realtime/live
            // consumers read it directly instead of re-parsing the flattened
            // prompt text. Mirrors the `source_kind` typed-provenance precedent.
            peer_response_terminal: req.peer_response_terminal.clone(),
            accepted_at,
        };
        if let Some(key) = req.idempotency_key.as_ref() {
            state.seen.insert(
                key.clone(),
                SeenSystemContextKey {
                    content: append.content.clone(),
                    source: append.source.clone(),
                    source_kind: append.source_kind,
                    state: SeenSystemContextState::Pending,
                },
            );
        }
        if active_turn_scoped {
            state
                .active_turn_pending_indices
                .insert(usize_to_u64(state.pending.len()));
            if let Some(key) = req.idempotency_key.as_ref() {
                state.active_turn_pending_keys.insert(key.clone());
            }
        }
        state.pending.push(append);
        Ok(AppendSystemContextStatus::Staged)
    }

    pub(super) fn mark_pending_applied(state: &mut SessionSystemContextState) {
        // Promote pending appends to applied per the machine's per-item
        // verdict (keyed on the typed `source_kind`).
        let pending = std::mem::take(&mut state.pending);
        let mut seen_to_remove = Vec::new();
        for append in &pending {
            let Some((promote_to_applied, mark_seen_applied, remove_seen)) =
                pending_apply_item(append.source_kind)
            else {
                continue;
            };
            if promote_to_applied && !state.applied.contains(append) {
                state.applied.push(append.clone());
            }
            if let Some(key) = append.idempotency_key.as_ref() {
                if remove_seen {
                    seen_to_remove.push(key.clone());
                } else if mark_seen_applied && let Some(seen) = state.seen.get_mut(key) {
                    seen.state = SeenSystemContextState::Applied;
                }
            }
        }
        for key in seen_to_remove {
            state.seen.remove(&key);
        }
        state.active_turn_pending_keys.clear();
        state.active_turn_pending_indices.clear();
    }

    pub(super) fn discard_unapplied_active_turn_pending(
        state: &mut SessionSystemContextState,
    ) -> Vec<PendingSystemContextAppend> {
        reconstruct_legacy_active_turn_indices(state);
        if state.active_turn_pending_indices.is_empty() {
            return Vec::new();
        }
        let discarded = discard_pending_where(state, |_append, is_active_turn| is_active_turn);

        for append in &discarded {
            if let Some(key) = append.idempotency_key.as_ref()
                && state
                    .seen
                    .get(key)
                    .is_some_and(|seen| seen.state == SeenSystemContextState::Pending)
            {
                state.seen.remove(key);
            }
        }

        discarded
    }

    pub(super) fn discard_active_turn_pending_by_keys(
        state: &mut SessionSystemContextState,
        idempotency_keys: &[String],
    ) -> Vec<PendingSystemContextAppend> {
        reconstruct_legacy_active_turn_indices(state);
        if idempotency_keys.is_empty() || state.active_turn_pending_indices.is_empty() {
            return Vec::new();
        }
        let requested_keys: BTreeSet<&str> = idempotency_keys.iter().map(String::as_str).collect();
        let discarded = discard_pending_where(state, |append, is_active_turn| {
            is_active_turn
                && append
                    .idempotency_key
                    .as_ref()
                    .is_some_and(|key| requested_keys.contains(key.as_str()))
        });

        for append in &discarded {
            let Some(key) = append.idempotency_key.as_ref() else {
                continue;
            };
            if state
                .seen
                .get(key)
                .is_some_and(|seen| seen.state == SeenSystemContextState::Pending)
            {
                state.seen.remove(key);
            }
        }

        discarded
    }

    pub(super) fn discard_transient_runtime_steer_state(
        state: &mut SessionSystemContextState,
    ) -> usize {
        let mut removed = 0usize;

        let before_active = state.active_turn_pending_keys.len();
        removed += discard_pending_where(state, |append, _is_active_turn| {
            steer_cleanup_discards(append.source_kind)
        })
        .len();

        let before_applied = state.applied.len();
        state
            .applied
            .retain(|append| !steer_cleanup_discards(append.source_kind));
        removed += before_applied.saturating_sub(state.applied.len());

        let before_seen = state.seen.len();
        state
            .seen
            .retain(|_key, seen| !steer_cleanup_discards(seen.source_kind));
        removed += before_seen.saturating_sub(state.seen.len());

        removed += before_active.saturating_sub(state.active_turn_pending_keys.len());

        removed
    }

    pub(super) fn remove_runtime_steer_blocks_for_rendered(
        system_prompt: &str,
        runtime_steer_appends: &[PendingSystemContextAppend],
    ) -> (String, usize) {
        if runtime_steer_appends.is_empty() {
            return (system_prompt.to_string(), 0);
        }
        // Build the set of rendered blocks for the typed runtime-steer appends,
        // then remove those exact rendered blocks from the prompt. The typed
        // marker is the authority; rendering is mechanical presentation.
        let steer_blocks: BTreeSet<String> = runtime_steer_appends
            .iter()
            .map(render_system_context_block)
            .collect();
        let parts = system_prompt
            .split(super::SYSTEM_CONTEXT_SEPARATOR)
            .map(str::to_string)
            .collect::<Vec<_>>();
        let original_len = parts.len();
        let retained = parts
            .into_iter()
            .filter(|part| !steer_blocks.contains(part))
            .collect::<Vec<_>>();
        let removed = original_len.saturating_sub(retained.len());
        (retained.join(super::SYSTEM_CONTEXT_SEPARATOR), removed)
    }

    pub(super) fn record_applied_system_context_blocks(
        state: &mut SessionSystemContextState,
        appends: &[PendingSystemContextAppend],
        current_system_prompt: &str,
    ) -> Vec<PendingSystemContextAppend> {
        let mut new_appends: Vec<PendingSystemContextAppend> = Vec::new();
        for append in appends {
            if append.content.render_text().trim().is_empty() {
                continue;
            }
            let rendered = render_system_context_block(append);
            if let Some(key) = append.idempotency_key.as_ref() {
                if let Some(existing) = state.seen.get(key)
                    && !seen_system_context_matches(existing, append)
                {
                    tracing::warn!(
                        idempotency_key = %key,
                        "skipping conflicting runtime system-context append"
                    );
                    continue;
                }
                if let Some(existing) = state
                    .applied
                    .iter()
                    .find(|applied| applied.idempotency_key.as_ref() == Some(key))
                    && !pending_system_context_matches(existing, append)
                {
                    tracing::warn!(
                        idempotency_key = %key,
                        "skipping conflicting runtime system-context append"
                    );
                    continue;
                }
                if let Some(existing) = new_appends
                    .iter()
                    .find(|pending| pending.idempotency_key.as_ref() == Some(key))
                {
                    if !pending_system_context_matches(existing, append) {
                        tracing::warn!(
                            idempotency_key = %key,
                            "skipping conflicting runtime system-context append"
                        );
                    }
                    continue;
                }
                if current_system_prompt.contains(&rendered) {
                    record_applied_append(state, append);
                    continue;
                }
            } else if new_appends.contains(append) || current_system_prompt.contains(&rendered) {
                continue;
            }
            record_applied_append(state, append);
            new_appends.push(append.clone());
        }
        new_appends
    }

    fn record_applied_append(
        state: &mut SessionSystemContextState,
        append: &PendingSystemContextAppend,
    ) {
        if let Some(key) = append.idempotency_key.as_ref() {
            state.seen.insert(
                key.clone(),
                SeenSystemContextKey {
                    content: append.content.clone(),
                    source: append.source.clone(),
                    source_kind: append.source_kind,
                    state: SeenSystemContextState::Applied,
                },
            );
            if state
                .applied
                .iter()
                .any(|applied| applied.idempotency_key.as_ref() == Some(key))
            {
                return;
            }
        } else if state.applied.contains(append) {
            return;
        }
        state.applied.push(append.clone());
    }

    fn seen_system_context_matches(
        seen: &SeenSystemContextKey,
        append: &PendingSystemContextAppend,
    ) -> bool {
        seen.content == append.content && seen.source.as_deref() == append.source.as_deref()
    }

    fn pending_system_context_matches(
        existing: &PendingSystemContextAppend,
        append: &PendingSystemContextAppend,
    ) -> bool {
        existing.content == append.content && existing.source.as_deref() == append.source.as_deref()
    }
}

impl Session {
    /// Create a new empty session
    pub fn new() -> Self {
        let now = SystemTime::now();
        Self {
            version: session_version(),
            id: SessionId::new(),
            messages: Arc::new(Vec::new()),
            created_at: now,
            updated_at: now,
            metadata: serde_json::Map::new(),
            transcript_history_metadata_validation: TranscriptHistoryMetadataValidation::Validated,
            usage: Usage::default(),
        }
    }

    /// Create a session with a specific ID (for loading)
    pub fn with_id(id: SessionId) -> Self {
        let mut session = Self::new();
        session.id = id;
        session
    }

    /// Get the session ID
    pub fn id(&self) -> &SessionId {
        &self.id
    }

    /// Get the session version
    pub fn version(&self) -> u32 {
        self.version
    }

    /// Get all messages.
    pub fn messages(&self) -> &[Message] {
        &self.messages
    }

    /// Replace the message buffer for core-owned internal transcript rewrites.
    ///
    /// Intentionally `pub(crate)`: cross-crate consumers must route same-session
    /// rewrites through transcript-edit APIs so the revision graph remains the
    /// semantic owner of message history.
    #[allow(dead_code)] // Kept for core-owned optional rewrite paths and focused invariants.
    pub(crate) fn replace_messages_internal(
        &mut self,
        messages: Vec<Message>,
        reason: TranscriptRewriteReason,
    ) -> Result<Option<TranscriptRewriteCommit>, TranscriptEditError> {
        if transcript_messages_digest(self.messages()).ok()
            == transcript_messages_digest(&messages).ok()
        {
            return Ok(None);
        }
        let commit = self.commit_transcript_rewrite(
            TranscriptRewriteSelection::MessageRange {
                start: 0,
                end: self.messages.len(),
            },
            messages,
            reason,
            Some("meerkat-core".to_string()),
            None,
        )?;
        Ok(Some(commit))
    }

    /// Replace the full transcript under the opaque authority minted by the
    /// validated compaction rebuild path.
    pub(crate) fn replace_messages_for_compaction_internal(
        &mut self,
        messages: Vec<Message>,
        authority: &crate::agent::compact::ValidatedCompactionRewrite,
    ) -> Result<Option<TranscriptRewriteCommit>, TranscriptEditError> {
        if transcript_messages_digest(self.messages()).ok()
            == transcript_messages_digest(&messages).ok()
        {
            return Ok(None);
        }
        if !authority
            .authorizes(self.messages(), &messages)
            .map_err(|error| TranscriptEditError::HistoryStateMalformed(error.to_string()))?
        {
            return Err(TranscriptEditError::InvalidTranscriptShape(
                "validated compaction witness does not authorize this exact transcript rebuild"
                    .to_string(),
            ));
        }
        let summary_count = messages
            .iter()
            .filter(|message| {
                matches!(message, Message::User(user) if user.transcript_role.is_compaction_summary())
            })
            .count();
        if messages.len() >= self.messages.len() || summary_count != 1 {
            return Err(TranscriptEditError::InvalidTranscriptShape(
                "validated compaction rewrite must shrink the transcript and carry exactly one CompactionSummary"
                    .to_string(),
            ));
        }
        let selection =
            TranscriptRewriteSelection::validated_compaction(0, self.messages.len(), authority);
        let commit = self.commit_transcript_rewrite_authorized(
            selection,
            messages,
            TranscriptRewriteReason::new("compaction"),
            Some("meerkat-core".to_string()),
            None,
        )?;
        Ok(Some(commit))
    }

    /// Atomically refresh the synthetic runtime notices of one kind.
    ///
    /// This is the ONE transcript authority operation for synthetic-notice
    /// refresh: it strips every synthetic `SystemNotice` projection of `kind`
    /// while preserving durable notices that share the kind, then appends
    /// `replacements` (possibly empty, meaning "no current synthetic notice")
    /// as one mechanical projection update. It deliberately does not mint an
    /// audited transcript rewrite commit. On a strip fault nothing is pushed
    /// and the typed [`TranscriptEditError`] propagates — callers must not
    /// re-implement the strip-then-push pair (the swallowed-strip variant
    /// leaves a stale notice beside a fresh one: a divergence window).
    pub fn replace_synthetic_notices(
        &mut self,
        kind: crate::types::SystemNoticeKind,
        replacements: Vec<Message>,
    ) -> Result<(), TranscriptEditError> {
        if !kind.is_synthetic_refresh_projection() {
            return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                "system notice kind {kind:?} is durable transcript content, not a synthetic refresh projection"
            )));
        }
        for (index, message) in replacements.iter().enumerate() {
            let matches_kind = matches!(
                message,
                Message::SystemNotice(notice)
                    if notice.kind == kind && notice.is_synthetic_refresh_projection()
            );
            if !matches_kind {
                return Err(TranscriptEditError::InvalidTranscriptShape(format!(
                    "replacement {index} for synthetic notice kind {kind:?} is not a system notice of that kind"
                )));
            }
        }

        let mut refreshed = self
            .messages
            .iter()
            .filter(|message| {
                !matches!(
                    message,
                    Message::SystemNotice(notice)
                        if notice.kind == kind && notice.is_synthetic_refresh_projection()
                )
            })
            .cloned()
            .collect::<Vec<_>>();
        refreshed.extend(replacements);
        if transcript_messages_digest(self.messages()).ok()
            == transcript_messages_digest(&refreshed).ok()
        {
            return Ok(());
        }

        let realtime_state =
            self.reconciled_realtime_transcript_metadata_after_rewrite(&refreshed)?;
        let updated_at = SystemTime::now();
        let history_state = self
            .transcript_history_state_after_message_mutation(&refreshed, updated_at)?
            .map(serde_json::to_value)
            .transpose()
            .map_err(|error| TranscriptEditError::HistoryStateMalformed(error.to_string()))?;

        self.messages = Arc::new(refreshed);
        self.updated_at = updated_at;
        if let Some(value) = realtime_state {
            self.set_metadata_unchecked(SESSION_REALTIME_TRANSCRIPT_STATE_KEY, value);
        }
        if let Some(value) = history_state {
            self.set_validated_transcript_history_metadata(value);
        }
        Ok(())
    }

    /// Get creation time
    pub fn created_at(&self) -> SystemTime {
        self.created_at
    }

    /// Get last update time
    pub fn updated_at(&self) -> SystemTime {
        self.updated_at
    }

    /// Add a message to the session
    ///
    /// Updates the timestamp. For adding multiple messages, prefer `push_batch`.
    pub fn push(&mut self, message: Message) {
        Arc::make_mut(&mut self.messages).push(message);
        self.updated_at = SystemTime::now();
        self.refresh_transcript_head_after_message_mutation();
    }

    /// Add multiple messages in one operation (single timestamp update)
    ///
    /// More efficient than multiple `push` calls when adding many messages.
    pub fn push_batch(&mut self, messages: Vec<Message>) {
        if messages.is_empty() {
            return;
        }
        let inner = Arc::make_mut(&mut self.messages);
        inner.extend(messages);
        self.updated_at = SystemTime::now();
        self.refresh_transcript_head_after_message_mutation();
    }

    /// Rewrite inline media payloads in-place as `BlobRef` pointers.
    ///
    /// Message count is invariant across this operation — `externalize`
    /// only swaps inline image/media bytes for opaque blob references.
    /// This is the cross-crate-legitimate rewrite operation that used
    /// to require public `messages_mut()`; post-C-H1 callers in
    /// `meerkat-session` go through this typed method.
    ///
    /// Does not touch `updated_at` — externalization is bookkeeping, not
    /// a semantic session mutation.
    pub async fn externalize_media(
        &mut self,
        blob_store: &dyn crate::BlobStore,
        start: usize,
    ) -> Result<(), crate::blob::BlobStoreError> {
        let previous_digest = if self
            .metadata
            .contains_key(SESSION_TRANSCRIPT_HISTORY_STATE_KEY)
        {
            transcript_messages_digest(self.messages()).ok()
        } else {
            None
        };
        let messages = Arc::make_mut(&mut self.messages);
        crate::image_content::externalize_messages_from(blob_store, messages, start).await?;
        if let Some(previous_digest) = previous_digest
            && transcript_messages_digest(self.messages()).ok().as_ref() != Some(&previous_digest)
        {
            self.refresh_transcript_head_after_message_mutation();
        }
        Ok(())
    }

    /// Hydrate user-message images in-place for a realtime provider replay,
    /// under an explicit cumulative decoded-byte budget.
    ///
    /// Realtime reconnect/open is an execution seam, not a historical display
    /// read: missing or malformed blobs fail closed, repeated references count
    /// independently, and image-bearing tool/system content that the realtime
    /// history projector does not consume remains blob-backed.
    pub async fn hydrate_realtime_user_images(
        &mut self,
        blob_store: &dyn crate::BlobStore,
        max_decoded_bytes: usize,
    ) -> Result<(), crate::image_content::RealtimeUserImageHydrationError> {
        self.hydrate_realtime_user_images_with_usage(blob_store, max_decoded_bytes)
            .await
            .map(|_| ())
    }

    /// Hydrate realtime user-message images and return the full canonical
    /// decoded-byte usage for seed-independent future-image admission.
    pub async fn hydrate_realtime_user_images_with_usage(
        &mut self,
        blob_store: &dyn crate::BlobStore,
        max_decoded_bytes: usize,
    ) -> Result<usize, crate::image_content::RealtimeUserImageHydrationError> {
        let previous_digest = if self
            .metadata
            .contains_key(SESSION_TRANSCRIPT_HISTORY_STATE_KEY)
        {
            transcript_messages_digest(self.messages()).ok()
        } else {
            None
        };
        let messages = Arc::make_mut(&mut self.messages);
        let decoded_total =
            crate::image_content::hydrate_user_images_for_realtime_projection_with_usage(
                blob_store,
                messages,
                max_decoded_bytes,
            )
            .await?;
        if let Some(previous_digest) = previous_digest
            && transcript_messages_digest(self.messages()).ok().as_ref() != Some(&previous_digest)
        {
            self.refresh_transcript_head_after_message_mutation();
        }
        Ok(decoded_total)
    }

    /// Explicitly update the timestamp
    ///
    /// Call this after bulk operations that don't update timestamps automatically.
    pub fn touch(&mut self) {
        self.updated_at = SystemTime::now();
    }

    /// Get the last N messages
    pub fn last_n(&self, n: usize) -> &[Message] {
        let start = self.messages.len().saturating_sub(n);
        &self.messages[start..]
    }

    /// Count total tokens used.
    pub fn total_tokens(&self) -> u64 {
        self.usage.total_tokens()
    }

    /// Get total usage statistics for the session.
    pub fn total_usage(&self) -> Usage {
        self.usage.clone()
    }

    /// Update cumulative usage after an LLM call.
    pub fn record_usage(&mut self, turn_usage: Usage) {
        self.usage.add(&turn_usage);
        self.updated_at = SystemTime::now();
    }

    /// Append externally-produced user content to the canonical transcript.
    pub fn append_external_user_content(&mut self, content: ContentInput) {
        self.push(Message::User(UserMessage::with_blocks(
            content.into_blocks(),
        )));
    }

    /// Append externally-produced assistant output to the canonical transcript.
    pub fn append_external_assistant_blocks(
        &mut self,
        blocks: Vec<AssistantBlock>,
        stop_reason: StopReason,
        usage: Usage,
    ) {
        if !blocks.is_empty() {
            self.push(Message::BlockAssistant(BlockAssistantMessage::new(
                blocks,
                stop_reason,
            )));
        }
        if usage != Usage::default() {
            self.record_usage(usage);
        }
    }

    /// Apply an identity-bearing provider realtime transcript event.
    ///
    /// This is the canonical append authority for provider-managed realtime
    /// turns: provider item ids, predecessor links, and content segment ids are
    /// persisted in session metadata so duplicate websocket delivery,
    /// reconnect replay, and causally equivalent event ordering cannot create
    /// duplicate or misordered canonical messages.
    pub fn append_realtime_transcript_event(
        &mut self,
        event: RealtimeTranscriptEvent,
    ) -> RealtimeTranscriptApplyOutcome {
        let mut state = self.realtime_transcript_state();
        let commit =
            realtime_transcript_revision::apply_realtime_transcript_event(&mut state, event)
                .unwrap_or_else(|err| {
                    fail_closed_generated_restore(
                        "realtime-transcript",
                        <serde_json::Error as serde::de::Error>::custom(err),
                    )
                });
        self.store_realtime_transcript_state(&state);
        self.push_batch(commit.messages);
        if commit.usage != Usage::default() {
            self.record_usage(commit.usage);
        }
        commit.outcome
    }

    /// Preview replay/rejection for non-text realtime user content without
    /// mutating session state. Used by persistence before blob writes.
    #[must_use]
    pub fn preflight_realtime_user_content_event(
        &self,
        event: &RealtimeTranscriptEvent,
    ) -> Option<crate::RealtimeUserContentApplyOutcome> {
        let state = self.realtime_transcript_state();
        realtime_transcript_revision::preflight_realtime_user_content_event(&state, event)
            .unwrap_or_else(|err| {
                fail_closed_generated_restore(
                    "realtime-user-content-preflight",
                    <serde_json::Error as serde::de::Error>::custom(err),
                )
            })
    }

    /// Return every distinct provider `response_id` currently staged in the
    /// realtime-transcript metadata that has at least one **unmaterialized**
    /// assistant item and is **not already discarded**.
    ///
    /// CC4 (Round-4 architectural reconciliation): when the live boundary
    /// signals a barge-in (`TurnInterrupted`), the projection sink does not
    /// know which provider response_ids have streaming deltas staged in
    /// session metadata. This accessor lets the sink fan
    /// [`RealtimeTranscriptEvent::AssistantTurnInterrupted`] events out to
    /// each in-flight response so staged-but-not-yet-materialized transcript
    /// fragments are discarded — preventing them from silently committing
    /// when the *next* turn's `AssistantTurnCompleted` (synthesized by the
    /// CC2 fix in `signal_turn_completed`) sweeps the materializer.
    ///
    /// Order is the [`SessionRealtimeTranscriptState::first_seen_order`]
    /// projection so callers see deterministic iteration. Items already
    /// materialized or skipped are excluded — only response_ids with at
    /// least one live unmaterialized assistant item are returned.
    #[must_use]
    pub fn in_flight_realtime_assistant_response_ids(&self) -> Vec<String> {
        let state = self.realtime_transcript_state();
        realtime_transcript_revision::in_flight_realtime_assistant_response_ids(&state)
    }

    /// Durable session-scoped bindings used to make live non-text input retry
    /// safe across provider reconnects and lost public receipts.
    #[must_use]
    pub fn realtime_user_content_identities(&self) -> Vec<RealtimeUserContentIdentity> {
        let state = self.realtime_transcript_state();
        realtime_transcript_revision::realtime_user_content_identities(&state)
    }

    /// Return the bounded metadata-only image-blob recovery anchor, if one is
    /// durably staged ahead of reducer finalization.
    #[must_use]
    pub fn pending_realtime_user_content_blob(
        &self,
    ) -> Option<crate::PendingRealtimeUserContentBlob> {
        let state = self.realtime_transcript_state();
        realtime_transcript_revision::pending_realtime_user_content_blob(&state)
    }

    /// Stage or exactly reuse the one-slot durable image-blob recovery anchor
    /// through generated SessionDocument authority.
    pub fn stage_pending_realtime_user_content_blob(
        &mut self,
        pending: crate::PendingRealtimeUserContentBlob,
    ) -> Result<
        crate::generated::session_document::RealtimeUserContentBlobStageDisposition,
        realtime_transcript_revision::RealtimeTranscriptShellError,
    > {
        let mut state = self.realtime_transcript_state();
        let disposition = realtime_transcript_revision::stage_pending_realtime_user_content_blob(
            &mut state, pending,
        )?;
        self.store_realtime_transcript_state(&state);
        Ok(disposition)
    }

    pub fn resolve_pending_realtime_user_content_blob_recovery(
        &self,
        request: Option<&crate::PendingRealtimeUserContentBlob>,
        pending_blob_valid: bool,
    ) -> Result<
        crate::generated::session_document::RealtimeUserContentBlobRecoveryDisposition,
        realtime_transcript_revision::RealtimeTranscriptShellError,
    > {
        let state = self.realtime_transcript_state();
        realtime_transcript_revision::resolve_pending_realtime_user_content_blob_recovery(
            &state,
            request,
            pending_blob_valid,
        )
    }

    /// Clear a missing/corrupt occupied anchor only after generated recovery
    /// authority classifies a different request as `ClearInvalidBeforeCurrent`.
    pub fn clear_invalid_pending_realtime_user_content_blob(
        &mut self,
        request: Option<&crate::PendingRealtimeUserContentBlob>,
    ) -> Result<(), realtime_transcript_revision::RealtimeTranscriptShellError> {
        let mut state = self.realtime_transcript_state();
        realtime_transcript_revision::clear_invalid_pending_realtime_user_content_blob(
            &mut state, request,
        )?;
        self.store_realtime_transcript_state(&state);
        Ok(())
    }

    /// Durable caller keys whose canonical realtime image was removed by a
    /// same-session transcript rewrite. Provider adapters consume these as a
    /// pre-send conflict registry on open and refresh.
    #[must_use]
    pub fn realtime_user_content_tombstones(
        &self,
    ) -> Vec<crate::realtime_transcript::RealtimeUserContentTombstone> {
        let state = self.realtime_transcript_state();
        realtime_transcript_revision::realtime_user_content_tombstones(&state)
    }

    fn realtime_transcript_state(&self) -> SessionRealtimeTranscriptState {
        match self.try_realtime_transcript_state() {
            Ok(Some(state)) => state,
            Ok(None) => SessionRealtimeTranscriptState::default(),
            Err(err) => fail_closed_generated_restore("realtime-transcript", err),
        }
    }

    fn try_realtime_transcript_state(
        &self,
    ) -> Result<Option<SessionRealtimeTranscriptState>, serde_json::Error> {
        self.metadata
            .get(SESSION_REALTIME_TRANSCRIPT_STATE_KEY)
            .map(|value| {
                let state = serde_json::from_value(value.clone())?;
                realtime_transcript_revision::restore_realtime_transcript_state(state)
                    .map_err(<serde_json::Error as serde::de::Error>::custom)
            })
            .transpose()
    }

    fn store_realtime_transcript_state(&mut self, state: &SessionRealtimeTranscriptState) {
        match serde_json::to_value(state) {
            Ok(value) => self.set_metadata_unchecked(SESSION_REALTIME_TRANSCRIPT_STATE_KEY, value),
            Err(error) => {
                tracing::warn!(error = %error, "failed to serialize realtime transcript state");
            }
        }
    }

    fn reconciled_realtime_transcript_metadata_after_rewrite(
        &self,
        messages: &[Message],
    ) -> Result<Option<serde_json::Value>, TranscriptEditError> {
        let Some(state) = self
            .try_realtime_transcript_state()
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?
        else {
            return Ok(None);
        };
        let state =
            realtime_transcript_revision::reconcile_realtime_transcript_state_after_rewrite(
                state, messages,
            )
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
        serde_json::to_value(state)
            .map(Some)
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))
    }

    fn apply_authorized_system_prompt(
        &mut self,
        prompt: session_durable_config_authority::AuthorizedSystemPrompt,
    ) {
        use crate::types::SystemMessage;

        // The typed mutation provenance is carried onto the applied system
        // message so the transcript-continuity save-guard recognizes a
        // runtime context-append shape from a typed field instead of the
        // rendered `[Runtime System Context]` label.
        let mutation_kind = prompt.mutation_kind();
        let (prompt, _replacing_existing) = prompt.into_parts();
        let message = SystemMessage::with_mutation_kind(prompt, mutation_kind);
        let inner = Arc::make_mut(&mut self.messages);
        // Check if first message is system
        if let Some(Message::System(_)) = inner.first() {
            inner[0] = Message::System(message);
        } else {
            inner.insert(0, Message::System(message));
        }
        self.updated_at = SystemTime::now();
        self.refresh_transcript_head_after_message_mutation();
    }

    /// Set a system prompt through generated durable-config authority.
    pub fn set_system_prompt_with_source(
        &mut self,
        prompt: String,
        source: session_durable_config_authority::SessionSystemPromptSource,
    ) -> Result<(), session_durable_config_authority::SessionDurableConfigAuthorityError> {
        let replacing_existing = matches!(self.messages.first(), Some(Message::System(_)));
        let prompt = session_durable_config_authority::authorize_system_prompt_mutation(
            prompt,
            source,
            replacing_existing,
        )?;
        self.apply_authorized_system_prompt(prompt);
        Ok(())
    }

    /// Set a system prompt (adds or replaces System message at start).
    pub fn set_system_prompt(&mut self, prompt: String) {
        if let Err(err) = self.set_system_prompt_with_source(
            prompt,
            session_durable_config_authority::SessionSystemPromptSource::DirectMutation,
        ) {
            tracing::warn!(error = %err, "generated session durable-config authority rejected system prompt mutation");
        }
    }

    /// Remove transient active-turn steer context from persisted session state.
    ///
    /// Operator steers accepted into an already-running turn are request-local:
    /// they should be visible to that turn's next model boundary, then vanish
    /// instead of replaying into later turns after persistence or resume.
    pub fn discard_transient_runtime_steer_context(&mut self) -> usize {
        let mut removed = 0usize;

        let mut state = match self.try_system_context_state() {
            Ok(state) => state.unwrap_or_default(),
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated system-context authority rejected runtime steer cleanup state"
                );
                return removed;
            }
        };

        // The typed `source_kind` marker on persisted appends is the authority
        // for which rendered prompt blocks are transient runtime steers. Gather
        // the runtime-steer appends, then remove their exact rendered blocks
        // from the system prompt — no `runtime:steer:` string classification.
        let runtime_steer_appends = state
            .pending
            .iter()
            .chain(state.applied.iter())
            .filter(|append| append.source_kind.is_runtime_steer())
            .cloned()
            .collect::<Vec<_>>();
        if let Some(Message::System(system)) = self.messages.first() {
            let (retained_prompt, removed_blocks) =
                system_context_authority::remove_runtime_steer_blocks_for_rendered(
                    &system.content,
                    &runtime_steer_appends,
                );
            if removed_blocks > 0 {
                removed += removed_blocks;
                if let Err(err) = self.set_system_prompt_with_source(
                    retained_prompt,
                    session_durable_config_authority::SessionSystemPromptSource::RuntimeSteerCleanup,
                ) {
                    tracing::warn!(
                        error = %err,
                        "generated session durable-config authority rejected runtime steer prompt cleanup"
                    );
                }
            }
        }

        removed += system_context_authority::discard_transient_runtime_steer_state(&mut state);

        if removed > 0
            && let Err(err) = self.set_system_context_state(state)
        {
            tracing::warn!(
                error = %err,
                "failed to persist runtime steer context cleanup"
            );
        }

        removed
    }

    /// Append one or more runtime system-context blocks to the canonical system prompt.
    pub fn append_system_context_blocks(&mut self, appends: &[PendingSystemContextAppend]) {
        if appends.is_empty() {
            return;
        }

        let current_system_prompt = self
            .messages
            .first()
            .and_then(|message| match message {
                Message::System(system) => Some(system.content.as_str()),
                _ => None,
            })
            .unwrap_or_default();
        let mut state = match self.try_system_context_state() {
            Ok(state) => state.unwrap_or_default(),
            Err(err) => {
                tracing::warn!(
                    error = %err,
                    "generated system-context authority rejected applied context state"
                );
                return;
            }
        };
        let new_appends = system_context_authority::record_applied_system_context_blocks(
            &mut state,
            appends,
            current_system_prompt,
        );
        if new_appends.is_empty() {
            if let Err(err) = self.set_system_context_state(state) {
                tracing::warn!(error = %err, "failed to persist applied system-context state");
            }
            return;
        }

        let rendered = render_system_context_blocks_joined(&new_appends);

        let next = match self.messages.first() {
            Some(Message::System(sys)) if !sys.content.is_empty() => {
                format!("{}{}{}", sys.content, SYSTEM_CONTEXT_SEPARATOR, rendered)
            }
            _ => rendered,
        };
        if let Err(err) = self.set_system_prompt_with_source(
            next,
            session_durable_config_authority::SessionSystemPromptSource::RuntimeContextAppend,
        ) {
            tracing::warn!(
                error = %err,
                "generated session durable-config authority rejected system-context prompt append"
            );
            return;
        }
        if let Err(err) = self.set_system_context_state(state) {
            tracing::warn!(error = %err, "failed to persist applied system-context state");
        }
    }

    /// Reconcile a resumed session's persisted system prompt with a freshly
    /// assembled base prompt.
    ///
    /// A resumed transcript is durable state: its leading [`Message::System`]
    /// carries the base prompt PLUS every runtime system-context append the
    /// runtime durably applied (comms rosters, host context — rendered by
    /// [`Session::append_system_context_blocks`]). Blind-replacing that
    /// message with a re-assembled base prompt discards the runtime-applied
    /// context and produces a projection that is no longer a continuation of
    /// the persisted transcript revision — the append-only save guard then
    /// rejects the very first post-resume persist and the live session is
    /// discarded (the upstream cold-restart transcript-loss report).
    ///
    /// Reconciliation instead of replacement:
    /// - If the persisted System content IS the assembled base — identical, or
    ///   extended only by [`SYSTEM_CONTEXT_SEPARATOR`]-joined runtime context
    ///   appends — the transcript is left untouched (byte-for-byte, including
    ///   the typed `mutation_kind`), so the resumed projection digests to the
    ///   persisted revision.
    /// - If the base genuinely changed, the new System message (new base plus
    ///   the reconstructed runtime-append tail, when the persisted tail is
    ///   verifiable from the durable applied-append records) is committed
    ///   through [`Session::commit_transcript_rewrite`] — the canonical typed
    ///   rewrite path — so the first post-resume persist proves a transcript
    ///   graph edge from the persisted head instead of failing closed.
    pub fn reconcile_resumed_system_prompt(
        &mut self,
        assembled_base: String,
        actor: Option<String>,
    ) -> Result<ResumedSystemPromptReconciliation, TranscriptEditError> {
        let persisted = match self.messages.first() {
            Some(Message::System(system)) => Some((system.content.clone(), system.mutation_kind)),
            _ => None,
        };

        let Some((persisted_content, persisted_mutation_kind)) = persisted else {
            if assembled_base.is_empty() {
                return Ok(ResumedSystemPromptReconciliation::NoChange);
            }
            // The persisted transcript never had a system prompt; introducing
            // one changes the transcript, so it flows through the same typed
            // rewrite path (an insert rewrite over the empty leading span).
            self.commit_resume_system_prompt_rewrite(assembled_base, false, actor)?;
            return Ok(ResumedSystemPromptReconciliation::RewrittenBase);
        };

        if persisted_content == assembled_base {
            return Ok(ResumedSystemPromptReconciliation::PreservedContinuation);
        }

        // Byte-exact reconciliation first: when the persisted content splits
        // into a VERIFIED base + runtime-appended tail, the expected content
        // for this build is `assembled_base + tail` — equal means the base is
        // unchanged (preserve untouched), different means the base changed
        // (audited rewrite that carries the tail). This runs before the
        // structural fast path so a shortened base whose removed remainder
        // merely looks like a context tail (the separator is ordinary
        // markdown) is applied instead of silently ignored.
        if let Some(tail) = self.verified_runtime_context_tail(&persisted_content) {
            let expected = compose_system_prompt_with_context_tail(&assembled_base, &tail);
            if expected == persisted_content {
                return Ok(ResumedSystemPromptReconciliation::PreservedContinuation);
            }
            self.commit_resume_system_prompt_rewrite(expected, true, actor)?;
            return Ok(ResumedSystemPromptReconciliation::RewrittenBase);
        }

        // No verifiable tail record (rows written before the assembled base
        // was recorded, or applied-append state swept by the runtime path).
        // The canonical SessionDocumentMachine persist-append admission
        // decides — from the structural observations plus the typed mutation
        // provenance — whether the persisted prompt is a runtime-context-
        // append continuation of the assembled base. Machine refusal fails
        // closed into the audited rewrite below.
        if persisted_prompt_is_admitted_context_append_continuation(
            &assembled_base,
            &persisted_content,
            persisted_mutation_kind,
        ) {
            return Ok(ResumedSystemPromptReconciliation::PreservedContinuation);
        }

        // The base diverged and the runtime-context tail is not
        // reconstructible: only the new base can be written. Dropping the
        // appended context silently would leave the durable applied/seen
        // records claiming those appends are applied — keyed re-sends would
        // be deduplicated forever — so clear the orphaned records to keep the
        // context restorable by the host.
        let dropping_applied_context = persisted_mutation_kind.is_runtime_context_append()
            || self
                .system_context_state()
                .is_some_and(|state| !state.applied.is_empty());
        self.commit_resume_system_prompt_rewrite(assembled_base, true, actor)?;
        if dropping_applied_context {
            tracing::warn!(
                session_id = %self.id,
                "resume base-prompt refresh dropped an unverifiable runtime system-context tail; \
                 clearing applied-append records so keyed re-sends can restore the context"
            );
            self.clear_applied_system_context_records();
        }
        Ok(ResumedSystemPromptReconciliation::RewrittenBase)
    }

    /// Split the persisted System content into a VERIFIED runtime-appended
    /// tail (leading [`SYSTEM_CONTEXT_SEPARATOR`] included; empty when the
    /// content is exactly a verified base).
    ///
    /// Verification sources, strongest first: byte-exact against the prior
    /// build's recorded assembled base
    /// ([`SessionBuildState::assembled_system_prompt`]), then a re-render of
    /// the durable applied-append records. `None` means the tail is not
    /// reconstructible from durable facts.
    fn verified_runtime_context_tail(&self, persisted_content: &str) -> Option<String> {
        if let Some(prior_base) = self
            .build_state()
            .and_then(|state| state.assembled_system_prompt)
        {
            if persisted_content == prior_base {
                return Some(String::new());
            }
            if let Some(appended) = persisted_content.strip_prefix(prior_base.as_str())
                && appended.starts_with(SYSTEM_CONTEXT_SEPARATOR)
            {
                return Some(appended.to_string());
            }
            // The record does not split this content (e.g. it predates the
            // last prompt mutation); fall through to the render verification.
        }
        let rendered_tail = self
            .system_context_state()
            .map(|state| render_system_context_blocks_joined(&state.applied))
            .unwrap_or_default();
        if rendered_tail.is_empty() {
            return None;
        }
        if persisted_content == rendered_tail {
            // The entire persisted prompt is verified runtime context (a
            // promptless/empty-base build whose appends compose without a
            // separator prefix) — the tail is the whole content, not empty.
            return Some(format!("{SYSTEM_CONTEXT_SEPARATOR}{rendered_tail}"));
        }
        let with_separator = format!("{SYSTEM_CONTEXT_SEPARATOR}{rendered_tail}");
        persisted_content
            .ends_with(&with_separator)
            .then_some(with_separator)
    }

    /// Commit a resume-time base-prompt refresh through the generated
    /// durable-config authority and the canonical typed rewrite path.
    fn commit_resume_system_prompt_rewrite(
        &mut self,
        content: String,
        replacing_existing: bool,
        actor: Option<String>,
    ) -> Result<(), TranscriptEditError> {
        let authorized = session_durable_config_authority::authorize_system_prompt_mutation(
            content,
            session_durable_config_authority::SessionSystemPromptSource::ExplicitBuild,
            replacing_existing,
        )
        .map_err(|err| {
            TranscriptEditError::HistoryStateMalformed(format!(
                "generated session durable-config authority rejected resume system prompt refresh: {err}"
            ))
        })?;
        let mutation_kind = authorized.mutation_kind();
        let (content, _replacing_existing) = authorized.into_parts();
        let replacement = Message::System(crate::types::SystemMessage::with_mutation_kind(
            content,
            mutation_kind,
        ));
        let end = usize::from(replacing_existing);
        self.commit_transcript_rewrite(
            TranscriptRewriteSelection::MessageRange { start: 0, end },
            vec![replacement],
            TranscriptRewriteReason::new(RESUME_SYSTEM_PROMPT_REFRESH_REWRITE_REASON),
            actor,
            None,
        )?;
        Ok(())
    }

    /// Clear applied-append records (and their idempotency keys) after a
    /// resume rewrite dropped their rendered blocks from the System prompt,
    /// so the same keyed appends re-apply instead of deduplicating forever.
    fn clear_applied_system_context_records(&mut self) {
        let mut state = match self.try_system_context_state() {
            Ok(Some(state)) => state,
            Ok(None) => return,
            Err(error) => {
                tracing::warn!(
                    session_id = %self.id,
                    error = %error,
                    "failed to read system-context state while clearing orphaned applied records"
                );
                return;
            }
        };
        if state.applied.is_empty() {
            return;
        }
        let dropped_keys: Vec<String> = state
            .applied
            .iter()
            .filter_map(|append| append.idempotency_key.clone())
            .collect();
        state.applied.clear();
        for key in &dropped_keys {
            state.seen.remove(key);
        }
        if let Err(error) = self.set_system_context_state(state) {
            tracing::warn!(
                session_id = %self.id,
                error = %error,
                "failed to persist cleared applied system-context records after resume prompt refresh"
            );
        }
    }

    /// Get the last assistant message text content.
    ///
    /// Concatenates both `Text` (display) and `Transcript` (spoken) blocks
    /// in document order, since both lanes project to the same human-readable
    /// stream. Lane provenance is preserved on the underlying `AssistantBlock`
    /// for callers that need it.
    pub fn last_assistant_text(&self) -> Option<String> {
        self.messages.iter().rev().find_map(|m| match m {
            Message::BlockAssistant(a) => {
                let mut buf = String::new();
                for block in &a.blocks {
                    match block {
                        crate::types::AssistantBlock::Text { text, .. }
                        | crate::types::AssistantBlock::Transcript { text, .. } => {
                            buf.push_str(text);
                        }
                        _ => {}
                    }
                }
                if buf.is_empty() { None } else { Some(buf) }
            }
            _ => None,
        })
    }

    /// Count tool calls made
    pub fn tool_call_count(&self) -> usize {
        self.messages
            .iter()
            .filter_map(|m| match m {
                Message::BlockAssistant(a) => Some(
                    a.blocks
                        .iter()
                        .filter(|b| matches!(b, crate::types::AssistantBlock::ToolUse { .. }))
                        .count(),
                ),
                _ => None,
            })
            .sum()
    }

    /// Get metadata
    pub fn metadata(&self) -> &serde_json::Map<String, serde_json::Value> {
        &self.metadata
    }

    fn set_metadata_unchecked(&mut self, key: &str, value: serde_json::Value) {
        // Reapplying an identical durable projection is not a session-content
        // mutation. In particular, cold materialization restores the sealed
        // SessionMetadata and SessionBuildState before it knows whether the
        // values changed; advancing `updated_at` for an exact no-op would
        // rotate the checkpoint digest and manufacture a sibling checkpoint
        // even though the committed document is unchanged.
        if self.metadata.get(key) == Some(&value) {
            return;
        }
        self.metadata.insert(key.to_string(), value);
        if key == SESSION_TRANSCRIPT_HISTORY_STATE_KEY {
            self.metadata
                .remove(SESSION_TRANSCRIPT_HISTORY_CHECKPOINT_DIGEST_KEY);
            self.transcript_history_metadata_validation =
                TranscriptHistoryMetadataValidation::RequiresValidation;
        }
        self.updated_at = SystemTime::now();
    }

    /// Install transcript history that was produced by a typed path which
    /// already validated and compacted the graph.
    fn set_validated_transcript_history_metadata(&mut self, value: serde_json::Value) {
        self.metadata
            .insert(SESSION_TRANSCRIPT_HISTORY_STATE_KEY.to_string(), value);
        self.metadata
            .remove(SESSION_TRANSCRIPT_HISTORY_CHECKPOINT_DIGEST_KEY);
        self.transcript_history_metadata_validation =
            TranscriptHistoryMetadataValidation::Validated;
        self.updated_at = SystemTime::now();
    }

    #[cfg(test)]
    pub(crate) fn set_metadata_unchecked_for_test(&mut self, key: &str, value: serde_json::Value) {
        self.set_metadata_unchecked(key, value);
    }

    fn fork_metadata_projection(&self) -> serde_json::Map<String, serde_json::Value> {
        let mut metadata = self.metadata.clone();
        metadata.retain(|key, _| !is_session_authority_metadata_key(key));
        metadata
    }

    fn remove_metadata_unchecked(&mut self, key: &str) {
        let removed = self.metadata.remove(key).is_some();
        let mut changed = removed;
        if key == SESSION_TRANSCRIPT_HISTORY_STATE_KEY {
            changed |= self
                .metadata
                .remove(SESSION_TRANSCRIPT_HISTORY_CHECKPOINT_DIGEST_KEY)
                .is_some();
            self.transcript_history_metadata_validation =
                TranscriptHistoryMetadataValidation::Validated;
        }
        if changed {
            self.updated_at = SystemTime::now();
        }
    }

    /// Set a metadata value when the key is not reserved for generated authority.
    pub fn try_set_metadata(
        &mut self,
        key: &str,
        value: serde_json::Value,
    ) -> Result<(), ReservedSessionMetadataKey> {
        if is_session_authority_metadata_key(key) {
            return Err(ReservedSessionMetadataKey::new(key));
        }
        self.set_metadata_unchecked(key, value);
        Ok(())
    }

    /// Set a metadata value.
    ///
    /// Reserved generated-authority metadata keys fail closed and are left
    /// untouched. Use the typed setters for those keys.
    pub fn set_metadata(&mut self, key: &str, value: serde_json::Value) {
        if let Err(err) = self.try_set_metadata(key, value) {
            tracing::warn!(error = %err, "rejected raw session metadata mutation");
        }
    }

    /// Backfill a missing metadata value without changing `updated_at`.
    ///
    /// This is only for compatibility reads that need to hydrate metadata from
    /// an older projection. Semantic metadata mutations must use
    /// [`Session::set_metadata`] so the session timestamp advances.
    pub fn backfill_metadata_if_absent(&mut self, key: &str, value: serde_json::Value) -> bool {
        if is_session_authority_metadata_key(key) {
            tracing::warn!(
                metadata_key = key,
                "rejected raw session metadata backfill for authority key"
            );
            return false;
        }
        if self.metadata.contains_key(key) {
            false
        } else {
            self.metadata.insert(key.to_string(), value);
            true
        }
    }

    /// Remove a metadata value.
    pub fn remove_metadata(&mut self, key: &str) {
        if is_session_authority_metadata_key(key) {
            tracing::warn!(
                metadata_key = key,
                "rejected raw session metadata removal for authority key"
            );
            return;
        }
        if self.metadata.remove(key).is_some() {
            self.updated_at = SystemTime::now();
        }
    }

    /// Store SessionMetadata in the session metadata map.
    pub fn set_session_metadata(
        &mut self,
        metadata: SessionMetadata,
    ) -> Result<(), serde_json::Error> {
        let metadata =
            session_durable_config_authority::authorize_session_metadata_persist(metadata)
                .map_err(<serde_json::Error as serde::ser::Error>::custom)?
                .into_metadata();
        let value = serde_json::to_value(metadata)?;
        self.set_metadata_unchecked(SESSION_METADATA_KEY, value);
        Ok(())
    }

    /// Load SessionMetadata from the session metadata map.
    ///
    /// If the reserved key exists but cannot pass typed generated restore,
    /// fail closed instead of treating corrupted machine facts as absent.
    pub fn session_metadata(&self) -> Option<SessionMetadata> {
        match self.try_session_metadata() {
            Ok(metadata) => metadata,
            Err(err) => fail_closed_generated_restore("session-metadata", err),
        }
    }

    /// Try to load SessionMetadata through generated restore authority.
    pub fn try_session_metadata(&self) -> Result<Option<SessionMetadata>, serde_json::Error> {
        try_session_metadata_from_map(&self.metadata)
    }

    /// Store durable system-context control state in the session metadata map.
    pub fn set_system_context_state(
        &mut self,
        state: SessionSystemContextState,
    ) -> Result<(), serde_json::Error> {
        let state = system_context_authority::restore_system_context_state(state)
            .map_err(<serde_json::Error as serde::ser::Error>::custom)?;
        let value = serde_json::to_value(state)?;
        self.set_metadata_unchecked(SESSION_SYSTEM_CONTEXT_STATE_KEY, value);
        Ok(())
    }

    /// Try to load durable system-context control state through generated restore authority.
    pub fn try_system_context_state(
        &self,
    ) -> Result<Option<SessionSystemContextState>, serde_json::Error> {
        self.metadata
            .get(SESSION_SYSTEM_CONTEXT_STATE_KEY)
            .map(|value| {
                let state = serde_json::from_value(value.clone())?;
                system_context_authority::restore_system_context_state(state)
                    .map_err(<serde_json::Error as serde::de::Error>::custom)
            })
            .transpose()
    }

    /// Load durable system-context control state from the session metadata map.
    ///
    /// Rejected durable facts fail closed through the generated restore
    /// authority. Callers that need the typed rejection must use
    /// [`Self::try_system_context_state`].
    pub fn system_context_state(&self) -> Option<SessionSystemContextState> {
        match self.try_system_context_state() {
            Ok(state) => state,
            Err(err) => fail_closed_generated_restore("system-context", err),
        }
    }

    /// Store durable deferred-turn control state in the session metadata map.
    pub fn set_deferred_turn_state(
        &mut self,
        state: SessionDeferredTurnState,
    ) -> Result<(), serde_json::Error> {
        let state = validate_deferred_turn_snapshot(state)
            .map_err(<serde_json::Error as serde::ser::Error>::custom)?;
        let value = serde_json::to_value(state)?;
        self.set_metadata_unchecked(SESSION_DEFERRED_TURN_STATE_KEY, value);
        Ok(())
    }

    /// Try to load durable deferred-turn control state through generated restore authority.
    pub fn try_deferred_turn_state(
        &self,
    ) -> Result<Option<SessionDeferredTurnState>, serde_json::Error> {
        self.metadata
            .get(SESSION_DEFERRED_TURN_STATE_KEY)
            .map(|value| {
                let state = serde_json::from_value(value.clone())?;
                validate_deferred_turn_snapshot(state)
                    .map_err(<serde_json::Error as serde::de::Error>::custom)
            })
            .transpose()
    }

    /// Load durable deferred-turn control state from the session metadata map.
    ///
    /// Rejected durable facts fail closed through the generated restore
    /// authority. Callers that need the typed rejection must use
    /// [`Self::try_deferred_turn_state`].
    pub fn deferred_turn_state(&self) -> Option<SessionDeferredTurnState> {
        match self.try_deferred_turn_state() {
            Ok(state) => state,
            Err(err) => fail_closed_generated_restore("deferred-turn", err),
        }
    }

    /// Realize the typed session lifecycle-terminal projection in the session
    /// metadata map.
    ///
    /// The lifecycle-terminal fact is owned by the canonical
    /// [`session_document::SessionDocumentMachine`]; production archive paths
    /// call this only to realize a machine-emitted `SessionArchiveResolved`
    /// verdict (the value written mirrors the machine's decision — the shell
    /// decides nothing here).
    pub fn set_lifecycle_terminal(
        &mut self,
        terminal: SessionLifecycleTerminal,
    ) -> Result<(), serde_json::Error> {
        let value = serde_json::to_value(terminal)?;
        self.set_metadata_unchecked(SESSION_LIFECYCLE_TERMINAL_KEY, value);
        Ok(())
    }

    /// Try to load the typed session lifecycle-terminal fact.
    ///
    /// Reads the typed [`SESSION_LIFECYCLE_TERMINAL_KEY`]; an absent key means
    /// no terminal fact.
    pub fn try_lifecycle_terminal(
        &self,
    ) -> Result<Option<SessionLifecycleTerminal>, serde_json::Error> {
        try_lifecycle_terminal_from_map(&self.metadata)
    }

    /// Load the typed session lifecycle-terminal fact, failing closed on a
    /// corrupt typed value.
    ///
    /// Callers that need the typed rejection must use
    /// [`Self::try_lifecycle_terminal`].
    pub fn lifecycle_terminal(&self) -> Option<SessionLifecycleTerminal> {
        match self.try_lifecycle_terminal() {
            Ok(state) => state,
            Err(err) => fail_closed_generated_restore("session-lifecycle-terminal", err),
        }
    }

    /// Store recoverable build-only session state in the session metadata map.
    pub fn set_build_state(&mut self, state: SessionBuildState) -> Result<(), serde_json::Error> {
        let state = session_durable_config_authority::authorize_session_build_state_persist(state)
            .map_err(<serde_json::Error as serde::ser::Error>::custom)?
            .into_state();
        let value = serde_json::to_value(state)?;
        self.set_metadata_unchecked(SESSION_BUILD_STATE_KEY, value);
        Ok(())
    }

    /// Load recoverable build-only session state from the session metadata map.
    ///
    /// If the reserved key exists but cannot pass typed generated restore,
    /// fail closed instead of treating corrupted machine facts as absent.
    pub fn build_state(&self) -> Option<SessionBuildState> {
        match self.try_build_state() {
            Ok(state) => state,
            Err(err) => fail_closed_generated_restore("session-build-state", err),
        }
    }

    /// Try to load recoverable build-only session state through generated restore authority.
    pub fn try_build_state(&self) -> Result<Option<SessionBuildState>, serde_json::Error> {
        let Some(value) = self.metadata.get(SESSION_BUILD_STATE_KEY) else {
            return Ok(None);
        };
        let state = serde_json::from_value::<SessionBuildState>(value.clone())?;
        session_durable_config_authority::restore_session_build_state(state)
            .map(Some)
            .map_err(<serde_json::Error as serde::de::Error>::custom)
    }

    /// Store durable tool-visibility control state in the session metadata map.
    pub fn set_tool_visibility_state(
        &mut self,
        state: AuthorizedSessionToolVisibilityState,
    ) -> Result<(), serde_json::Error> {
        let value = serde_json::to_value(state.into_state())?;
        self.set_metadata_unchecked(SESSION_TOOL_VISIBILITY_STATE_KEY, value);
        Ok(())
    }

    /// Test-only metadata clear for compatibility assertions.
    ///
    /// Production paths persist an explicit generated-authority projection
    /// rather than making durable absence carry semantic default truth.
    #[cfg(test)]
    pub(crate) fn clear_tool_visibility_state(&mut self) {
        self.remove_metadata_unchecked(SESSION_TOOL_VISIBILITY_STATE_KEY);
    }

    /// Load durable tool-visibility control state from the session metadata map.
    pub fn tool_visibility_state(
        &self,
    ) -> Result<Option<SessionToolVisibilityState>, serde_json::Error> {
        self.try_tool_visibility_state()
    }

    /// Load durable tool-visibility control state while distinguishing absent
    /// metadata from malformed canonical metadata.
    pub fn try_tool_visibility_state(
        &self,
    ) -> Result<Option<SessionToolVisibilityState>, serde_json::Error> {
        self.metadata
            .get(SESSION_TOOL_VISIBILITY_STATE_KEY)
            .map(|value| serde_json::from_value(value.clone()))
            .transpose()
    }

    /// Load typed transcript revision state from metadata.
    pub fn transcript_history_state(
        &self,
    ) -> Result<Option<TranscriptHistoryState>, serde_json::Error> {
        self.metadata
            .get(SESSION_TRANSCRIPT_HISTORY_STATE_KEY)
            .map(|value| serde_json::from_value(value.clone()))
            .transpose()
    }

    /// Return the already-validated transcript graph head without cloning and
    /// deserializing the full history document again.
    ///
    /// Store guards use this after typed Session deserialization when they
    /// only need to prove live-message/head coherence. Unchecked metadata
    /// still crosses the full graph validator before the borrowed head can be
    /// observed.
    pub(crate) fn validated_transcript_history_head(
        &self,
    ) -> Result<Option<&str>, TranscriptEditError> {
        self.validate_transcript_history_state()?;
        let Some(value) = self.metadata.get(SESSION_TRANSCRIPT_HISTORY_STATE_KEY) else {
            return Ok(None);
        };
        value
            .get("head")
            .and_then(serde_json::Value::as_str)
            .map(Some)
            .ok_or_else(|| {
                TranscriptEditError::HistoryStateMalformed(
                    "validated transcript history metadata omitted a string head".to_string(),
                )
            })
    }

    /// Load exact compaction projection intents carried to the runtime's
    /// atomic-apply outbox by this session snapshot.
    pub fn compaction_projection_intents(
        &self,
    ) -> Result<Vec<crate::memory::CompactionProjectionIntent>, serde_json::Error> {
        self.metadata
            .get(crate::memory::SESSION_COMPACTION_PROJECTION_INTENTS_KEY)
            .map(|value| serde_json::from_value(value.clone()))
            .transpose()
            .map(Option::unwrap_or_default)
    }

    /// Load persisted compaction intents only after proving that every
    /// already-carried projection ID is backed by this session's validated
    /// transcript graph.
    ///
    /// This is deliberately a validation boundary, not an ID constructor:
    /// durable typed rewrite tags and legacy records can confirm an existing
    /// identity during recovery but cannot mint a new identity.
    pub fn validated_compaction_projection_intents(
        &self,
    ) -> Result<Vec<crate::memory::CompactionProjectionIntent>, serde_json::Error> {
        self.validate_transcript_history_state()
            .map_err(|error| <serde_json::Error as serde::ser::Error>::custom(error.to_string()))?;
        let intents = self.compaction_projection_intents()?;
        if intents.is_empty() {
            return Ok(intents);
        }
        let history = self.transcript_history_state()?;
        let commits = history
            .as_ref()
            .map(|history| history.commits.as_slice())
            .unwrap_or_default();
        let mut unique = std::collections::HashSet::new();
        for intent in &intents {
            if intent.projection.session_id() != self.id() {
                return Err(<serde_json::Error as serde::ser::Error>::custom(
                    "compaction projection outbox intent has a foreign session id",
                ));
            }
            if !unique.insert(intent.projection.clone()) {
                return Err(<serde_json::Error as serde::ser::Error>::custom(
                    "compaction projection outbox contains a duplicate rewrite identity",
                ));
            }
            let backed = commits.iter().any(|commit| {
                intent
                    .projection
                    .matches_transcript_rewrite(self.id(), commit)
            });
            if !backed {
                return Err(<serde_json::Error as serde::ser::Error>::custom(format!(
                    "compaction projection outbox intent {} has no matching TranscriptRewriteCommit",
                    intent.projection.revision()
                )));
            }
        }
        Ok(intents)
    }

    /// Record one invisible staged-memory intent only after its exact
    /// TranscriptRewriteCommit is present in the session graph.
    pub fn add_compaction_projection_intent(
        &mut self,
        intent: crate::memory::CompactionProjectionIntent,
    ) -> Result<(), serde_json::Error> {
        if intent.projection.session_id() != self.id() {
            return Err(<serde_json::Error as serde::ser::Error>::custom(
                "compaction projection intent session does not match snapshot session",
            ));
        }
        self.validate_transcript_history_state()
            .map_err(|error| <serde_json::Error as serde::ser::Error>::custom(error.to_string()))?;
        let history = self.transcript_history_state()?.ok_or_else(|| {
            <serde_json::Error as serde::ser::Error>::custom(
                "compaction projection intent requires transcript history state",
            )
        })?;
        let owns_commit = history.commits.iter().any(|commit| {
            commit.parent_revision == intent.projection.parent_revision()
                && commit.revision == intent.projection.revision()
                && intent
                    .projection
                    .matches_transcript_rewrite(self.id(), commit)
        });
        if !owns_commit {
            return Err(<serde_json::Error as serde::ser::Error>::custom(
                "compaction projection intent is not backed by the session transcript graph",
            ));
        }
        let mut intents = self.validated_compaction_projection_intents()?;
        if let Some(existing) = intents
            .iter()
            .find(|existing| existing.projection == intent.projection)
        {
            if existing == &intent {
                return Ok(());
            }
            return Err(<serde_json::Error as serde::ser::Error>::custom(
                "compaction projection intent conflicts with an existing rewrite identity",
            ));
        }
        intents.push(intent);
        self.set_metadata_unchecked(
            crate::memory::SESSION_COMPACTION_PROJECTION_INTENTS_KEY,
            serde_json::to_value(intents)?,
        );
        Ok(())
    }

    /// Remove an intent after the runtime outbox has finalized its staged
    /// memory batch. Idempotent for repeated recovery finalization.
    pub fn complete_compaction_projection_intent(
        &mut self,
        projection: &crate::memory::CompactionProjectionId,
    ) -> Result<Option<crate::memory::CompactionProjectionIntent>, serde_json::Error> {
        let mut intents = self.compaction_projection_intents()?;
        let Some(position) = intents
            .iter()
            .position(|intent| &intent.projection == projection)
        else {
            return Ok(None);
        };
        let completed = intents.remove(position);
        if intents.is_empty() {
            self.remove_metadata_unchecked(
                crate::memory::SESSION_COMPACTION_PROJECTION_INTENTS_KEY,
            );
        } else {
            self.set_metadata_unchecked(
                crate::memory::SESSION_COMPACTION_PROJECTION_INTENTS_KEY,
                serde_json::to_value(intents)?,
            );
        }
        Ok(Some(completed))
    }

    /// Validate the retained transcript revision graph, when present.
    pub fn validate_transcript_history_state(&self) -> Result<(), TranscriptEditError> {
        if self.transcript_history_metadata_validation
            == TranscriptHistoryMetadataValidation::Validated
        {
            return Ok(());
        }
        let Some(state) = self
            .transcript_history_state()
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?
        else {
            return Ok(());
        };
        validate_transcript_history_state(&state)
    }

    /// Clear retained transcript revision metadata after a caller has
    /// materialized the desired message projection.
    pub fn clear_transcript_history_state(&mut self) {
        self.remove_metadata_unchecked(SESSION_TRANSCRIPT_HISTORY_STATE_KEY);
    }

    /// Decode and verify this document's typed checkpoint state.
    ///
    /// Missing typed metadata is returned as explicit legacy-unverified state.
    /// A present malformed stamp or malformed legacy compatibility value is an
    /// error and is never laundered into absence.
    pub fn try_checkpoint_state(
        &self,
    ) -> Result<crate::checkpoint::SessionCheckpointState, crate::checkpoint::SessionCheckpointError>
    {
        let stamp =
            match crate::checkpoint::session_checkpoint_metadata_state(&self.id, &self.metadata)? {
                crate::checkpoint::SessionCheckpointMetadataState::Stamped(stamp) => stamp,
                crate::checkpoint::SessionCheckpointMetadataState::LegacyUnverified {
                    legacy_runtime_checkpoint,
                } => {
                    return Ok(
                        crate::checkpoint::SessionCheckpointState::LegacyUnverified {
                            legacy_runtime_checkpoint,
                        },
                    );
                }
            };
        let actual = crate::checkpoint::session_checkpoint_digest(self)?;
        if stamp.digest() != &actual {
            return Err(crate::checkpoint::SessionCheckpointError::DigestMismatch {
                expected: stamp.digest().clone(),
                actual,
            });
        }
        crate::checkpoint::record_checkpoint_stamp_verification(self, &actual);
        Ok(crate::checkpoint::SessionCheckpointState::Verified(stamp))
    }

    /// [`Session::try_checkpoint_state`] for steady-state READS of durable
    /// documents, skipping the canonical-content digest recomputation when
    /// this process already fully verified this exact document shape and
    /// stamp digest.
    ///
    /// Admission into the memo requires one complete verification (here, in
    /// `try_checkpoint_state`, or at stamp install time), so the first read
    /// after boot still hashes once. Content changes re-key the memo and
    /// re-verify: the key carries the stamp digest plus the document's cheap
    /// shape (message count, metadata entry count, content timestamps), and
    /// every content mutation seam advances at least one of those. Write,
    /// adoption, and convergence seams must keep calling
    /// [`Session::try_checkpoint_state`]: a cached hit is memoized trust,
    /// not a fresh proof of current bytes.
    pub fn try_checkpoint_state_cached(
        &self,
    ) -> Result<crate::checkpoint::SessionCheckpointState, crate::checkpoint::SessionCheckpointError>
    {
        let stamp =
            match crate::checkpoint::session_checkpoint_metadata_state(&self.id, &self.metadata)? {
                crate::checkpoint::SessionCheckpointMetadataState::Stamped(stamp) => stamp,
                crate::checkpoint::SessionCheckpointMetadataState::LegacyUnverified {
                    legacy_runtime_checkpoint,
                } => {
                    return Ok(
                        crate::checkpoint::SessionCheckpointState::LegacyUnverified {
                            legacy_runtime_checkpoint,
                        },
                    );
                }
            };
        if crate::checkpoint::checkpoint_stamp_verification_is_cached(self, stamp.digest()) {
            return Ok(crate::checkpoint::SessionCheckpointState::Verified(stamp));
        }
        let actual = crate::checkpoint::session_checkpoint_digest(self)?;
        if stamp.digest() != &actual {
            return Err(crate::checkpoint::SessionCheckpointError::DigestMismatch {
                expected: stamp.digest().clone(),
                actual,
            });
        }
        crate::checkpoint::record_checkpoint_stamp_verification(self, &actual);
        Ok(crate::checkpoint::SessionCheckpointState::Verified(stamp))
    }

    /// Install a prevalidated semantic checkpoint stamp on this exact
    /// document without changing its content timestamps.
    ///
    /// This is a mechanical serialization seam, not target-store write
    /// authority. A persistence implementation must still atomically validate
    /// its own observation and fencing preconditions before committing the
    /// resulting bytes.
    pub fn install_checkpoint_stamp(
        &mut self,
        stamp: crate::checkpoint::SessionCheckpointStamp,
    ) -> Result<(), crate::checkpoint::SessionCheckpointError> {
        stamp.validate_for_session(&self.id)?;
        let actual = crate::checkpoint::session_checkpoint_digest(self)?;
        if stamp.digest() != &actual {
            return Err(crate::checkpoint::SessionCheckpointError::DigestMismatch {
                expected: stamp.digest().clone(),
                actual,
            });
        }
        let value = serde_json::to_value(&stamp)?;
        self.metadata
            .remove(SESSION_RUNTIME_CHECKPOINT_PROVENANCE_KEY);
        self.metadata
            .insert(SESSION_CHECKPOINT_STAMP_KEY.to_string(), value);
        // Recorded after the stamp insertion so the memoized document shape
        // matches the persisted (and later reloaded) document exactly.
        crate::checkpoint::record_checkpoint_stamp_verification(self, &actual);
        Ok(())
    }

    /// Fail-closed typed read of intra-turn checkpoint provenance.
    pub fn try_has_runtime_checkpoint_provenance(
        &self,
    ) -> Result<bool, crate::checkpoint::SessionCheckpointError> {
        match self.try_checkpoint_state()? {
            crate::checkpoint::SessionCheckpointState::Verified(stamp) => Ok(matches!(
                stamp.provenance(),
                crate::checkpoint::SessionCheckpointProvenance::IntraTurnCheckpoint
            )),
            crate::checkpoint::SessionCheckpointState::LegacyUnverified { .. } => {
                Err(crate::checkpoint::SessionCheckpointError::LegacyCheckpointUnverified)
            }
        }
    }

    /// Set the legacy compatibility marker on an untyped projection.
    #[deprecated(
        note = "legacy compatibility only; typed writers must install an exact checkpoint stamp"
    )]
    pub fn set_runtime_checkpoint_provenance(
        &mut self,
    ) -> Result<(), crate::checkpoint::SessionCheckpointError> {
        if matches!(
            self.try_checkpoint_state()?,
            crate::checkpoint::SessionCheckpointState::Verified(_)
        ) {
            return Err(
                crate::checkpoint::SessionCheckpointError::LegacyProvenanceMutationOnTypedCheckpoint,
            );
        }
        self.set_metadata_unchecked(
            SESSION_RUNTIME_CHECKPOINT_PROVENANCE_KEY,
            serde_json::Value::Bool(true),
        );
        Ok(())
    }

    /// Clear the legacy compatibility marker on an untyped projection.
    #[deprecated(
        note = "legacy compatibility only; typed writers must install an exact run-boundary successor"
    )]
    pub fn clear_runtime_checkpoint_provenance(
        &mut self,
    ) -> Result<(), crate::checkpoint::SessionCheckpointError> {
        if matches!(
            self.try_checkpoint_state()?,
            crate::checkpoint::SessionCheckpointState::Verified(_)
        ) {
            return Err(
                crate::checkpoint::SessionCheckpointError::LegacyProvenanceMutationOnTypedCheckpoint,
            );
        }
        self.remove_metadata_unchecked(SESSION_RUNTIME_CHECKPOINT_PROVENANCE_KEY);
        Ok(())
    }

    /// Return the retained immutable body for a transcript revision.
    pub fn transcript_revision_body(
        &self,
        revision: &str,
    ) -> Result<Option<TranscriptRevisionBody>, serde_json::Error> {
        Ok(self.transcript_history_state()?.and_then(|state| {
            state
                .revisions
                .into_iter()
                .find(|body| body.revision == revision)
        }))
    }

    /// Return the ordered messages for a retained transcript revision.
    pub fn transcript_revision_messages(
        &self,
        revision: &str,
    ) -> Result<Option<Vec<Message>>, serde_json::Error> {
        Ok(self
            .transcript_revision_body(revision)?
            .map(|body| body.messages))
    }

    /// Materialize this session projection from a typed transcript history graph.
    pub fn apply_transcript_history_state(
        &mut self,
        mut state: TranscriptHistoryState,
    ) -> Result<(), TranscriptEditError> {
        state.compact_mechanical_revision_bodies()?;
        let head_body = state
            .revisions
            .iter()
            .find(|body| body.revision == state.head)
            .ok_or_else(|| {
                TranscriptEditError::HistoryStateMalformed(format!(
                    "missing transcript head body {}",
                    state.head
                ))
            })?
            .clone();
        let realtime_state =
            self.reconciled_realtime_transcript_metadata_after_rewrite(&head_body.messages)?;
        let value = serde_json::to_value(&state)
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
        self.set_validated_transcript_history_metadata(value);
        if let Some(value) = realtime_state {
            self.set_metadata_unchecked(SESSION_REALTIME_TRANSCRIPT_STATE_KEY, value);
        }
        let mut updated_at = head_body.created_at;
        for commit in &state.commits {
            if commit.committed_at > updated_at {
                updated_at = commit.committed_at;
            }
        }
        self.messages = Arc::new(head_body.messages);
        self.updated_at = updated_at;
        Ok(())
    }

    /// Current transcript head revision. Rows written before transcript
    /// revisions derive their implicit head from the current message snapshot.
    pub fn transcript_revision(&self) -> Result<String, serde_json::Error> {
        if let Some(state) = self.transcript_history_state()? {
            Ok(state.head)
        } else {
            transcript_messages_digest(self.messages())
        }
    }

    /// Monotonic durable generation for same-session transcript rewrites.
    /// Ordinary message appends advance the content revision but do not change
    /// this value, allowing live config refresh after normal turns while still
    /// forcing reopen after a rewrite.
    pub fn transcript_rewrite_generation(&self) -> Result<u64, serde_json::Error> {
        Ok(self.transcript_history_state()?.map_or(0, |state| {
            u64::try_from(state.commits.len()).unwrap_or(u64::MAX)
        }))
    }

    /// Commit a same-session transcript rewrite and advance the transcript head.
    pub fn commit_transcript_rewrite(
        &mut self,
        selection: TranscriptRewriteSelection,
        replacement: Vec<Message>,
        reason: TranscriptRewriteReason,
        actor: Option<String>,
        expected_parent_revision: Option<String>,
    ) -> Result<TranscriptRewriteCommit, TranscriptEditError> {
        let selection = selection.into_current_edit_semantic();
        if selection.semantic() == TranscriptRewriteSemantic::Compaction {
            return Err(TranscriptEditError::InvalidTranscriptShape(
                "typed compaction rewrites require a core-validated compaction witness".to_string(),
            ));
        }
        self.commit_transcript_rewrite_authorized(
            selection,
            replacement,
            reason,
            actor,
            expected_parent_revision,
        )
    }

    fn commit_transcript_rewrite_authorized(
        &mut self,
        selection: TranscriptRewriteSelection,
        replacement: Vec<Message>,
        reason: TranscriptRewriteReason,
        actor: Option<String>,
        expected_parent_revision: Option<String>,
    ) -> Result<TranscriptRewriteCommit, TranscriptEditError> {
        let parent_revision = self
            .transcript_revision()
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
        if let Some(expected) = expected_parent_revision
            && expected != parent_revision
        {
            return Err(TranscriptEditError::RevisionConflict {
                expected,
                actual: parent_revision,
            });
        }

        let (start, end) = selection.bounds();
        let message_count = self.messages.len();
        if start > end || end > message_count {
            return Err(TranscriptEditError::InvalidRewriteRange {
                start,
                end,
                message_count,
            });
        }

        let replacement_len = replacement.len();
        let mut rewritten = Vec::with_capacity(
            start
                .saturating_add(replacement_len)
                .saturating_add(message_count.saturating_sub(end)),
        );
        rewritten.extend_from_slice(&self.messages[..start]);
        rewritten.extend(replacement);
        rewritten.extend_from_slice(&self.messages[end..]);
        validate_transcript_tool_result_shape(&rewritten)?;

        let original_span_digest = transcript_messages_digest(&self.messages[start..end])
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
        let replacement_digest =
            transcript_messages_digest(&rewritten[start..start + replacement_len])
                .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
        let revision = transcript_messages_digest(&rewritten)
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
        if revision == parent_revision {
            return Err(TranscriptEditError::NoOpRewrite { revision });
        }
        let realtime_state =
            self.reconciled_realtime_transcript_metadata_after_rewrite(&rewritten)?;

        let commit = TranscriptRewriteCommit {
            parent_revision,
            revision: revision.clone(),
            selection,
            original_span_digest,
            replacement_digest,
            messages_before: message_count,
            messages_after: rewritten.len(),
            reason,
            actor,
            committed_at: SystemTime::now(),
        };

        let mut state = self
            .transcript_history_state()
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?
            .unwrap_or_else(|| TranscriptHistoryState {
                head: commit.parent_revision.clone(),
                commits: Vec::new(),
                revisions: Vec::new(),
                digest_format: TRANSCRIPT_DIGEST_FORMAT_CURRENT,
            });
        if !state
            .revisions
            .iter()
            .any(|body| body.revision == commit.parent_revision)
        {
            state.revisions.push(TranscriptRevisionBody {
                revision: commit.parent_revision.clone(),
                parent_revision: None,
                messages: self.messages().to_vec(),
                created_at: self.updated_at,
            });
        }
        if !state
            .revisions
            .iter()
            .any(|body| body.revision == commit.revision)
        {
            state.revisions.push(TranscriptRevisionBody {
                revision: commit.revision.clone(),
                parent_revision: Some(commit.parent_revision.clone()),
                messages: rewritten.clone(),
                created_at: commit.committed_at,
            });
        }
        state.head = revision;
        state.commits.push(commit.clone());
        state.compact_mechanical_revision_bodies()?;
        let value = serde_json::to_value(state)
            .map_err(|err| TranscriptEditError::HistoryStateMalformed(err.to_string()))?;
        self.set_validated_transcript_history_metadata(value);
        if let Some(value) = realtime_state {
            self.set_metadata_unchecked(SESSION_REALTIME_TRANSCRIPT_STATE_KEY, value);
        }

        self.messages = Arc::new(rewritten);
        self.updated_at = SystemTime::now();
        Ok(commit)
    }

    fn transcript_history_state_after_message_mutation(
        &self,
        messages: &[Message],
        created_at: SystemTime,
    ) -> Result<Option<TranscriptHistoryState>, TranscriptEditError> {
        if !self
            .metadata
            .contains_key(SESSION_TRANSCRIPT_HISTORY_STATE_KEY)
        {
            return Ok(None);
        }
        let mut state = self
            .transcript_history_state()
            .map_err(|error| TranscriptEditError::HistoryStateMalformed(error.to_string()))?
            .ok_or_else(|| {
                TranscriptEditError::HistoryStateMalformed(
                    "transcript history metadata key decoded without state".to_string(),
                )
            })?;
        state.compact_mechanical_revision_bodies()?;
        let head = transcript_messages_digest(messages)
            .map_err(|error| TranscriptEditError::HistoryStateMalformed(error.to_string()))?;
        if !state.revisions.iter().any(|body| body.revision == head) {
            state.revisions.push(TranscriptRevisionBody {
                revision: head.clone(),
                parent_revision: state.commits.last().map(|commit| commit.revision.clone()),
                messages: messages.to_vec(),
                created_at,
            });
        }
        state.head = head;
        state.compact_mechanical_revision_bodies()?;
        Ok(Some(state))
    }

    fn refresh_transcript_head_after_message_mutation(&mut self) {
        match self
            .transcript_history_state_after_message_mutation(self.messages(), SystemTime::now())
        {
            Ok(Some(state)) => match serde_json::to_value(state) {
                Ok(value) => {
                    self.set_validated_transcript_history_metadata(value);
                }
                Err(error) => {
                    tracing::warn!(
                        session_id = %self.id,
                        error = %error,
                        "failed to serialize transcript history state after message mutation"
                    );
                }
            },
            Ok(None) => {}
            Err(error) => {
                tracing::warn!(
                    session_id = %self.id,
                    error = %error,
                    "transcript history state failed validation after message mutation"
                );
            }
        }
    }

    /// Store typed mob operator authority inside canonical build-state metadata.
    ///
    /// Store the mob operator authority projection inside build-state metadata.
    ///
    /// The projection is durable compatibility data only: serialization drops
    /// the generated authority seal, so behavior must re-enter generated
    /// authority before using restored facts.
    pub fn set_mob_tool_authority_context(
        &mut self,
        authority_context: Option<MobToolAuthorityContext>,
    ) -> Result<(), serde_json::Error> {
        if let Some(authority_context) = authority_context.as_ref()
            && !authority_context.is_generated_authority_context()
        {
            return Err(<serde_json::Error as serde::de::Error>::custom(
                "mob authority context was not minted by generated authority",
            ));
        }
        let mut build_state = self.build_state().ok_or_else(|| {
            <serde_json::Error as serde::de::Error>::custom(format!(
                "session {} is missing session build state",
                self.id
            ))
        })?;
        build_state.mob_tool_authority_context = authority_context;
        self.set_build_state(build_state)
    }

    /// Load the in-memory generated mob operator authority, if still present.
    ///
    /// Stored/deserialized contexts deliberately fail this check and are not
    /// returned as behavior authority.
    pub fn mob_tool_authority_context(&self) -> Option<MobToolAuthorityContext> {
        self.build_state()
            .and_then(|state| state.mob_tool_authority_context)
            .filter(MobToolAuthorityContext::is_generated_authority_context)
    }

    /// Fork the session at a specific message index
    ///
    /// Creates a new session with a subset of messages. The messages are copied
    /// (not shared) since the new session has a different prefix.
    pub fn fork_at(&self, index: usize) -> Self {
        let now = SystemTime::now();
        let truncated = self.messages[..index.min(self.messages.len())].to_vec();
        Self {
            version: session_version(),
            id: SessionId::new(),
            messages: Arc::new(truncated),
            created_at: now,
            updated_at: now,
            metadata: self.fork_metadata_projection(),
            transcript_history_metadata_validation: TranscriptHistoryMetadataValidation::Validated,
            usage: self.usage.clone(),
        }
    }

    /// Fork the session and replace the message at `message_index`.
    ///
    /// The returned session contains the original prefix before
    /// `message_index`, followed by the typed replacement. Later source
    /// messages are intentionally omitted so follow-up work continues from the
    /// edited branch rather than replaying stale descendants.
    pub fn fork_replacing(
        &self,
        message_index: usize,
        replacement: TranscriptReplacement,
    ) -> Result<Self, TranscriptEditError> {
        let Some(original) = self.messages.get(message_index) else {
            return Err(TranscriptEditError::MessageIndexOutOfBounds {
                message_index,
                message_count: self.messages.len(),
            });
        };

        let replacement_message = match replacement {
            TranscriptReplacement::Message { message } => message,
            TranscriptReplacement::UserContentBlock { block_index, block } => {
                let Message::User(user) = original else {
                    return Err(TranscriptEditError::MessageRoleMismatch {
                        message_index,
                        expected: "user",
                        actual: message_role_name(original),
                    });
                };
                if block_index >= user.content.len() {
                    return Err(TranscriptEditError::BlockIndexOutOfBounds {
                        block_kind: "user content block",
                        block_index,
                        block_count: user.content.len(),
                    });
                }
                let mut edited = user.clone();
                edited.content[block_index] = block;
                Message::User(edited)
            }
            TranscriptReplacement::AssistantBlock { block_index, block } => {
                let Message::BlockAssistant(assistant) = original else {
                    return Err(TranscriptEditError::MessageRoleMismatch {
                        message_index,
                        expected: "block_assistant",
                        actual: message_role_name(original),
                    });
                };
                if block_index >= assistant.blocks.len() {
                    return Err(TranscriptEditError::BlockIndexOutOfBounds {
                        block_kind: "assistant block",
                        block_index,
                        block_count: assistant.blocks.len(),
                    });
                }
                let mut edited = assistant.clone();
                edited.blocks[block_index] = block;
                Message::BlockAssistant(edited)
            }
            TranscriptReplacement::ToolResultContentBlock {
                result_index,
                block_index,
                block,
            } => {
                let Message::ToolResults {
                    results,
                    created_at,
                } = original
                else {
                    return Err(TranscriptEditError::MessageRoleMismatch {
                        message_index,
                        expected: "tool_results",
                        actual: message_role_name(original),
                    });
                };
                let Some(result) = results.get(result_index) else {
                    return Err(TranscriptEditError::BlockIndexOutOfBounds {
                        block_kind: "tool result",
                        block_index: result_index,
                        block_count: results.len(),
                    });
                };
                if block_index >= result.content.len() {
                    return Err(TranscriptEditError::BlockIndexOutOfBounds {
                        block_kind: "tool result content block",
                        block_index,
                        block_count: result.content.len(),
                    });
                }
                let mut edited_results = results.clone();
                edited_results[result_index].content[block_index] = block;
                Message::ToolResults {
                    results: edited_results,
                    created_at: *created_at,
                }
            }
        };

        let mut forked = self.fork_at(message_index);
        forked.push(replacement_message);
        Ok(forked)
    }

    /// Fork the entire session (full history)
    ///
    /// This is O(1) - the new session shares the message buffer via Arc.
    /// Copy-on-write occurs when either session mutates its messages.
    pub fn fork(&self) -> Self {
        let now = SystemTime::now();
        Self {
            version: session_version(),
            id: SessionId::new(),
            messages: Arc::clone(&self.messages),
            created_at: now,
            updated_at: now,
            metadata: self.fork_metadata_projection(),
            transcript_history_metadata_validation: TranscriptHistoryMetadataValidation::Validated,
            usage: self.usage.clone(),
        }
    }
}

impl Default for Session {
    fn default() -> Self {
        Self::new()
    }
}

/// Summary metadata for listing sessions
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub struct SessionMeta {
    pub id: SessionId,
    pub created_at: SystemTime,
    pub updated_at: SystemTime,
    pub message_count: usize,
    pub total_tokens: u64,
    #[serde(default)]
    pub metadata: serde_json::Map<String, serde_json::Value>,
}

/// Metadata required to reliably resume a session across interfaces.
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub struct SessionMetadata {
    /// Per-entity schema version byte.
    ///
    /// Mandatory on read: a persisted row missing the byte (or carrying a
    /// non-current value) fails closed through the generated persistence
    /// version authority instead of silently defaulting. Stamped with the
    /// current `SESSION_METADATA_SCHEMA_VERSION` on every persist.
    pub schema_version: u32,
    pub model: String,
    pub max_tokens: u32,
    #[serde(default = "crate::config::default_structured_output_retries")]
    pub structured_output_retries: u32,
    pub provider: Provider,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub self_hosted_server_id: Option<String>,
    /// Typed provider parameter overrides persisted with the session.
    /// Parsed fail-closed at the serde boundary — no JSON bag survives here.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub provider_params: Option<crate::lifecycle::run_primitive::ProviderParamsOverride>,
    pub tooling: SessionTooling,
    #[serde(default)]
    pub keep_alive: bool,
    pub comms_name: Option<String>,
    /// Friendly metadata for peer discovery (populated when comms is enabled).
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub peer_meta: Option<PeerMeta>,
    /// Realm identity for cross-surface storage sharing/isolation.
    ///
    /// Typed [`crate::RealmId`]; the realm slug is validated at the serde
    /// boundary. `RealmId` serializes transparently as its slug string, so the
    /// durable JSON shape is identical to the prior `Option<String>` form.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub realm_id: Option<crate::RealmId>,
    /// Optional process/agent instance identifier within a realm.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub instance_id: Option<String>,
    /// Backend pinned by the realm manifest (e.g. "sqlite", "jsonl", "memory").
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub backend: Option<String>,
    /// Config generation used when this session was created/resumed.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub config_generation: Option<u64>,
    /// Realm-scoped auth binding (Phase 3 provider-auth redesign).
    ///
    /// Persisted intent for the auth/backend binding this session resolved
    /// through. On resume, `apply_resumed_session_metadata` writes this
    /// back into `AgentBuildConfig.auth_binding` so the same realm
    /// binding is re-resolved. Never carries secret material — leases
    /// are rebuilt from the active realm connection set at resume time.
    /// Older persisted sessions without the field deserialize as `None`
    /// (backward compatible via `#[serde(default)]`).
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub auth_binding: Option<crate::AuthBindingRef>,
    /// Typed durable identity of a mob member, when this session was created by
    /// the mob runtime.
    ///
    /// This is the canonical owner of the `(mob_id, role, member)` identity
    /// fact used by mob ownership routing on resume/restart. It replaces the
    /// prior recovery-by-string-split of `comms_name` plus a realm
    /// format-string check. `comms_name`/`realm_id`/`peer_meta` remain as the
    /// transport routing name and discovery metadata.
    ///
    /// Older persisted sessions without the field deserialize as `None`
    /// (backward compatible via `#[serde(default)]`), so old rows read as
    /// "no typed binding" rather than failing.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub mob_member_binding: Option<crate::MobMemberBinding>,
}

/// Canonical durable LLM identity for a session.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
#[serde(rename_all = "snake_case")]
pub struct SessionLlmIdentity {
    pub model: String,
    pub provider: Provider,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub self_hosted_server_id: Option<String>,
    /// Typed provider parameter overrides carried on the durable identity.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub provider_params: Option<crate::lifecycle::run_primitive::ProviderParamsOverride>,
    /// Realm-scoped auth binding this session resolves credentials
    /// through. Carried on the identity so mid-session hot-swaps
    /// (`apply_live_session_llm_identity`) re-resolve against the
    /// same realm the session was created with — preventing
    /// cross-realm credential bleed in multi-tenant setups. Dogma
    /// §12 (dynamic policy follows dynamic identity): on swap the
    /// factory re-enters `ProviderRuntimeRegistry::resolve` against
    /// this binding, not a new synthesized env-default realm.
    ///
    /// Projection (dogma §1/§13): canonical owner is
    /// `SessionMetadata.auth_binding`; this field is the
    /// read/write projection used by hot-swap.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub auth_binding: Option<crate::AuthBindingRef>,
}

/// Typed per-turn override request for a session LLM identity.
///
/// `provider_params` and `auth_binding` carry the canonical Inherit/Set/Clear
/// tri-state via [`TurnMetadataOverride`]: `None` preserves the durable value,
/// `Some(Set)` overrides it for this turn, and `Some(Clear)` removes it. The
/// illegal "set and clear" fourth state is structurally unrepresentable, so the
/// resolver needs no reject branch for it.
pub struct SessionLlmIdentityOverride<'a> {
    pub model: Option<&'a str>,
    pub provider: Option<Provider>,
    /// Exact configured route for a self-hosted model. This cannot be inferred
    /// from provider/model when multiple local servers expose the same model
    /// identifier.
    pub self_hosted_server_id: Option<&'a str>,
    pub provider_params:
        Option<TurnMetadataOverride<&'a crate::lifecycle::run_primitive::ProviderParamsOverride>>,
    pub auth_binding: Option<TurnMetadataOverride<&'a crate::AuthBindingRef>>,
}

#[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]
pub enum SessionLlmIdentityOverrideError {
    #[error("provider override requires model on an existing session")]
    ProviderRequiresModel,
    #[error("{0}")]
    ProviderModelMismatch(String),
    #[error("self-hosted provider requires a registered model alias; '{model}' is not configured")]
    MissingSelfHostedAlias { model: String },
    #[error("self_hosted_server_id requires provider 'self_hosted'")]
    SelfHostedServerRequiresSelfHostedProvider,
    #[error("self_hosted_server_id must not be empty")]
    EmptySelfHostedServerId,
    #[error(
        "self-hosted model '{model}' is configured on server '{configured}', not requested server '{requested}'"
    )]
    SelfHostedServerMismatch {
        model: String,
        requested: String,
        configured: String,
    },
}

/// Resolve a turn-time model/provider/auth override against the current
/// durable session identity.
///
/// The model registry is the authority for catalog ownership. A model-only
/// override follows catalog ownership when the target model is registered;
/// uncatalogued models keep the current provider so custom aliases remain
/// possible.
pub fn resolve_session_llm_identity_override(
    current: &SessionLlmIdentity,
    registry: &crate::ModelRegistry,
    overrides: SessionLlmIdentityOverride<'_>,
) -> Result<SessionLlmIdentity, SessionLlmIdentityOverrideError> {
    if overrides.provider.is_some() && overrides.model.is_none() {
        return Err(SessionLlmIdentityOverrideError::ProviderRequiresModel);
    }

    let model = overrides
        .model
        .map(str::to_string)
        .unwrap_or_else(|| current.model.clone());
    let provider = if let Some(provider) = overrides.provider {
        provider
    } else if overrides.model.is_some() {
        registry
            .entry(&model)
            .map_or(current.provider, |entry| entry.provider)
    } else {
        current.provider
    };

    if (overrides.model.is_some() || overrides.provider.is_some())
        && let Some(reason) = registry.provider_override_mismatch_reason(provider, &model)
    {
        return Err(SessionLlmIdentityOverrideError::ProviderModelMismatch(
            reason,
        ));
    }

    let provider_params = match overrides.provider_params {
        Some(TurnMetadataOverride::Clear) => None,
        Some(TurnMetadataOverride::Set(value)) => Some(value.clone()),
        None => current.provider_params.clone(),
    };
    if overrides.self_hosted_server_id.is_some() && provider != Provider::SelfHosted {
        return Err(SessionLlmIdentityOverrideError::SelfHostedServerRequiresSelfHostedProvider);
    }
    let self_hosted_server_id = if provider == Provider::SelfHosted {
        if let Some(requested_server_id) = overrides.self_hosted_server_id {
            if requested_server_id.trim().is_empty() {
                return Err(SessionLlmIdentityOverrideError::EmptySelfHostedServerId);
            }
            let entry = registry
                .entry_for_provider(Provider::SelfHosted, &model)
                .ok_or_else(|| SessionLlmIdentityOverrideError::MissingSelfHostedAlias {
                    model: model.clone(),
                })?;
            let configured_server_id = entry
                .self_hosted
                .as_ref()
                .map(|server| server.server_id.as_str())
                .ok_or_else(|| SessionLlmIdentityOverrideError::MissingSelfHostedAlias {
                    model: model.clone(),
                })?;
            if configured_server_id != requested_server_id {
                return Err(SessionLlmIdentityOverrideError::SelfHostedServerMismatch {
                    model,
                    requested: requested_server_id.to_string(),
                    configured: configured_server_id.to_string(),
                });
            }
            Some(requested_server_id.to_string())
        } else if overrides.model.is_none() {
            current.self_hosted_server_id.clone().or_else(|| {
                registry
                    .entry_for_provider(Provider::SelfHosted, &model)
                    .and_then(|entry| entry.self_hosted.as_ref())
                    .map(|server| server.server_id.clone())
            })
        } else {
            let entry = registry
                .entry_for_provider(Provider::SelfHosted, &model)
                .ok_or_else(|| SessionLlmIdentityOverrideError::MissingSelfHostedAlias {
                    model: model.clone(),
                })?;
            entry
                .self_hosted
                .as_ref()
                .map(|server| server.server_id.clone())
        }
    } else {
        None
    };

    let auth_binding = match overrides.auth_binding {
        Some(TurnMetadataOverride::Clear) => None,
        Some(TurnMetadataOverride::Set(value)) => Some(value.clone()),
        // Inherit: a provider change without an explicit binding drops the
        // stale binding; otherwise the durable binding is retained.
        None if provider != current.provider => None,
        None => current.auth_binding.clone(),
    };

    Ok(SessionLlmIdentity {
        model,
        provider,
        self_hosted_server_id,
        provider_params,
        auth_binding,
    })
}

/// Live request policy paired with a session LLM identity hot-swap.
///
/// `SessionLlmIdentity` is the durable semantic identity. This projection is
/// the per-turn request policy the live agent must use for the next LLM call,
/// including provider params and provider-native tool defaults resolved for
/// the same target model/provider.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
#[serde(rename_all = "snake_case")]
pub struct SessionLlmRequestPolicy {
    pub model: String,
    /// Typed explicit provider parameter overrides for the next LLM call.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub provider_params: Option<crate::lifecycle::run_primitive::ProviderParamsOverride>,
    /// Typed provider-native tool defaults resolved for the swapped target.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub provider_tool_defaults: Option<crate::lifecycle::run_primitive::ProviderTag>,
}

impl SessionMetadata {
    /// Return the current durable LLM identity for this session.
    pub fn llm_identity(&self) -> SessionLlmIdentity {
        SessionLlmIdentity {
            model: self.model.clone(),
            provider: self.provider,
            self_hosted_server_id: self.self_hosted_server_id.clone(),
            provider_params: self.provider_params.clone(),
            auth_binding: self.auth_binding.clone(),
        }
    }

    /// Overwrite the durable LLM identity while preserving unrelated session metadata.
    pub fn apply_llm_identity(&mut self, identity: &SessionLlmIdentity) {
        self.model = identity.model.clone();
        self.provider = identity.provider;
        self.self_hosted_server_id = identity.self_hosted_server_id.clone();
        self.provider_params = identity.provider_params.clone();
        self.auth_binding = identity.auth_binding.clone();
    }
}

/// Key used to store SessionMetadata in Session metadata map.
pub const SESSION_METADATA_KEY: &str = "session_metadata";

/// Caller intent for a tool category.
///
/// Distinguishes "no opinion / didn't exist" (`Inherit`) from explicit
/// `Enable` / `Disable` so that resumed sessions don't freeze tool
/// availability at the capabilities of the Meerkat version that created them.
///
/// **Dogma §10:** Inherit, disable, and set are different facts.
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum ToolCategoryOverride {
    /// No explicit intent — inherit runtime/factory default.
    #[default]
    Inherit,
    /// Explicitly enabled by caller.
    Enable,
    /// Explicitly disabled by caller.
    Disable,
}

impl ToolCategoryOverride {
    /// Resolve this override against a runtime default.
    ///
    /// - `Enable` → `true`
    /// - `Disable` → `false`
    /// - `Inherit` → `runtime_default`
    #[must_use]
    pub fn resolve(self, runtime_default: bool) -> bool {
        match self {
            Self::Enable => true,
            Self::Disable => false,
            Self::Inherit => runtime_default,
        }
    }

    /// Convert to `Option<bool>` for feeding `AgentBuildConfig` override fields.
    ///
    /// - `Enable` → `Some(true)`
    /// - `Disable` → `Some(false)`
    /// - `Inherit` → `None` (factory default wins)
    #[must_use]
    pub fn to_override(self) -> Option<bool> {
        match self {
            Self::Enable => Some(true),
            Self::Disable => Some(false),
            Self::Inherit => None,
        }
    }

    /// Construct from a resolved effective bool.
    ///
    /// **Warning:** this collapses `Inherit` into `Enable`/`Disable`. Prefer
    /// [`from_override`] when persisting session metadata so that `Inherit`
    /// survives across save/resume cycles. Only use `from_effective` in test
    /// helpers or when constructing metadata from external sources that only
    /// provide a resolved bool.
    #[must_use]
    pub fn from_effective(enabled: bool) -> Self {
        if enabled { Self::Enable } else { Self::Disable }
    }

    /// Construct from an `Option<bool>` override field, preserving `Inherit`.
    ///
    /// - `Some(true)` → `Enable`
    /// - `Some(false)` → `Disable`
    /// - `None` → `Inherit` (factory default was used, no explicit intent)
    ///
    /// This is the inverse of [`to_override`] and should be used when persisting
    /// session tooling metadata so that `Inherit` survives across save/resume
    /// cycles.
    #[must_use]
    pub fn from_override(value: Option<bool>) -> Self {
        match value {
            Some(true) => Self::Enable,
            Some(false) => Self::Disable,
            None => Self::Inherit,
        }
    }
}

/// Tooling intent captured at session creation time.
///
/// Fields use [`ToolCategoryOverride`] to distinguish "no opinion" from
/// explicit enable/disable (Dogma §10). On resume, `Inherit` falls through
/// to the factory's current runtime default, allowing new tool categories
/// to become available without re-creating the session.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
#[serde(rename_all = "snake_case")]
pub struct SessionTooling {
    #[serde(default)]
    pub builtins: ToolCategoryOverride,
    #[serde(default)]
    pub shell: ToolCategoryOverride,
    #[serde(default)]
    pub comms: ToolCategoryOverride,
    /// Mob (multi-agent orchestration) tools.
    #[serde(default)]
    pub mob: ToolCategoryOverride,
    /// Semantic memory.
    #[serde(default)]
    pub memory: ToolCategoryOverride,
    /// Scheduler tools.
    #[serde(default)]
    pub schedule: ToolCategoryOverride,
    /// WorkGraph durable work tools.
    #[serde(default)]
    pub workgraph: ToolCategoryOverride,
    /// Assistant image generation.
    #[serde(default)]
    pub image_generation: ToolCategoryOverride,
    /// Meerkat-owned fallback web search.
    #[serde(default)]
    pub web_search: ToolCategoryOverride,
    /// Effective call-level tool execution policy for this session's builds.
    ///
    /// Persisted RESOLVED (never `Inherit`): the factory fails the build
    /// closed on an unresolved `Inherit` before metadata is written, so this
    /// field only ever holds `AllowList`/`DenyList`. Absent means
    /// unrestricted. Spawn/fork resolution reads this field as the parent's
    /// effective policy when a child requests `Inherit` (transitive
    /// containment — a restricted parent cannot mint an unrestricted child
    /// by spawning).
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub tool_access_policy: Option<crate::ops::ToolAccessPolicy>,
    /// Active skills at session creation time (for deterministic resume).
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub active_skills: Option<Vec<crate::skills::SkillKey>>,
}

impl From<&Session> for SessionMeta {
    fn from(session: &Session) -> Self {
        Self {
            id: session.id.clone(),
            created_at: session.created_at,
            updated_at: session.updated_at,
            message_count: session.messages.len(),
            total_tokens: session.total_tokens(),
            metadata: session.metadata.clone(),
        }
    }
}

/// Decode the typed [`SESSION_METADATA_KEY`] fact from a session metadata map
/// through the generated restore authority.
///
/// Canonical single decoder: [`Session::try_session_metadata`] and every
/// metadata-only read seam ([`PersistedSessionMetadataView`]) delegate here so
/// the full-session and metadata-only decode paths can never drift.
///
/// Fail-closed: a present-but-corrupt value is an error, never "absent".
pub fn try_session_metadata_from_map(
    metadata: &serde_json::Map<String, serde_json::Value>,
) -> Result<Option<SessionMetadata>, serde_json::Error> {
    let Some(value) = metadata.get(SESSION_METADATA_KEY) else {
        return Ok(None);
    };
    let mut metadata = serde_json::from_value::<SessionMetadata>(value.clone())?;
    metadata.schema_version =
        session_persistence_version_authority::restore_session_metadata_schema_version(
            metadata.schema_version,
        )
        .map_err(<serde_json::Error as serde::de::Error>::custom)?;
    session_durable_config_authority::restore_session_metadata(metadata)
        .map(Some)
        .map_err(<serde_json::Error as serde::de::Error>::custom)
}

/// Decode the typed [`SESSION_LIFECYCLE_TERMINAL_KEY`] fact from a session
/// metadata map.
///
/// Canonical single decoder: [`Session::try_lifecycle_terminal`] and every
/// metadata-only read seam delegate here. An absent key means no terminal
/// fact; a present-but-corrupt value fails closed.
pub fn try_lifecycle_terminal_from_map(
    metadata: &serde_json::Map<String, serde_json::Value>,
) -> Result<Option<SessionLifecycleTerminal>, serde_json::Error> {
    match metadata.get(SESSION_LIFECYCLE_TERMINAL_KEY) {
        Some(value) => serde_json::from_value(value.clone()).map(Some),
        None => Ok(None),
    }
}

/// Typed metadata-only view of a persisted session row or snapshot.
///
/// The metadata read seam's currency (mobkit ask-24 clause 3): carries the
/// session identity plus the two typed session-authority metadata facts,
/// decoded fail-closed through the canonical map-level decoders. Consumers
/// that only need ownership/policy/lifecycle facts read this view instead of
/// materializing the full session document.
#[derive(Debug, Clone)]
pub struct PersistedSessionMetadataView {
    pub session_id: SessionId,
    pub session_metadata: Option<SessionMetadata>,
    pub lifecycle_terminal: Option<SessionLifecycleTerminal>,
}

impl PersistedSessionMetadataView {
    /// Build the view from a persisted metadata map (e.g. a
    /// [`SessionMeta`] row projection).
    ///
    /// Fail-closed: corrupt values under either reserved key are an error,
    /// never treated as absent.
    pub fn try_from_metadata_map(
        session_id: SessionId,
        metadata: &serde_json::Map<String, serde_json::Value>,
    ) -> Result<Self, serde_json::Error> {
        Ok(Self {
            session_id,
            session_metadata: try_session_metadata_from_map(metadata)?,
            lifecycle_terminal: try_lifecycle_terminal_from_map(metadata)?,
        })
    }

    /// Project the view from a fully materialized session document.
    pub fn try_from_session(session: &Session) -> Result<Self, serde_json::Error> {
        Ok(Self {
            session_id: session.id().clone(),
            session_metadata: session.try_session_metadata()?,
            lifecycle_terminal: session.try_lifecycle_terminal()?,
        })
    }

    /// Typed durable mob member identity carried on the session metadata,
    /// if any.
    pub fn mob_member_binding(&self) -> Option<&crate::MobMemberBinding> {
        self.session_metadata.as_ref()?.mob_member_binding.as_ref()
    }
}

#[cfg(test)]
#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
mod tests {
    use super::*;
    use crate::realtime_transcript::RealtimeTranscriptRole;
    use crate::types::{
        AssistantBlock, BlockAssistantMessage, ContentBlock, StopReason, SystemMessage, Usage,
        UserMessage,
    };
    use std::sync::Arc;

    fn exact_boundary_append(key: &str, text: &str) -> PendingSystemContextAppend {
        PendingSystemContextAppend {
            content: crate::lifecycle::CoreRenderable::text(text.to_string()),
            source: Some("test:exact-boundary".to_string()),
            idempotency_key: Some(key.to_string()),
            source_kind: SystemContextSource::RuntimeSteer,
            accepted_at: SystemTime::now(),
            peer_response_terminal: None,
        }
    }

    async fn wait_for_exact_boundary_request(handle: &SystemContextStateHandle) {
        for _ in 0..1_000 {
            let registered = matches!(
                &handle.boundary.lock().window,
                SystemContextBoundaryWindow::Open {
                    request: Some(_),
                    ..
                }
            );
            if registered {
                return;
            }
            tokio::task::yield_now().await;
        }
        panic!("exact boundary request did not register");
    }

    fn assert_send<T: Send>() {}

    #[test]
    fn prepared_boundary_authority_is_send_for_owned_commit_handoff() {
        assert_send::<PreparedSystemContextBoundary>();
        assert_send::<crate::lifecycle::CoreBoundaryStageOutput>();
        assert_send::<ModelBoundarySystemContext>();
    }

    #[tokio::test]
    async fn exact_boundary_runner_first_is_typed_unavailable() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");

        let consuming = state
            .take_pending_at_exact_boundary(&run_id)
            .await
            .expect("runner claims open boundary");
        assert!(consuming.appends().is_empty());
        assert!(
            consuming
                .consume()
                .expect("runner consumes open boundary")
                .is_empty()
        );
        let error = state
            .prepare_active_turn_boundary(
                &run_id,
                vec![exact_boundary_append("runner-first", "too late")],
            )
            .await
            .expect_err("consumed generation cannot mint a preparation");
        assert!(matches!(error, CoreBoundaryStageError::Unavailable { .. }));
    }

    #[tokio::test]
    async fn exact_boundary_wrong_run_is_stale_without_claiming_or_mutating_window() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let active_run_id = RunId::new();
        let wrong_run_id = RunId::new();
        let _run = state
            .begin_boundary_run(active_run_id.clone())
            .expect("open boundary");

        let error = state
            .prepare_active_turn_boundary(
                &wrong_run_id,
                vec![exact_boundary_append("wrong-run", "must not stage")],
            )
            .await
            .expect_err("a different run cannot claim the active window");
        assert!(matches!(error, CoreBoundaryStageError::Stale { .. }));
        assert!(state.snapshot().seen().is_empty());

        let consuming = state
            .take_pending_at_exact_boundary(&active_run_id)
            .await
            .expect("the correct run still owns its unclaimed boundary");
        assert!(
            consuming
                .consume()
                .expect("consume unchanged active window")
                .is_empty()
        );
    }

    #[tokio::test]
    async fn exact_boundary_conflicting_batch_is_atomic_and_leaves_window_unclaimed() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");

        let error = state
            .prepare_active_turn_boundary(
                &run_id,
                vec![
                    exact_boundary_append("conflict", "first"),
                    exact_boundary_append("conflict", "different"),
                ],
            )
            .await
            .expect_err("a conflicting batch must fail before registration");
        assert!(matches!(error, CoreBoundaryStageError::Fault { .. }));
        assert!(state.snapshot().seen().is_empty());

        let consuming = state
            .take_pending_at_exact_boundary(&run_id)
            .await
            .expect("failed validation must leave the exact window unclaimed");
        assert!(
            consuming
                .consume()
                .expect("consume unchanged active window")
                .is_empty()
        );
    }

    #[tokio::test]
    async fn exact_boundary_prepare_first_parks_until_commit() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");

        let prepare_state = state.clone();
        let prepare_run_id = run_id.clone();
        let prepare = tokio::spawn(async move {
            prepare_state
                .prepare_active_turn_boundary(
                    &prepare_run_id,
                    vec![exact_boundary_append("prepare-first", "parked context")],
                )
                .await
        });
        wait_for_exact_boundary_request(&state).await;

        let runner_state = state.clone();
        let runner_run_id = run_id.clone();
        let runner = tokio::spawn(async move {
            runner_state
                .take_pending_at_exact_boundary(&runner_run_id)
                .await
        });
        let prepared = prepare
            .await
            .expect("prepare task")
            .expect("prepare must return only after park");
        assert_eq!(prepared.expected_run_id(), &run_id);
        assert!(prepared.boundary_generation() > 0);
        assert!(state.snapshot().pending().is_empty());
        assert!(
            !runner.is_finished(),
            "runner must remain parked before commit"
        );

        prepared
            .into_stage_output(None)
            .commit()
            .expect("exact commit");
        let consuming = runner
            .await
            .expect("runner task")
            .expect("runner resumes after commit");
        assert_eq!(state.snapshot().pending().len(), 1);
        assert!(state.snapshot().applied().is_empty());
        let consumed = consuming.consume().expect("consume at model call seam");
        assert_eq!(consumed.len(), 1);
        assert_eq!(consumed[0].content.render_text(), "parked context");
        assert!(state.snapshot().pending().is_empty());
        assert!(state.snapshot().applied().is_empty());
    }

    #[tokio::test]
    async fn exact_boundary_preprocessing_drop_does_not_claim_model_consumption() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");
        let prepare_state = state.clone();
        let prepare_run_id = run_id.clone();
        let prepare = tokio::spawn(async move {
            prepare_state
                .prepare_active_turn_boundary(
                    &prepare_run_id,
                    vec![exact_boundary_append(
                        "preprocess-drop",
                        "retryable context",
                    )],
                )
                .await
        });
        wait_for_exact_boundary_request(&state).await;
        let runner_state = state.clone();
        let runner_run_id = run_id.clone();
        let runner = tokio::spawn(async move {
            runner_state
                .take_pending_at_exact_boundary(&runner_run_id)
                .await
        });
        prepare
            .await
            .expect("prepare task")
            .expect("prepare parks")
            .into_stage_output(None)
            .commit()
            .expect("publish pending candidate");

        let consuming = runner
            .await
            .expect("runner task")
            .expect("runner enters preprocessing");
        assert_eq!(consuming.appends().len(), 1);
        drop(consuming);

        let snapshot = state.snapshot();
        assert_eq!(snapshot.pending().len(), 1);
        assert!(snapshot.applied().is_empty());
        assert!(snapshot.seen().contains_key("preprocess-drop"));

        // Commit publishes to the exact active turn; it does not claim model
        // delivery. A later hard cancel/preprocessing drop owns the following
        // cleanup linearization and must not leak the accepted steer to a
        // successor run.
        assert_eq!(
            state
                .discard_unapplied_active_turn_pending()
                .expect("closed consuming window permits active-turn cleanup"),
            1
        );
        assert!(state.snapshot().pending().is_empty());
    }

    #[tokio::test]
    async fn exact_boundary_drop_aborts_and_preserves_ordinary_pending() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        state
            .stage_append_with_snapshot(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::CoreRenderable::text("ordinary"),
                    source: Some("test:ordinary".to_string()),
                    idempotency_key: Some("ordinary".to_string()),
                    source_kind: SystemContextSource::Normal,
                    peer_response_terminal: None,
                },
                SystemTime::now(),
            )
            .expect("ordinary append");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");
        let prepare_state = state.clone();
        let prepare_run_id = run_id.clone();
        let prepare = tokio::spawn(async move {
            prepare_state
                .prepare_active_turn_boundary(
                    &prepare_run_id,
                    vec![exact_boundary_append("drop-abort", "must not publish")],
                )
                .await
        });
        wait_for_exact_boundary_request(&state).await;
        let runner_state = state.clone();
        let runner_run_id = run_id.clone();
        let runner = tokio::spawn(async move {
            runner_state
                .take_pending_at_exact_boundary(&runner_run_id)
                .await
        });
        let prepared = prepare.await.expect("prepare task").expect("parked");
        drop(prepared);
        let consuming = runner
            .await
            .expect("runner task")
            .expect("drop abort wakes runner");
        let consumed = consuming
            .consume()
            .expect("consume ordinary pending context");
        assert_eq!(consumed.len(), 1);
        assert_eq!(consumed[0].content.render_text(), "ordinary");
        assert!(!state.snapshot().seen().contains_key("drop-abort"));
    }

    #[tokio::test]
    async fn exact_boundary_duplicate_prepare_cannot_overwrite_generation() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");
        let first_state = state.clone();
        let first_run_id = run_id.clone();
        let first = tokio::spawn(async move {
            first_state
                .prepare_active_turn_boundary(
                    &first_run_id,
                    vec![exact_boundary_append("first", "first")],
                )
                .await
        });
        wait_for_exact_boundary_request(&state).await;
        let duplicate = state
            .prepare_active_turn_boundary(&run_id, vec![exact_boundary_append("second", "second")])
            .await
            .expect_err("duplicate preparation must fail closed");
        assert!(duplicate.is_unavailable());

        let runner_state = state.clone();
        let runner_run_id = run_id.clone();
        let runner = tokio::spawn(async move {
            runner_state
                .take_pending_at_exact_boundary(&runner_run_id)
                .await
        });
        let prepared = first.await.expect("first task").expect("first parks");
        prepared
            .into_stage_output(None)
            .abort()
            .expect("explicit abort");
        runner
            .await
            .expect("runner task")
            .expect("runner resumes after abort")
            .consume()
            .expect("consume ordinary pending after abort");
        assert!(!state.snapshot().seen().contains_key("second"));
    }

    #[tokio::test]
    async fn exact_boundary_concurrent_conflict_surfaces_fault_to_runner_and_preparer() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");
        let prepare_state = state.clone();
        let prepare_run_id = run_id.clone();
        let prepare = tokio::spawn(async move {
            prepare_state
                .prepare_active_turn_boundary(
                    &prepare_run_id,
                    vec![exact_boundary_append("shared-key", "prepared context")],
                )
                .await
        });
        wait_for_exact_boundary_request(&state).await;

        state
            .stage_append_with_snapshot(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::CoreRenderable::text("ordinary conflict"),
                    source: Some("test:exact-boundary".to_string()),
                    idempotency_key: Some("shared-key".to_string()),
                    source_kind: SystemContextSource::Normal,
                    peer_response_terminal: None,
                },
                SystemTime::now(),
            )
            .expect("ordinary mutation remains legal before the runner parks");

        let runner_error = state
            .take_pending_at_exact_boundary(&run_id)
            .await
            .err()
            .expect("runner must surface candidate recomputation conflict");
        assert!(matches!(runner_error, CoreBoundaryStageError::Fault { .. }));
        let prepare_error = prepare
            .await
            .expect("prepare task")
            .expect_err("preparer must receive the same typed failure class");
        assert!(matches!(
            prepare_error,
            CoreBoundaryStageError::Fault { .. }
        ));

        let snapshot = state.snapshot();
        assert_eq!(snapshot.pending().len(), 1);
        assert_eq!(
            snapshot.pending()[0].content.render_text(),
            "ordinary conflict"
        );
        assert!(snapshot.applied().is_empty());
    }

    #[tokio::test]
    async fn exact_boundary_nonconflicting_open_mutation_is_preserved_in_candidate() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");
        let prepare_state = state.clone();
        let prepare_run_id = run_id.clone();
        let prepare = tokio::spawn(async move {
            prepare_state
                .prepare_active_turn_boundary(
                    &prepare_run_id,
                    vec![exact_boundary_append("prepared", "prepared context")],
                )
                .await
        });
        wait_for_exact_boundary_request(&state).await;

        state
            .stage_append_with_snapshot(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::CoreRenderable::text("ordinary context"),
                    source: Some("test:ordinary".to_string()),
                    idempotency_key: Some("ordinary".to_string()),
                    source_kind: SystemContextSource::Normal,
                    peer_response_terminal: None,
                },
                SystemTime::now(),
            )
            .expect("nonconflicting mutation remains legal before park");

        let runner_state = state.clone();
        let runner_run_id = run_id.clone();
        let runner = tokio::spawn(async move {
            runner_state
                .take_pending_at_exact_boundary(&runner_run_id)
                .await
        });
        let prepared = prepare.await.expect("prepare task").expect("parked");
        assert_eq!(prepared.candidate_state().pending().len(), 2);
        prepared
            .into_stage_output(None)
            .commit()
            .expect("commit exact candidate");
        let consuming = runner
            .await
            .expect("runner task")
            .expect("runner resumes after commit");
        let consumed = consuming.consume().expect("consume exact candidate");
        assert_eq!(consumed.len(), 2);
        assert!(
            consumed
                .iter()
                .any(|append| append.content.render_text() == "ordinary context")
        );
        assert!(
            consumed
                .iter()
                .any(|append| append.content.render_text() == "prepared context")
        );
    }

    #[tokio::test]
    async fn exact_boundary_actor_replacement_rejects_old_commit() {
        let actor_a = SystemContextStateHandle::new(Default::default()).expect("actor A");
        let run_id = RunId::new();
        let _run_a = actor_a
            .begin_boundary_run(run_id.clone())
            .expect("open A boundary");
        let prepare_state = actor_a.clone();
        let prepare_run_id = run_id.clone();
        let prepare = tokio::spawn(async move {
            prepare_state
                .prepare_active_turn_boundary(
                    &prepare_run_id,
                    vec![exact_boundary_append("actor-a", "stale A")],
                )
                .await
        });
        wait_for_exact_boundary_request(&actor_a).await;
        let runner_state = actor_a.clone();
        let runner_run_id = run_id.clone();
        let runner = tokio::spawn(async move {
            runner_state
                .take_pending_at_exact_boundary(&runner_run_id)
                .await
        });
        let prepared_a = prepare.await.expect("prepare task").expect("A parked");

        actor_a.revoke_boundary_actor();
        let actor_b = SystemContextStateHandle::new(Default::default()).expect("actor B");
        let _run_b = actor_b
            .begin_boundary_run(run_id.clone())
            .expect("replacement opens independently");
        let error = prepared_a
            .into_stage_output(None)
            .commit()
            .expect_err("A cannot commit after replacement revoke");
        assert!(matches!(error, CoreBoundaryStageError::Stale { .. }));
        assert!(runner.await.expect("A runner task").is_err());
        assert!(actor_b.snapshot().seen().is_empty());
    }

    #[tokio::test]
    async fn exact_boundary_hard_interrupt_and_concurrent_append_fail_closed() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let _run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");
        let prepare_state = state.clone();
        let prepare_run_id = run_id.clone();
        let prepare = tokio::spawn(async move {
            prepare_state
                .prepare_active_turn_boundary(
                    &prepare_run_id,
                    vec![exact_boundary_append("interrupt", "stale")],
                )
                .await
        });
        wait_for_exact_boundary_request(&state).await;
        let runner_state = state.clone();
        let runner_run_id = run_id.clone();
        let runner = tokio::spawn(async move {
            runner_state
                .take_pending_at_exact_boundary(&runner_run_id)
                .await
        });
        let prepared = prepare.await.expect("prepare task").expect("parked");
        let concurrent = state.stage_append_with_snapshot(
            &AppendSystemContextRequest {
                content: crate::lifecycle::CoreRenderable::text("concurrent"),
                source: Some("test:concurrent".to_string()),
                idempotency_key: Some("concurrent".to_string()),
                source_kind: SystemContextSource::Normal,
                peer_response_terminal: None,
            },
            SystemTime::now(),
        );
        assert!(
            concurrent.is_err(),
            "parked candidate must not be overwritten"
        );
        let discard_error = state
            .discard_unapplied_active_turn_pending()
            .expect_err("parked authority must reject cleanup, not report an empty success");
        assert!(matches!(
            discard_error,
            CoreBoundaryStageError::Fault { .. }
        ));
        let keyed_discard_error = state
            .discard_active_turn_pending_by_keys(&["interrupt".to_string()])
            .expect_err("parked authority must reject keyed rollback");
        assert!(matches!(
            keyed_discard_error,
            CoreBoundaryStageError::Fault { .. }
        ));

        runner.abort();
        let _ = runner.await;
        let error = prepared
            .into_stage_output(None)
            .commit()
            .expect_err("hard-interrupted parked request cannot commit later");
        assert!(matches!(error, CoreBoundaryStageError::Stale { .. }));
        assert!(state.snapshot().seen().is_empty());
    }

    #[tokio::test]
    async fn exact_boundary_run_exit_wakes_prepare_before_parking() {
        let state = SystemContextStateHandle::new(Default::default()).expect("state");
        let run_id = RunId::new();
        let run = state
            .begin_boundary_run(run_id.clone())
            .expect("open boundary");
        let prepare_state = state.clone();
        let prepare_run_id = run_id.clone();
        let prepare = tokio::spawn(async move {
            prepare_state
                .prepare_active_turn_boundary(
                    &prepare_run_id,
                    vec![exact_boundary_append("run-exit", "never parks")],
                )
                .await
        });
        wait_for_exact_boundary_request(&state).await;
        drop(run);
        let error = prepare
            .await
            .expect("prepare task")
            .expect_err("run exit must release preparer");
        assert!(matches!(
            error,
            CoreBoundaryStageError::Unavailable { .. } | CoreBoundaryStageError::Stale { .. }
        ));
    }

    fn block_assistant_text(message: &BlockAssistantMessage) -> String {
        message
            .blocks
            .iter()
            .filter_map(|block| match block {
                AssistantBlock::Text { text, .. } => Some(text.as_str()),
                _ => None,
            })
            .collect()
    }

    /// Reducer tests enter through the same proof shape as persistent
    /// ingestion: a metadata-only anchor is staged first, then a canonical
    /// blob-backed event is applied. Blob bytes are verified in
    /// PersistentSessionService tests; this helper tests only reducer ownership.
    fn append_staged_user_image(
        session: &mut Session,
        event: &RealtimeTranscriptEvent,
    ) -> RealtimeTranscriptApplyOutcome {
        let RealtimeTranscriptEvent::UserContentFinal {
            idempotency_key,
            item_id,
            previous_item_id,
            content_index,
            content,
        } = event
        else {
            panic!("test helper requires user content final")
        };
        let [ContentBlock::Image { media_type, data }] = content.as_slice() else {
            panic!("test helper requires exactly one image")
        };
        let media_type = crate::image_generation::MediaType::canonical_str(media_type);
        let blob_id = match data {
            crate::types::ImageData::Inline { data } => {
                crate::blob::content_blob_id(&media_type, data)
            }
            crate::types::ImageData::Blob { blob_id } => blob_id.clone(),
        };
        let pending = crate::PendingRealtimeUserContentBlob {
            idempotency_key: idempotency_key.clone(),
            item_id: item_id.clone(),
            previous_item_id: previous_item_id.clone(),
            content_index: *content_index,
            blob_id,
            media_type,
        };
        assert_eq!(
            session
                .stage_pending_realtime_user_content_blob(pending.clone())
                .expect("test pending anchor should stage"),
            crate::generated::session_document::RealtimeUserContentBlobStageDisposition::StageNew
        );
        session.append_realtime_transcript_event(pending.canonical_event())
    }

    #[test]
    fn transcript_digest_is_content_addressed() {
        let base_time = crate::types::message_timestamp_now();
        let stamped = vec![
            Message::User(UserMessage::text("turn one".to_string())),
            Message::BlockAssistant(BlockAssistantMessage {
                blocks: vec![AssistantBlock::Text {
                    text: "answer one".to_string(),
                    meta: None,
                }],
                stop_reason: StopReason::EndTurn,
                identity: crate::types::TranscriptMessageIdentity {
                    interaction_id: None,
                    run_id: Some(crate::lifecycle::RunId::new()),
                    objective_id: None,
                },
                created_at: base_time,
            }),
        ];
        let mut restamped = stamped.clone();
        for message in &mut restamped {
            match message {
                Message::User(user) => {
                    user.created_at = base_time + chrono::Duration::hours(2);
                }
                Message::BlockAssistant(assistant) => {
                    assistant.identity = crate::types::TranscriptMessageIdentity {
                        interaction_id: None,
                        run_id: Some(crate::lifecycle::RunId::new()),
                        objective_id: None,
                    };
                    assistant.created_at = base_time + chrono::Duration::hours(2);
                }
                _ => {}
            }
        }
        assert_eq!(
            transcript_messages_digest(&stamped).expect("digest"),
            transcript_messages_digest(&restamped).expect("digest"),
            "bookkeeping variance must not fork the transcript revision"
        );

        let mut content_changed = stamped.clone();
        if let Message::User(user) = &mut content_changed[0] {
            user.content = vec![ContentBlock::Text {
                text: "a different turn".to_string(),
            }];
        }
        assert_ne!(
            transcript_messages_digest(&stamped).expect("digest"),
            transcript_messages_digest(&content_changed).expect("digest"),
            "content changes must fork the transcript revision"
        );
    }

    #[test]
    fn public_generic_rewrite_api_rejects_typed_compaction_semantic() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("old context")));
        let error = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::typed_compaction_for_test(0, 1),
                vec![Message::User(UserMessage::compaction_summary("summary"))],
                TranscriptRewriteReason::new("anything"),
                None,
                None,
            )
            .unwrap_err();
        assert!(matches!(
            error,
            TranscriptEditError::InvalidTranscriptShape(_)
        ));
        assert_eq!(session.messages().len(), 1);
    }

    #[test]
    fn compaction_witness_authorizes_only_the_exact_validated_rebuild() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("old context one")));
        session.push(Message::User(UserMessage::text("old context two")));
        let validated = vec![Message::User(UserMessage::compaction_summary(
            "validated summary",
        ))];
        let authority = crate::agent::compact::ValidatedCompactionRewrite::for_test(
            session.messages(),
            &validated,
        )
        .unwrap();
        let error = session
            .replace_messages_for_compaction_internal(
                vec![Message::User(UserMessage::compaction_summary(
                    "substituted summary",
                ))],
                &authority,
            )
            .unwrap_err();
        assert!(matches!(
            error,
            TranscriptEditError::InvalidTranscriptShape(_)
        ));
        assert_eq!(session.messages().len(), 2);
    }

    #[test]
    fn semantic_marker_prevents_new_generic_compaction_forgery_and_heals_prior_data() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("old context one")));
        session.push(Message::User(UserMessage::text("old context two")));
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 2 },
                vec![Message::User(UserMessage::compaction_summary("summary"))],
                TranscriptRewriteReason::new("compaction"),
                None,
                None,
            )
            .unwrap();
        let session: Session =
            serde_json::from_value(serde_json::to_value(&session).unwrap()).unwrap();
        let history = session.transcript_history_state().unwrap().unwrap();
        assert_eq!(
            history.commits[0].selection.semantic(),
            TranscriptRewriteSemantic::Edit,
            "new generic rewrites retain an explicit typed edit marker after roundtrip"
        );
        assert_eq!(history.commits[0].reason.kind, "compaction");

        let mut legacy = history;
        legacy.commits[0].selection = TranscriptRewriteSelection::MessageRange { start: 0, end: 2 };
        let legacy: TranscriptHistoryState =
            serde_json::from_value(serde_json::to_value(legacy).unwrap()).unwrap();
        assert_eq!(
            legacy.commits[0].selection.semantic(),
            TranscriptRewriteSemantic::Compaction,
            "marker-absent prior data derives compaction from typed transcript evidence"
        );

        let mut ordinary = Session::new();
        ordinary.push(Message::User(UserMessage::text("ordinary old one")));
        ordinary.push(Message::User(UserMessage::text("ordinary old two")));
        ordinary
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 2 },
                vec![Message::User(UserMessage::text("ordinary replacement"))],
                TranscriptRewriteReason::new("compaction"),
                None,
                None,
            )
            .unwrap();
        let history = ordinary.transcript_history_state().unwrap().unwrap();
        assert_eq!(
            history.commits[0].selection.semantic(),
            TranscriptRewriteSemantic::Edit,
            "free-form reason must not upgrade an ordinary edit"
        );
    }

    fn legacy_rewrite_fixture() -> (TranscriptRewriteCommit, Vec<Message>, Vec<Message>) {
        let parent_messages = vec![
            Message::User(UserMessage::text("before rewrite".to_string())),
            Message::User(UserMessage::text("retained tail".to_string())),
        ];
        let revision_messages = vec![
            Message::User(UserMessage::text("after rewrite".to_string())),
            Message::User(UserMessage::text("retained tail".to_string())),
        ];
        // Compute the graph strings the way a pre-0.7.14 writer did:
        // bookkeeping-inclusive digests.
        let parent_revision =
            legacy_transcript_messages_digest(&parent_messages).expect("legacy parent digest");
        let revision =
            legacy_transcript_messages_digest(&revision_messages).expect("legacy revision digest");
        let commit = TranscriptRewriteCommit {
            parent_revision,
            revision,
            selection: TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
            original_span_digest: legacy_transcript_messages_digest(&parent_messages[0..1])
                .expect("legacy span digest"),
            replacement_digest: legacy_transcript_messages_digest(&revision_messages[0..1])
                .expect("legacy replacement digest"),
            messages_before: 2,
            messages_after: 2,
            reason: TranscriptRewriteReason::new("compaction"),
            actor: Some("legacy-test".to_string()),
            committed_at: SystemTime::now(),
        };
        (commit, parent_messages, revision_messages)
    }

    #[test]
    fn legacy_transcript_history_state_heals_to_content_addressed_on_parse() {
        let (commit, parent_messages, revision_messages) = legacy_rewrite_fixture();
        let state = TranscriptHistoryState {
            head: commit.revision.clone(),
            digest_format: 0,
            commits: vec![commit.clone()],
            revisions: vec![
                TranscriptRevisionBody {
                    revision: commit.parent_revision.clone(),
                    parent_revision: None,
                    messages: parent_messages.clone(),
                    created_at: SystemTime::now(),
                },
                TranscriptRevisionBody {
                    revision: commit.revision.clone(),
                    parent_revision: Some(commit.parent_revision),
                    messages: revision_messages.clone(),
                    created_at: SystemTime::now(),
                },
            ],
        };
        let value = serde_json::to_value(&state).expect("serialize legacy state");
        let healed: TranscriptHistoryState =
            serde_json::from_value(value).expect("parse legacy state");

        let content_parent =
            transcript_messages_digest(&parent_messages).expect("content parent digest");
        let content_revision =
            transcript_messages_digest(&revision_messages).expect("content revision digest");
        assert_eq!(healed.head, content_revision, "head must re-derive");
        assert_eq!(healed.commits[0].parent_revision, content_parent);
        assert_eq!(healed.commits[0].revision, content_revision);
        assert_eq!(healed.revisions[0].revision, content_parent);
        assert_eq!(healed.revisions[1].revision, content_revision);
        assert_eq!(
            healed.revisions[1].parent_revision.as_deref(),
            Some(content_parent.as_str())
        );
        validate_transcript_history_state(&healed).expect("healed graph must validate");

        // A session materialized from the healed graph can extend the chain
        // with a current-format rewrite.
        let mut session = Session::new();
        session
            .apply_transcript_history_state(healed)
            .expect("apply healed graph");
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text(
                    "rewritten again".to_string(),
                ))],
                TranscriptRewriteReason::new("unit-test"),
                None,
                None,
            )
            .expect("extend healed graph with a new rewrite");
        session
            .validate_transcript_history_state()
            .expect("extended graph must validate");
    }

    #[test]
    fn legacy_transcript_rewrite_record_heals_on_parse() {
        let (commit, parent_messages, revision_messages) = legacy_rewrite_fixture();
        let record_value = serde_json::json!({
            "commit": commit,
            "parent_body": TranscriptRevisionBody {
                revision: commit.parent_revision.clone(),
                parent_revision: None,
                messages: parent_messages,
                created_at: SystemTime::now(),
            },
            "revision_body": TranscriptRevisionBody {
                revision: commit.revision.clone(),
                parent_revision: Some(commit.parent_revision),
                messages: revision_messages.clone(),
                created_at: SystemTime::now(),
            },
        });
        let healed: TranscriptRewriteRecord =
            serde_json::from_value(record_value).expect("parse legacy record");
        assert_eq!(
            healed.commit.revision,
            transcript_messages_digest(&revision_messages).expect("content digest")
        );
        // The healed record passes the same validation `new` enforces.
        TranscriptRewriteRecord::new(healed.commit, healed.parent_body, healed.revision_body)
            .expect("healed record must validate");
    }

    #[test]
    fn corrupt_transcript_history_strings_stay_untouched_and_fail_validation() {
        let (commit, parent_messages, _revision_messages) = legacy_rewrite_fixture();
        let bogus = "sha256:0000000000000000000000000000000000000000000000000000000000000000";
        let state = TranscriptHistoryState {
            digest_format: 0,
            head: bogus.to_string(),
            commits: Vec::new(),
            revisions: vec![TranscriptRevisionBody {
                revision: bogus.to_string(),
                parent_revision: None,
                messages: parent_messages,
                created_at: SystemTime::now(),
            }],
        };
        let _ = commit;
        let value = serde_json::to_value(&state).expect("serialize corrupt state");
        let parsed: TranscriptHistoryState =
            serde_json::from_value(value).expect("corrupt strings still parse");
        assert_eq!(
            parsed.head, bogus,
            "unverifiable strings must not be rewritten"
        );
        assert!(
            validate_transcript_history_state(&parsed).is_err(),
            "corrupt graph must keep failing validation"
        );
    }

    /// K4 invariant: synthetic-notice refresh is ONE atomic transcript edit —
    /// after a refresh, at most the replacement notices of that kind exist
    /// (no stale notice survives beside a fresh one).
    #[test]
    fn replace_synthetic_notices_leaves_only_replacements_of_kind() {
        use crate::types::{SystemNoticeKind, SystemNoticeMessage};

        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("hello".to_string())));
        session.push(Message::SystemNotice(SystemNoticeMessage::new(
            SystemNoticeKind::McpPending,
            "stale one",
        )));
        session.push(Message::SystemNotice(SystemNoticeMessage::new(
            SystemNoticeKind::McpPending,
            "stale two",
        )));
        // A notice of another kind must be untouched.
        session.push(Message::SystemNotice(SystemNoticeMessage::new(
            SystemNoticeKind::BackgroundJob,
            "other-kind",
        )));

        session
            .replace_synthetic_notices(
                SystemNoticeKind::McpPending,
                vec![Message::SystemNotice(SystemNoticeMessage::new(
                    SystemNoticeKind::McpPending,
                    "fresh",
                ))],
            )
            .expect("notice refresh succeeds");

        let mcp_pending: Vec<&SystemNoticeMessage> = session
            .messages()
            .iter()
            .filter_map(|message| match message {
                Message::SystemNotice(notice) if notice.kind == SystemNoticeKind::McpPending => {
                    Some(notice)
                }
                _ => None,
            })
            .collect();
        assert_eq!(mcp_pending.len(), 1, "exactly one notice of the kind");
        assert_eq!(mcp_pending[0].body.as_deref(), Some("fresh"));
        assert!(
            session.messages().iter().any(|message| matches!(
                message,
                Message::SystemNotice(notice) if notice.kind == SystemNoticeKind::BackgroundJob
            )),
            "other-kind notices are untouched"
        );

        // Empty replacements = pure strip.
        session
            .replace_synthetic_notices(SystemNoticeKind::McpPending, Vec::new())
            .expect("pure strip succeeds");
        assert!(
            !session.messages().iter().any(|message| matches!(
                message,
                Message::SystemNotice(notice) if notice.kind == SystemNoticeKind::McpPending
            )),
            "empty replacement clears the kind"
        );
    }

    #[test]
    fn ordinary_appends_after_rewrite_coalesce_mechanical_revision_bodies() {
        let mut session = Session::new();
        for message in 0..133 {
            session.push(Message::User(UserMessage::text(format!(
                "seed message {message}"
            ))));
        }
        let parent = session.transcript_revision().expect("parent revision");
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange {
                    start: 132,
                    end: 133,
                },
                vec![Message::User(UserMessage::text("edited question"))],
                TranscriptRewriteReason::new("unit-test-edit"),
                Some("unit-test".to_string()),
                Some(parent),
            )
            .expect("rewrite should commit");

        for turn in 0..762 {
            session.push(Message::User(UserMessage::text(format!("turn {turn}"))));
        }

        let state = session
            .transcript_history_state()
            .expect("history state should decode")
            .expect("rewrite should create history state");
        assert_eq!(session.messages().len(), 895);
        assert_eq!(state.commits.len(), 1, "ordinary appends are not rewrites");
        assert_eq!(
            state.revisions.len(),
            3,
            "one real rewrite retains its two audited endpoints plus one live head"
        );
        let retained_message_entries = state
            .revisions
            .iter()
            .map(|body| body.messages.len())
            .sum::<usize>();
        assert!(retained_message_entries <= 3 * session.messages().len());

        let live_bytes = serde_json::to_vec(session.messages())
            .expect("live transcript should serialize")
            .len();
        let snapshot_bytes = serde_json::to_vec(&session)
            .expect("session snapshot should serialize")
            .len();
        assert!(
            snapshot_bytes <= live_bytes.saturating_mul(5).saturating_add(64 * 1024),
            "snapshot must remain linear in the live transcript: {snapshot_bytes} bytes for {live_bytes} live bytes"
        );
    }

    #[test]
    fn repeated_synthetic_notice_refreshes_do_not_mint_rewrite_commits() {
        use crate::types::{SystemNoticeKind, SystemNoticeMessage};

        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("before".to_string())));
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("after".to_string()))],
                TranscriptRewriteReason::new("unit-test-edit"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("seed rewrite");

        for refresh in 0..64 {
            session
                .replace_synthetic_notices(
                    SystemNoticeKind::McpPending,
                    vec![Message::SystemNotice(SystemNoticeMessage::new(
                        SystemNoticeKind::McpPending,
                        format!("refresh {refresh}"),
                    ))],
                )
                .expect("mechanical refresh");
        }

        let state = session
            .transcript_history_state()
            .expect("history state")
            .expect("seed rewrite history");
        assert_eq!(state.commits.len(), 1);
        assert_eq!(session.transcript_rewrite_generation().unwrap(), 1);
        assert_eq!(state.revisions.len(), 3);
    }

    #[test]
    fn legacy_append_head_chain_compacts_during_session_restore() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("seed".to_string())));
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text(
                    "rewritten seed".to_string(),
                ))],
                TranscriptRewriteReason::new("unit-test-edit"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("seed rewrite");

        let mut legacy = session
            .transcript_history_state()
            .expect("history state")
            .expect("seed history");
        let mut messages = session.messages().to_vec();
        let mut previous_head = legacy.head.clone();
        for append in 0..32 {
            messages.push(Message::User(UserMessage::text(format!(
                "legacy append {append}"
            ))));
            let revision = transcript_messages_digest(&messages).expect("revision digest");
            legacy.revisions.push(TranscriptRevisionBody {
                revision: revision.clone(),
                parent_revision: Some(previous_head),
                messages: messages.clone(),
                created_at: SystemTime::now(),
            });
            previous_head = revision;
        }
        legacy.head = previous_head;
        assert_eq!(legacy.revisions.len(), 34, "fixture matches old shape");

        let mut envelope = serde_json::to_value(&session).expect("base envelope");
        envelope["messages"] = serde_json::to_value(&messages).expect("legacy live messages");
        envelope["metadata"][SESSION_TRANSCRIPT_HISTORY_STATE_KEY] =
            serde_json::to_value(&legacy).expect("legacy unbounded history");
        for body in envelope["metadata"][SESSION_TRANSCRIPT_HISTORY_STATE_KEY]["revisions"]
            .as_array_mut()
            .expect("legacy revisions")
        {
            body.as_object_mut()
                .expect("legacy revision body")
                .remove("parent_revision");
        }
        let raw = serde_json::to_vec(&envelope).expect("raw legacy bytes");

        let restored: Session = serde_json::from_slice(&raw).expect("legacy restore");
        let compact = restored
            .transcript_history_state()
            .expect("compacted state")
            .expect("history retained");
        assert_eq!(compact.commits, legacy.commits);
        assert_eq!(compact.revisions.len(), 3);
        validate_transcript_history_state(&compact).expect("compacted history remains valid");
        let repaired = serde_json::to_vec(&restored).expect("repaired snapshot");
        assert!(
            repaired.len() * 4 < raw.len(),
            "repair should shed old bodies"
        );
    }

    #[test]
    fn snapshot_compaction_does_not_launder_corrupt_old_body() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("seed".to_string())));
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("rewritten".to_string()))],
                TranscriptRewriteReason::new("unit-test-edit"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("seed rewrite");
        let mut state = session
            .transcript_history_state()
            .expect("state")
            .expect("history");
        state.revisions.push(TranscriptRevisionBody {
            revision: "sha256:corrupt-old-body".to_string(),
            parent_revision: Some(state.head.clone()),
            messages: vec![Message::User(UserMessage::text("tampered".to_string()))],
            created_at: SystemTime::now(),
        });
        session.set_metadata_unchecked_for_test(
            SESSION_TRANSCRIPT_HISTORY_STATE_KEY,
            serde_json::to_value(state).expect("corrupt history value"),
        );

        assert!(
            serde_json::to_vec(&session).is_err(),
            "serialization must fail before pruning a corrupt old body"
        );
    }

    #[test]
    fn unchecked_valid_history_is_validated_and_compacted_at_snapshot_boundary() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("seed".to_string())));
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("rewritten".to_string()))],
                TranscriptRewriteReason::new("unit-test-edit"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("seed rewrite");
        let mut state = session
            .transcript_history_state()
            .expect("state")
            .expect("history");
        let mut messages = session.messages().to_vec();
        let mut parent = state.head.clone();
        for index in 0..8 {
            messages.push(Message::User(UserMessage::text(format!(
                "legacy append {index}"
            ))));
            let revision = transcript_messages_digest(&messages).expect("revision digest");
            state.revisions.push(TranscriptRevisionBody {
                revision: revision.clone(),
                parent_revision: Some(parent),
                messages: messages.clone(),
                created_at: SystemTime::now(),
            });
            parent = revision;
        }
        state.head = parent;
        session.messages = Arc::new(messages);
        session.set_metadata_unchecked_for_test(
            SESSION_TRANSCRIPT_HISTORY_STATE_KEY,
            serde_json::to_value(state).expect("uncompacted history"),
        );
        assert_eq!(
            session.transcript_history_metadata_validation,
            TranscriptHistoryMetadataValidation::RequiresValidation
        );

        let snapshot = serde_json::to_vec(&session)
            .expect("valid unchecked history should serialize after validation");
        let snapshot: serde_json::Value = serde_json::from_slice(&snapshot).expect("snapshot JSON");
        let compact: TranscriptHistoryState = serde_json::from_value(
            snapshot["metadata"][SESSION_TRANSCRIPT_HISTORY_STATE_KEY].clone(),
        )
        .expect("compacted history");

        assert_eq!(
            compact.revisions.len(),
            3,
            "snapshot boundary should retain two audited endpoints plus the live head"
        );
        validate_transcript_history_state(&compact).expect("compacted history remains valid");
    }

    #[test]
    fn transcript_history_rejects_stale_branch_after_digest_recurrence() {
        let mut restored = Session::new();
        restored.push(Message::User(UserMessage::text("A".to_string())));
        restored
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("B".to_string()))],
                TranscriptRewriteReason::new("to-b"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("A to B");
        let mut stale_branch = restored.clone();
        restored
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("A".to_string()))],
                TranscriptRewriteReason::new("restore-a"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("B back to A");
        stale_branch
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("C".to_string()))],
                TranscriptRewriteReason::new("stale-b-to-c"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("stale B to C is locally valid");

        let stale_state = stale_branch
            .transcript_history_state()
            .expect("stale state")
            .expect("stale history");
        let stale_commit = stale_state.commits.last().expect("stale commit").clone();
        let stale_body = stale_state
            .revisions
            .iter()
            .find(|body| body.revision == stale_commit.revision)
            .expect("stale revision body")
            .clone();
        let mut forged = restored
            .transcript_history_state()
            .expect("restored state")
            .expect("restored history");
        forged.commits.push(stale_commit);
        forged.revisions.push(stale_body);
        forged.head = forged
            .commits
            .last()
            .expect("forged commit")
            .revision
            .clone();

        assert!(
            validate_transcript_history_state(&forged).is_err(),
            "an old B<-A body edge cannot authorize stale B->C after B->A restored A"
        );
    }

    #[test]
    fn transcript_history_rejects_orphan_head_parent_cycle() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("P".to_string())));
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("Q".to_string()))],
                TranscriptRewriteReason::new("valid"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("valid seed rewrite");
        let mut state = session
            .transcript_history_state()
            .expect("state")
            .expect("history");
        let x_messages = vec![Message::User(UserMessage::text("X".to_string()))];
        let y_messages = vec![Message::User(UserMessage::text("Y".to_string()))];
        let x = transcript_messages_digest(&x_messages).expect("X digest");
        let y = transcript_messages_digest(&y_messages).expect("Y digest");
        state.revisions.push(TranscriptRevisionBody {
            revision: x.clone(),
            parent_revision: Some(y.clone()),
            messages: x_messages,
            created_at: SystemTime::now(),
        });
        state.revisions.push(TranscriptRevisionBody {
            revision: y,
            parent_revision: Some(x.clone()),
            messages: y_messages,
            created_at: SystemTime::now(),
        });
        state.head = x;
        session.set_metadata_unchecked_for_test(
            SESSION_TRANSCRIPT_HISTORY_STATE_KEY,
            serde_json::to_value(state).expect("cyclic state"),
        );

        assert!(
            serde_json::to_vec(&session).is_err(),
            "cyclic orphan head lineage must fail instead of looping"
        );
    }

    #[test]
    fn mechanical_append_can_recur_to_an_audited_digest_without_mutating_its_body() {
        let a = Message::User(UserMessage::text("A".to_string()));
        let b = Message::User(UserMessage::text("B".to_string()));
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("X".to_string())));
        let first = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![a.clone(), b.clone()],
                TranscriptRewriteReason::new("to-a-b"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("X to [A,B]");
        let h_parent = session
            .transcript_revision_body(&first.revision)
            .expect("H body")
            .expect("H retained")
            .parent_revision;
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 2 },
                vec![a],
                TranscriptRewriteReason::new("to-a"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("[A,B] to [A]");

        session.push(b);

        let state = session
            .transcript_history_state()
            .expect("state")
            .expect("history");
        assert_eq!(state.head, first.revision);
        assert_eq!(session.transcript_revision().unwrap(), first.revision);
        assert_eq!(
            state
                .revisions
                .iter()
                .find(|body| body.revision == first.revision)
                .expect("recurred H body")
                .parent_revision,
            h_parent,
            "reusing an audited digest must not rewrite its occurrence metadata"
        );
        validate_transcript_history_state(&state).expect("recurred mechanical head is valid");
    }

    /// K4 invariant (fail-closed): an invalid replacement is rejected with a
    /// typed fault BEFORE any strip happens — the transcript is unchanged, so
    /// a fault can never strand a half-refreshed notice state.
    #[test]
    fn replace_synthetic_notices_rejects_mismatched_kind_without_mutation() {
        use crate::types::{SystemNoticeKind, SystemNoticeMessage};

        let mut session = Session::new();
        session.push(Message::SystemNotice(SystemNoticeMessage::new(
            SystemNoticeKind::McpPending,
            "stale",
        )));
        let before = session.messages().to_vec();

        let err = session
            .replace_synthetic_notices(
                SystemNoticeKind::McpPending,
                vec![Message::User(UserMessage::text("not a notice".to_string()))],
            )
            .expect_err("mismatched replacement must fail typed");
        assert!(
            matches!(err, TranscriptEditError::InvalidTranscriptShape(_)),
            "expected InvalidTranscriptShape, got {err:?}"
        );
        assert_eq!(
            session.messages(),
            before.as_slice(),
            "fault must leave the transcript unchanged (no partial strip)"
        );
    }

    #[test]
    fn replace_synthetic_notices_rejects_malformed_history_atomically() {
        use crate::types::{SystemNoticeKind, SystemNoticeMessage};

        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("before".to_string())));
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("after".to_string()))],
                TranscriptRewriteReason::new("unit-test-edit"),
                Some("unit-test".to_string()),
                None,
            )
            .expect("seed rewrite");
        session.push(Message::SystemNotice(SystemNoticeMessage::new(
            SystemNoticeKind::McpPending,
            "stale",
        )));
        let mut state = session
            .transcript_history_state()
            .expect("state")
            .expect("history");
        state.revisions[0].messages[0] = Message::User(UserMessage::text("tampered".to_string()));
        session.set_metadata_unchecked_for_test(
            SESSION_TRANSCRIPT_HISTORY_STATE_KEY,
            serde_json::to_value(state).expect("corrupt state"),
        );
        let before_messages = session.messages.clone();
        let before_metadata = session.metadata.clone();
        let before_updated_at = session.updated_at;

        assert!(
            session
                .replace_synthetic_notices(SystemNoticeKind::McpPending, Vec::new())
                .is_err()
        );
        assert_eq!(session.messages, before_messages);
        assert_eq!(session.metadata, before_metadata);
        assert_eq!(session.updated_at, before_updated_at);
    }

    #[test]
    fn replace_synthetic_notices_rejects_durable_notice_kinds() {
        use crate::types::SystemNoticeKind;

        let mut session = Session::new();
        let before = session.messages().to_vec();
        assert!(
            session
                .replace_synthetic_notices(SystemNoticeKind::Comms, Vec::new())
                .is_err()
        );
        assert_eq!(session.messages(), before);
    }

    #[test]
    fn replace_synthetic_notices_preserves_persisted_mcp_pending_notice() {
        use crate::types::{SystemNoticeBlock, SystemNoticeKind, SystemNoticeMessage};

        let mut session = Session::new();
        session.push(Message::SystemNotice(SystemNoticeMessage::with_block(
            SystemNoticeKind::McpPending,
            Some("persisted pending fact".to_string()),
            SystemNoticeBlock::Mcp {
                server_id: Some("server".to_string()),
                operation: None,
                phase: None,
                persisted: true,
                detail: None,
                pending_sources: Vec::new(),
            },
        )));
        let before = session.messages().to_vec();

        session
            .replace_synthetic_notices(SystemNoticeKind::McpPending, Vec::new())
            .expect("synthetic refresh must coexist with a durable notice of the same kind");
        assert_eq!(session.messages(), before);
    }

    #[test]
    fn replace_synthetic_notices_replaces_projection_beside_persisted_mcp_fact() {
        use crate::types::{SystemNoticeBlock, SystemNoticeKind, SystemNoticeMessage};

        let durable = Message::SystemNotice(SystemNoticeMessage::with_block(
            SystemNoticeKind::McpPending,
            Some("persisted pending fact".to_string()),
            SystemNoticeBlock::Mcp {
                server_id: Some("server".to_string()),
                operation: None,
                phase: None,
                persisted: true,
                detail: None,
                pending_sources: Vec::new(),
            },
        ));
        let stale = Message::SystemNotice(SystemNoticeMessage::new(
            SystemNoticeKind::McpPending,
            "stale synthetic projection",
        ));
        let fresh = Message::SystemNotice(SystemNoticeMessage::new(
            SystemNoticeKind::McpPending,
            "fresh synthetic projection",
        ));
        let mut session = Session::new();
        session.push(durable.clone());
        session.push(stale);

        session
            .replace_synthetic_notices(SystemNoticeKind::McpPending, vec![fresh.clone()])
            .expect("synthetic refresh beside durable fact");

        assert_eq!(session.messages(), &[durable, fresh]);
    }

    #[test]
    fn transcript_rewrite_preserves_full_assistant_block_trace() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text(
            "run the trace".to_string(),
        )));
        session.push(Message::BlockAssistant(BlockAssistantMessage::new(
            vec![AssistantBlock::Text {
                text: "original assistant trace".to_string(),
                meta: None,
            }],
            StopReason::EndTurn,
        )));

        let parent_revision = session.transcript_revision().expect("parent revision");
        let replacement = vec![
            Message::BlockAssistant(BlockAssistantMessage::new(
                vec![
                    AssistantBlock::Text {
                        text: "compacted assistant trace".to_string(),
                        meta: None,
                    },
                    AssistantBlock::ToolUse {
                        id: "toolu_trace".to_string(),
                        name: "trace_probe".to_string(),
                        args: serde_json::value::RawValue::from_string(
                            r#"{"path":"N-3"}"#.to_string(),
                        )
                        .expect("valid tool args"),
                        meta: None,
                    },
                ],
                StopReason::ToolUse,
            )),
            Message::tool_results(vec![ToolResult::new(
                "toolu_trace".to_string(),
                "trace complete".to_string(),
                false,
            )]),
        ];

        let commit = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                replacement,
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent_revision.clone()),
            )
            .expect("rewrite should commit");

        assert_eq!(commit.parent_revision, parent_revision);
        let current = session
            .transcript_revision_messages(&commit.revision)
            .expect("history state should decode")
            .expect("current revision should be retained");
        let Message::BlockAssistant(assistant) = &current[1] else {
            panic!("replacement should remain a block assistant message");
        };
        assert!(assistant.blocks.iter().any(|block| matches!(
            block,
            AssistantBlock::ToolUse { name, args, .. }
                if name == "trace_probe" && args.get().contains("\"N-3\"")
        )));

        let parent = session
            .transcript_revision_messages(&parent_revision)
            .expect("history state should decode")
            .expect("parent revision should remain retained");
        assert!(matches!(
            &parent[1],
            Message::BlockAssistant(assistant)
                if block_assistant_text(assistant).contains("original assistant trace")
        ));
    }

    #[test]
    fn transcript_rewrite_rejects_trailing_block_assistant_tool_call() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("question".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "plain answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));
        let parent_revision = session.transcript_revision().expect("parent revision");

        let err = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage::new(
                    vec![AssistantBlock::ToolUse {
                        id: "toolu_1".to_string(),
                        name: "lookup".to_string(),
                        args: serde_json::value::RawValue::from_string("{}".to_string())
                            .expect("valid args"),
                        meta: None,
                    }],
                    StopReason::ToolUse,
                ))],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent_revision),
            )
            .expect_err("rewrite should reject trailing unresolved block-assistant tool call");
        assert!(matches!(
            err,
            TranscriptEditError::InvalidTranscriptShape(_)
        ));
    }

    #[test]
    fn transcript_rewrite_rejects_no_op_self_edge() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text(
            "keep this exact transcript".to_string(),
        )));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "unchanged".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));

        let parent_revision = session.transcript_revision().expect("parent revision");
        let err = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![session.messages()[1].clone()],
                TranscriptRewriteReason::new("retry"),
                Some("unit-test".to_string()),
                Some(parent_revision.clone()),
            )
            .expect_err("same-content rewrite should not emit a self-edge commit");

        assert!(matches!(
            err,
            TranscriptEditError::NoOpRewrite { revision } if revision == parent_revision
        ));
        assert!(
            session
                .transcript_history_state()
                .expect("history state should decode")
                .is_none()
        );
    }

    #[test]
    fn transcript_rewrite_run_boundary_guard_accepts_rewrite_then_append() {
        let mut original = Session::new();
        original.push(Message::User(UserMessage::text("question".to_string())));
        original.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "verbose answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));

        let parent_revision = original.transcript_revision().expect("parent revision");
        let mut incoming = original.clone();
        incoming
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "compact answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent_revision),
            )
            .expect("rewrite should commit");
        incoming.push(Message::User(UserMessage::text("follow-up".to_string())));
        incoming.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "follow-up answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));

        crate::session_store::run_boundary_snapshot_save_guard(&incoming, Some(&original))
            .expect("rewrite plus appended turn should be a valid run-boundary commit");
    }

    #[test]
    fn transcript_rewrite_rejects_orphaned_tool_results() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("use a tool".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage::new(
            vec![AssistantBlock::ToolUse {
                id: "toolu_1".to_string(),
                name: "lookup".to_string(),
                args: serde_json::value::RawValue::from_string("{}".to_string())
                    .expect("valid args"),
                meta: None,
            }],
            StopReason::ToolUse,
        )));
        session.push(Message::tool_results(vec![ToolResult::new(
            "toolu_1".to_string(),
            "done".to_string(),
            false,
        )]));
        let parent_revision = session.transcript_revision().expect("parent revision");

        let err = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "no tool after all".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent_revision),
            )
            .expect_err("rewrite should reject stranded tool results");
        assert!(matches!(
            err,
            TranscriptEditError::InvalidTranscriptShape(_)
        ));
    }

    #[test]
    fn transcript_rewrite_rejects_trailing_assistant_tool_call() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("question".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "plain answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));
        let parent_revision = session.transcript_revision().expect("parent revision");

        let err = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::ToolUse {
                        id: "toolu_1".to_string(),
                        name: "lookup".to_string(),
                        args: serde_json::value::RawValue::from_string("{}".to_string())
                            .expect("valid args"),
                        meta: None,
                    }],
                    stop_reason: StopReason::ToolUse,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent_revision),
            )
            .expect_err("rewrite should reject trailing unresolved tool call");
        assert!(matches!(
            err,
            TranscriptEditError::InvalidTranscriptShape(_)
        ));
    }

    #[test]
    fn transcript_rewrite_rejects_duplicate_tool_results() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("use a tool".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "plain answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));
        let parent_revision = session.transcript_revision().expect("parent revision");

        let err = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![
                    Message::BlockAssistant(BlockAssistantMessage::new(
                        vec![AssistantBlock::ToolUse {
                            id: "toolu_1".to_string(),
                            name: "lookup".to_string(),
                            args: serde_json::value::RawValue::from_string("{}".to_string())
                                .expect("valid args"),
                            meta: None,
                        }],
                        StopReason::ToolUse,
                    )),
                    Message::tool_results(vec![
                        ToolResult::new("toolu_1".to_string(), "one".to_string(), false),
                        ToolResult::new("toolu_1".to_string(), "two".to_string(), false),
                    ]),
                ],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent_revision),
            )
            .expect_err("rewrite should reject duplicate tool results");
        assert!(matches!(
            err,
            TranscriptEditError::InvalidTranscriptShape(_)
        ));
    }

    #[test]
    fn transcript_rewrite_record_rejects_prefix_or_suffix_tampering() {
        let mut session = Session::new();
        session.push(Message::System(SystemMessage::new("keep prefix")));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "verbose answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));
        session.push(Message::User(UserMessage::text("keep suffix".to_string())));

        let parent_revision = session.transcript_revision().expect("parent revision");
        let commit = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "compact answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent_revision),
            )
            .expect("rewrite should commit");
        let state = session
            .transcript_history_state()
            .expect("history state should decode")
            .expect("history state should exist");
        let parent_body = state
            .revisions
            .iter()
            .find(|body| body.revision == commit.parent_revision)
            .expect("parent body retained")
            .clone();
        let revision_body = state
            .revisions
            .iter()
            .find(|body| body.revision == commit.revision)
            .expect("revision body retained")
            .clone();

        let mut forged_body = revision_body;
        forged_body.messages[0] = Message::System(SystemMessage::new("tampered prefix"));
        forged_body.revision =
            transcript_messages_digest(&forged_body.messages).expect("forged digest");
        let mut forged_commit = commit;
        forged_commit.revision = forged_body.revision.clone();
        let err = TranscriptRewriteRecord::new(forged_commit, parent_body, forged_body)
            .expect_err("record validation must reject changes outside selected span");
        assert!(
            err.to_string().contains("before the selected span"),
            "unexpected error: {err}"
        );
    }

    #[test]
    fn transcript_rewrite_replay_allows_normal_turn_revisions_between_rewrites() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("first".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "verbose first answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));

        let first_parent = session.transcript_revision().expect("first parent");
        let first_commit = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "compact first answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(first_parent),
            )
            .expect("first rewrite");

        session.push(Message::User(UserMessage::text("normal turn".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "verbose second answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));
        let bridge_parent = session
            .transcript_revision()
            .expect("normal turn should advance transcript head");
        assert_ne!(bridge_parent, first_commit.revision);
        validate_transcript_history_state(
            &session
                .transcript_history_state()
                .expect("history state should decode")
                .expect("history state should exist"),
        )
        .expect("normal turn head may legitimately differ from last rewrite commit");

        let second_commit = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 3, end: 4 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "compact second answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(bridge_parent.clone()),
            )
            .expect("second rewrite");

        let state = session
            .transcript_history_state()
            .expect("history state should decode")
            .expect("history state should exist");
        let records = state.commits.iter().map(|commit| {
            let parent_body = state
                .revisions
                .iter()
                .find(|body| body.revision == commit.parent_revision)
                .expect("parent body retained")
                .clone();
            let revision_body = state
                .revisions
                .iter()
                .find(|body| body.revision == commit.revision)
                .expect("revision body retained")
                .clone();
            TranscriptRewriteRecord::new(commit.clone(), parent_body, revision_body)
                .expect("record should validate")
        });

        let replayed = TranscriptHistoryState::from_rewrite_records(records)
            .expect("rewrite replay should accept normal-turn bridge revisions")
            .expect("rewrite records should exist");
        assert_eq!(replayed.head, second_commit.revision);
        assert!(
            replayed
                .revisions
                .iter()
                .any(|body| body.revision == bridge_parent)
        );
    }

    #[test]
    fn transcript_rewrite_replay_rejects_branched_rewrite_records() {
        let mut base = Session::new();
        base.push(Message::User(UserMessage::text("question".to_string())));
        base.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "verbose answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));
        let parent = base.transcript_revision().expect("parent revision");

        let mut first = base.clone();
        let first_commit = first
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "first compact answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent.clone()),
            )
            .expect("first rewrite");
        let first_state = first
            .transcript_history_state()
            .expect("first state decodes")
            .expect("first state exists");

        let mut second = base;
        let second_commit = second
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "second compact answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent),
            )
            .expect("second rewrite");
        let second_state = second
            .transcript_history_state()
            .expect("second state decodes")
            .expect("second state exists");

        let record = |state: &TranscriptHistoryState, commit: &TranscriptRewriteCommit| {
            let parent_body = state
                .revisions
                .iter()
                .find(|body| body.revision == commit.parent_revision)
                .expect("parent body retained")
                .clone();
            let revision_body = state
                .revisions
                .iter()
                .find(|body| body.revision == commit.revision)
                .expect("revision body retained")
                .clone();
            TranscriptRewriteRecord::new(commit.clone(), parent_body, revision_body)
                .expect("record should validate")
        };

        let err = TranscriptHistoryState::from_rewrite_records(vec![
            record(&first_state, &first_commit),
            record(&second_state, &second_commit),
        ])
        .expect_err("branched rewrite records must not replay as a linear source history");
        assert!(
            err.to_string().contains("does not extend transcript head"),
            "unexpected error: {err}"
        );
    }

    #[test]
    fn internal_message_rewrites_refresh_transcript_history_head() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("question".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "verbose answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));

        let parent = session.transcript_revision().expect("parent revision");
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "compact answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent),
            )
            .expect("rewrite should commit");

        session.push(Message::User(UserMessage::text(
            "notice-bearing turn".to_string(),
        )));
        let retained = session
            .messages()
            .iter()
            .filter(|message| {
                !matches!(
                    message,
                    Message::User(user)
                        if user.content.iter().any(|block| matches!(
                            block,
                            ContentBlock::Text { text } if text.contains("notice-bearing")
                        ))
                )
            })
            .cloned()
            .collect();
        session
            .replace_messages_internal(
                retained,
                TranscriptRewriteReason::new("synthetic_notice_cleanup"),
            )
            .expect("retain should commit internal rewrite");
        let retained_digest =
            transcript_messages_digest(session.messages()).expect("retained digest");
        assert_eq!(
            session.transcript_revision().expect("retained head"),
            retained_digest
        );

        session
            .replace_messages_internal(
                vec![
                    Message::User(UserMessage::text("compacted question".to_string())),
                    Message::BlockAssistant(BlockAssistantMessage {
                        blocks: vec![AssistantBlock::Text {
                            text: "compacted answer".to_string(),
                            meta: None,
                        }],
                        stop_reason: StopReason::EndTurn,
                        identity: crate::types::TranscriptMessageIdentity::default(),
                        created_at: crate::types::message_timestamp_now(),
                    }),
                ],
                TranscriptRewriteReason::new("compaction"),
            )
            .expect("replace should commit internal rewrite");
        let replaced_digest =
            transcript_messages_digest(session.messages()).expect("replaced digest");
        assert_eq!(
            session.transcript_revision().expect("replaced head"),
            replaced_digest
        );
        let state = session
            .transcript_history_state()
            .expect("history state should decode")
            .expect("history state should exist");
        assert!(
            state
                .revisions
                .iter()
                .any(|body| body.revision == replaced_digest)
        );
        validate_transcript_history_state(&state).expect("history state remains valid");
    }

    #[test]
    fn set_system_prompt_refreshes_transcript_history_head_after_rewrite() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("question".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "verbose answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));

        let parent = session.transcript_revision().expect("parent revision");
        let rewrite = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "compact answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent),
            )
            .expect("rewrite should commit");

        session.set_system_prompt("durable system prompt".to_string());

        let head = session
            .transcript_revision()
            .expect("system prompt should refresh transcript head");
        assert_ne!(head, rewrite.revision);
        assert_eq!(
            head,
            transcript_messages_digest(session.messages()).expect("current digest")
        );
        let head_messages = session
            .transcript_revision_messages(&head)
            .expect("history state should decode")
            .expect("refreshed head body should be retained");
        assert_eq!(
            serde_json::to_value(&head_messages).expect("head serializes"),
            serde_json::to_value(session.messages()).expect("session serializes")
        );
        validate_transcript_history_state(
            &session
                .transcript_history_state()
                .expect("history state should decode")
                .expect("history state should exist"),
        )
        .expect("history state remains valid after system prompt update");
    }

    #[test]
    fn apply_transcript_history_state_uses_latest_commit_time_for_restored_head() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("question".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "verbose answer".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));
        let original_messages = session.messages().to_vec();
        let parent = session.transcript_revision().expect("parent revision");
        let compact = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage {
                    blocks: vec![AssistantBlock::Text {
                        text: "compact answer".to_string(),
                        meta: None,
                    }],
                    stop_reason: StopReason::EndTurn,
                    identity: crate::types::TranscriptMessageIdentity::default(),
                    created_at: crate::types::message_timestamp_now(),
                })],
                TranscriptRewriteReason::new("compaction"),
                Some("unit-test".to_string()),
                Some(parent.clone()),
            )
            .expect("rewrite should commit");

        std::thread::sleep(std::time::Duration::from_millis(2));
        let restore = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange {
                    start: 0,
                    end: session.messages().len(),
                },
                original_messages.clone(),
                TranscriptRewriteReason::new("restore"),
                Some("unit-test".to_string()),
                Some(compact.revision),
            )
            .expect("restore should commit");
        assert_eq!(restore.revision, parent);

        let state = session
            .transcript_history_state()
            .expect("history state should decode")
            .expect("history state should exist");
        let restored_body_created_at = state
            .revisions
            .iter()
            .find(|body| body.revision == restore.revision)
            .expect("restored body should be retained")
            .created_at;
        assert!(
            restored_body_created_at < restore.committed_at,
            "test requires restore commit to be newer than retained body"
        );

        let mut replayed = Session::new();
        replayed
            .apply_transcript_history_state(state)
            .expect("replay should materialize restored head");
        assert_eq!(
            serde_json::to_value(replayed.messages()).expect("replayed serializes"),
            serde_json::to_value(&original_messages).expect("original serializes")
        );
        assert_eq!(replayed.updated_at(), restore.committed_at);
    }

    #[test]
    fn test_session_new() {
        let session = Session::new();
        assert_eq!(session.version(), SESSION_VERSION);
        assert!(session.messages().is_empty());
        assert!(session.created_at() <= session.updated_at());
    }

    #[test]
    fn llm_identity_model_override_switches_to_catalog_provider() {
        let registry = crate::ModelRegistry::from_config(
            &crate::Config::default(),
            *crate::model_profile::test_catalog::TEST_CATALOG,
        )
        .unwrap();
        let current = SessionLlmIdentity {
            model: "test-anthropic-default".to_string(),
            provider: Provider::Anthropic,
            self_hosted_server_id: None,
            provider_params: None,
            auth_binding: Some(crate::AuthBindingRef {
                realm: crate::RealmId::parse("tenant_a").unwrap(),
                binding: crate::BindingId::parse("anthropic_default").unwrap(),
                profile: None,
                origin: crate::BindingOrigin::Configured,
            }),
        };

        let resolved = resolve_session_llm_identity_override(
            &current,
            &registry,
            SessionLlmIdentityOverride {
                model: Some("test-openai-default"),
                provider: None,
                self_hosted_server_id: None,
                provider_params: None,
                auth_binding: None,
            },
        )
        .unwrap();

        assert_eq!(resolved.model, "test-openai-default");
        assert_eq!(resolved.provider, Provider::OpenAI);
        assert!(
            resolved.auth_binding.is_none(),
            "provider switches must not inherit a binding from the previous provider"
        );
    }

    #[test]
    fn llm_identity_model_override_keeps_uncatalogued_model_on_current_provider() {
        let registry = crate::ModelRegistry::from_config(
            &crate::Config::default(),
            *crate::model_profile::test_catalog::TEST_CATALOG,
        )
        .unwrap();
        let current = SessionLlmIdentity {
            model: "custom-model".to_string(),
            provider: Provider::Anthropic,
            self_hosted_server_id: None,
            provider_params: None,
            auth_binding: None,
        };

        let resolved = resolve_session_llm_identity_override(
            &current,
            &registry,
            SessionLlmIdentityOverride {
                model: Some("uncatalogued-custom-model"),
                provider: None,
                self_hosted_server_id: None,
                provider_params: None,
                auth_binding: None,
            },
        )
        .unwrap();

        assert_eq!(resolved.model, "uncatalogued-custom-model");
        assert_eq!(resolved.provider, Provider::Anthropic);
    }

    fn self_hosted_registry_with_shared_remote_model() -> crate::ModelRegistry {
        use crate::config::{
            SelfHostedApiStyle, SelfHostedModelConfig, SelfHostedServerConfig, SelfHostedTransport,
        };
        use crate::model_profile::catalog::ModelTier;

        let mut config = crate::Config::default();
        for server_id in ["local-a", "local-b"] {
            config.self_hosted.servers.insert(
                server_id.to_string(),
                SelfHostedServerConfig {
                    transport: SelfHostedTransport::OpenAiCompatible,
                    base_url: format!("http://{server_id}.test"),
                    api_style: SelfHostedApiStyle::Responses,
                },
            );
            config.self_hosted.models.insert(
                format!("shared-local-{server_id}"),
                SelfHostedModelConfig {
                    server: server_id.to_string(),
                    remote_model: "shared-local-model".to_string(),
                    display_name: "Shared local model".to_string(),
                    family: "shared-local".to_string(),
                    tier: ModelTier::Supported,
                    ..Default::default()
                },
            );
        }
        config.self_hosted.default_model = Some("shared-local-local-a".to_string());
        crate::ModelRegistry::from_config(
            &config,
            *crate::model_profile::test_catalog::TEST_CATALOG,
        )
        .expect("shared local registry")
    }

    #[test]
    fn llm_identity_override_preserves_exact_self_hosted_server_route() {
        let registry = self_hosted_registry_with_shared_remote_model();
        let current = SessionLlmIdentity {
            model: "shared-local-local-a".to_string(),
            provider: Provider::SelfHosted,
            self_hosted_server_id: Some("local-a".to_string()),
            provider_params: None,
            auth_binding: None,
        };

        let resolved = resolve_session_llm_identity_override(
            &current,
            &registry,
            SessionLlmIdentityOverride {
                model: Some("shared-local-local-b"),
                provider: Some(Provider::SelfHosted),
                self_hosted_server_id: Some("local-b"),
                provider_params: None,
                auth_binding: None,
            },
        )
        .expect("exact configured local route should resolve");

        assert_eq!(resolved.model, "shared-local-local-b");
        assert_eq!(resolved.provider, Provider::SelfHosted);
        assert_eq!(resolved.self_hosted_server_id.as_deref(), Some("local-b"));
    }

    #[test]
    fn llm_identity_override_rejects_self_hosted_server_model_mismatch() {
        let registry = self_hosted_registry_with_shared_remote_model();
        let current = SessionLlmIdentity {
            model: "shared-local-local-a".to_string(),
            provider: Provider::SelfHosted,
            self_hosted_server_id: Some("local-a".to_string()),
            provider_params: None,
            auth_binding: None,
        };

        let error = resolve_session_llm_identity_override(
            &current,
            &registry,
            SessionLlmIdentityOverride {
                model: Some("shared-local-local-b"),
                provider: Some(Provider::SelfHosted),
                self_hosted_server_id: Some("local-a"),
                provider_params: None,
                auth_binding: None,
            },
        )
        .expect_err("server id must match the requested model alias route");

        assert!(matches!(
            error,
            SessionLlmIdentityOverrideError::SelfHostedServerMismatch {
                requested,
                configured,
                ..
            } if requested == "local-a" && configured == "local-b"
        ));
    }

    #[test]
    fn realtime_transcript_append_is_idempotent_by_provider_item_and_delta_id() {
        let mut session = Session::new();

        let user = RealtimeTranscriptEvent::UserTranscriptFinal {
            item_id: "item_user".to_string(),
            previous_item_id: None,
            content_index: 0,
            text: "hello".to_string(),
        };
        assert!(
            !session
                .append_realtime_transcript_event(user.clone())
                .is_inert()
        );
        assert!(session.append_realtime_transcript_event(user).is_inert());

        let delta = RealtimeTranscriptEvent::AssistantTextDelta {
            response_id: "resp_assistant".to_string(),
            delta_id: "evt_delta_1".to_string(),
            item_id: "item_assistant".to_string(),
            previous_item_id: Some("item_user".to_string()),
            content_index: 0,
            delta: "hi".to_string(),
        };
        assert!(
            session
                .append_realtime_transcript_event(delta.clone())
                .is_inert()
        );
        assert!(session.append_realtime_transcript_event(delta).is_inert());

        let terminal = RealtimeTranscriptEvent::AssistantTurnCompleted {
            response_id: "resp_assistant".to_string(),
            stop_reason: StopReason::EndTurn,
            usage: Usage::default(),
        };
        assert!(
            !session
                .append_realtime_transcript_event(terminal.clone())
                .is_inert()
        );
        assert!(
            session
                .append_realtime_transcript_event(terminal)
                .is_inert()
        );

        assert_eq!(session.messages().len(), 2);
        assert!(matches!(
            &session.messages()[0],
            Message::User(user) if user.text_content() == "hello"
        ));
        assert!(matches!(
            &session.messages()[1],
            Message::BlockAssistant(assistant) if block_assistant_text(assistant) == "hi"
        ));
    }

    #[test]
    fn realtime_user_image_materializes_once_and_unblocks_causal_assistant() {
        let mut session = Session::new();
        let image_data = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAB".to_string();
        let image = RealtimeTranscriptEvent::UserContentFinal {
            idempotency_key: "image-request-1".to_string(),
            item_id: "item_image".to_string(),
            previous_item_id: None,
            content_index: 0,
            content: vec![ContentBlock::Image {
                media_type: "image/png".to_string(),
                data: crate::types::ImageData::Inline {
                    data: image_data.clone(),
                },
            }],
        };

        assert!(
            !append_staged_user_image(&mut session, &image).is_inert(),
            "first image final must materialize canonical user content"
        );
        let replay = session
            .preflight_realtime_user_content_event(&image)
            .expect("exact retry should preflight as committed");
        assert!(matches!(
            replay,
            crate::RealtimeUserContentApplyOutcome::AlreadyCommitted(_)
        ));

        let staged_state = session
            .metadata
            .get(SESSION_REALTIME_TRANSCRIPT_STATE_KEY)
            .expect("realtime state must be persisted");
        assert!(
            !staged_state.to_string().contains(&image_data),
            "materialized image bytes must not remain duplicated in transcript metadata"
        );

        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                    response_id: "resp_image".to_string(),
                    delta_id: "delta_image".to_string(),
                    item_id: "item_assistant".to_string(),
                    previous_item_id: Some("item_image".to_string()),
                    content_index: 0,
                    delta: "I see red.".to_string(),
                })
                .is_inert()
        );
        assert!(
            !session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTurnCompleted {
                    response_id: "resp_image".to_string(),
                    stop_reason: StopReason::EndTurn,
                    usage: Usage::default(),
                },)
                .is_inert(),
            "materialized image predecessor must unblock the assistant response"
        );

        assert_eq!(session.messages().len(), 2);
        assert!(matches!(
            &session.messages()[0],
            Message::User(user)
                if matches!(
                    user.content.as_slice(),
                    [ContentBlock::Image {
                        media_type,
                        data: crate::types::ImageData::Blob { blob_id },
                    }] if media_type == "image/png"
                        && blob_id == &crate::blob::content_blob_id("image/png", &image_data)
                )
        ));
        assert!(matches!(
            &session.messages()[1],
            Message::BlockAssistant(assistant) if block_assistant_text(assistant) == "I see red."
        ));
    }

    #[test]
    fn realtime_user_image_identity_is_durable_canonical_and_conflict_safe() {
        let mut session = Session::new();
        let data = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAB".to_string();
        let initial = RealtimeTranscriptEvent::UserContentFinal {
            idempotency_key: "stable-image-key".to_string(),
            item_id: "canonical-image-item".to_string(),
            previous_item_id: None,
            content_index: 0,
            content: vec![ContentBlock::Image {
                media_type: " image/PNG; charset=binary ".to_string(),
                data: crate::types::ImageData::Inline { data: data.clone() },
            }],
        };
        let committed = append_staged_user_image(&mut session, &initial);
        let Some(crate::RealtimeUserContentApplyOutcome::Committed(identity)) =
            committed.user_content
        else {
            panic!("first image must commit its durable identity");
        };
        assert_eq!(identity.item_id, "canonical-image-item");
        assert_eq!(identity.media_type, "image/png");

        let encoded = serde_json::to_string(&session).expect("session should serialize");
        let restored: Session =
            serde_json::from_str(&encoded).expect("committed identity should restore");

        let replay_event = RealtimeTranscriptEvent::UserContentFinal {
            idempotency_key: "stable-image-key".to_string(),
            item_id: "ignored-retry-item".to_string(),
            previous_item_id: None,
            content_index: 0,
            content: vec![ContentBlock::Image {
                media_type: "image/png".to_string(),
                data: crate::types::ImageData::Inline { data: data.clone() },
            }],
        };
        let replay = restored
            .preflight_realtime_user_content_event(&replay_event)
            .expect("exact retry should preflight");
        assert!(matches!(
            replay,
            crate::RealtimeUserContentApplyOutcome::AlreadyCommitted(
                crate::RealtimeUserContentIdentity { ref item_id, .. }
            ) if item_id == "canonical-image-item"
        ));

        let conflict = restored
            .preflight_realtime_user_content_event(&RealtimeTranscriptEvent::UserContentFinal {
                idempotency_key: "stable-image-key".to_string(),
                item_id: "conflicting-item".to_string(),
                previous_item_id: None,
                content_index: 0,
                content: vec![ContentBlock::Image {
                    media_type: "image/png".to_string(),
                    data: crate::types::ImageData::Inline {
                        data: "different-payload".to_string(),
                    },
                }],
            })
            .expect("conflicting retry should preflight");
        assert!(matches!(
            conflict,
            crate::RealtimeUserContentApplyOutcome::RejectedConflict { .. }
        ));

        let item_collision = restored
            .preflight_realtime_user_content_event(&RealtimeTranscriptEvent::UserContentFinal {
                idempotency_key: "another-key".to_string(),
                item_id: "canonical-image-item".to_string(),
                previous_item_id: None,
                content_index: 0,
                content: vec![ContentBlock::Image {
                    media_type: "image/png".to_string(),
                    data: crate::types::ImageData::Inline { data },
                }],
            })
            .expect("item collision should preflight");
        assert!(matches!(
            item_collision,
            crate::RealtimeUserContentApplyOutcome::RejectedConflict { .. }
        ));
        assert_eq!(restored.messages().len(), 1);
        serde_json::to_string(&restored).expect("rejections must not corrupt durable state");
    }

    #[test]
    fn realtime_user_image_reducer_never_receipts_without_pending_blob_proof() {
        for data in [
            crate::types::ImageData::Inline {
                data: "iVBORw0KGgo=".to_string(),
            },
            crate::types::ImageData::Blob {
                blob_id: crate::blob::content_blob_id("image/png", "iVBORw0KGgo="),
            },
        ] {
            let mut session = Session::new();
            let outcome = session.append_realtime_transcript_event(
                RealtimeTranscriptEvent::UserContentFinal {
                    idempotency_key: "unstaged-image-key".to_string(),
                    item_id: "unstaged-image-item".to_string(),
                    previous_item_id: None,
                    content_index: 0,
                    content: vec![ContentBlock::Image {
                        media_type: "image/png".to_string(),
                        data,
                    }],
                },
            );
            assert!(matches!(
                outcome.user_content,
                Some(crate::RealtimeUserContentApplyOutcome::RejectedInvalidIdentity { .. })
            ));
            assert!(session.messages().is_empty());
            assert!(session.realtime_user_content_identities().is_empty());
        }
    }

    #[test]
    fn realtime_user_image_pending_slot_is_generated_bounded_and_recovery_typed() {
        use crate::generated::session_document::{
            RealtimeUserContentBlobRecoveryDisposition, RealtimeUserContentBlobStageDisposition,
        };
        let mut session = Session::new();
        let pending = crate::PendingRealtimeUserContentBlob {
            idempotency_key: "pending-key-a".to_string(),
            item_id: "pending-item-a".to_string(),
            previous_item_id: None,
            content_index: 0,
            blob_id: crate::blob::content_blob_id("image/png", "iVBORw0KGgo="),
            media_type: "image/png".to_string(),
        };
        let different = crate::PendingRealtimeUserContentBlob {
            idempotency_key: "pending-key-b".to_string(),
            item_id: "pending-item-b".to_string(),
            previous_item_id: None,
            content_index: 0,
            blob_id: crate::blob::content_blob_id("image/png", "iVBORw0KGgoB"),
            media_type: "image/png".to_string(),
        };
        assert_eq!(
            session
                .stage_pending_realtime_user_content_blob(pending.clone())
                .expect("empty slot stages"),
            RealtimeUserContentBlobStageDisposition::StageNew
        );
        assert_eq!(
            session
                .stage_pending_realtime_user_content_blob(pending.clone())
                .expect("exact stage retry is idempotent"),
            RealtimeUserContentBlobStageDisposition::ReuseExact
        );
        assert_eq!(
            session
                .stage_pending_realtime_user_content_blob(different.clone())
                .expect("occupied decision is typed"),
            RealtimeUserContentBlobStageDisposition::RejectOccupied
        );
        assert_eq!(
            session.pending_realtime_user_content_blob(),
            Some(pending.clone())
        );
        assert_eq!(
            session
                .resolve_pending_realtime_user_content_blob_recovery(Some(&pending), false)
                .expect("exact recovery decision"),
            RealtimeUserContentBlobRecoveryDisposition::RetryExact
        );
        assert_eq!(
            session
                .resolve_pending_realtime_user_content_blob_recovery(Some(&different), true)
                .expect("verified older recovery decision"),
            RealtimeUserContentBlobRecoveryDisposition::CommitVerifiedBeforeCurrent
        );
        assert_eq!(
            session
                .resolve_pending_realtime_user_content_blob_recovery(Some(&different), false)
                .expect("invalid older recovery decision"),
            RealtimeUserContentBlobRecoveryDisposition::ClearInvalidBeforeCurrent
        );
        session
            .clear_invalid_pending_realtime_user_content_blob(Some(&different))
            .expect("generated clear-invalid disposition authorizes clear");
        assert!(session.pending_realtime_user_content_blob().is_none());
    }

    #[test]
    fn transcript_rewrite_tombstones_removed_image_key_and_accepts_new_key() {
        let mut session = Session::new();
        let data = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAB".to_string();
        let original = RealtimeTranscriptEvent::UserContentFinal {
            idempotency_key: "removed-image-key".to_string(),
            item_id: "removed-image-item".to_string(),
            previous_item_id: None,
            content_index: 0,
            content: vec![ContentBlock::Image {
                media_type: "image/png".to_string(),
                data: crate::types::ImageData::Inline { data: data.clone() },
            }],
        };
        assert!(matches!(
            append_staged_user_image(&mut session, &original).user_content,
            Some(crate::RealtimeUserContentApplyOutcome::Committed(_))
        ));

        let parent = session.transcript_revision().expect("parent revision");
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("image removed"))],
                TranscriptRewriteReason::new("remove-image"),
                None,
                Some(parent),
            )
            .expect("rewrite should tombstone removed image identity");

        assert!(session.realtime_user_content_identities().is_empty());
        assert_eq!(
            session.realtime_user_content_tombstones(),
            vec![crate::RealtimeUserContentTombstone {
                idempotency_key: "removed-image-key".to_string(),
            }]
        );
        assert!(matches!(
            session.preflight_realtime_user_content_event(&original),
            Some(crate::RealtimeUserContentApplyOutcome::RejectedConflict { .. })
        ));
        assert!(matches!(
            session
                .append_realtime_transcript_event(original)
                .user_content,
            Some(crate::RealtimeUserContentApplyOutcome::RejectedConflict { .. })
        ));
        assert_eq!(
            session.messages().len(),
            1,
            "stale retry emits no receipt content"
        );

        let new_image = RealtimeTranscriptEvent::UserContentFinal {
            idempotency_key: "new-image-key".to_string(),
            item_id: "new-image-item".to_string(),
            previous_item_id: None,
            content_index: 0,
            content: vec![ContentBlock::Image {
                media_type: "image/png".to_string(),
                data: crate::types::ImageData::Inline { data },
            }],
        };
        assert!(matches!(
            append_staged_user_image(&mut session, &new_image).user_content,
            Some(crate::RealtimeUserContentApplyOutcome::Committed(_))
        ));
        assert_eq!(session.messages().len(), 2);

        let restored: Session = serde_json::from_str(
            &serde_json::to_string(&session).expect("serialize rewritten session"),
        )
        .expect("cold restore rewritten session");
        assert_eq!(restored.realtime_user_content_identities().len(), 1);
        assert_eq!(restored.realtime_user_content_tombstones().len(), 1);
    }

    #[test]
    fn transcript_rewrite_retains_only_canonical_image_occurrence_for_exact_replay() {
        let mut session = Session::new();
        let data = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAB".to_string();
        let original = RealtimeTranscriptEvent::UserContentFinal {
            idempotency_key: "retained-image-key".to_string(),
            item_id: "retained-image-item".to_string(),
            previous_item_id: None,
            content_index: 0,
            content: vec![ContentBlock::Image {
                media_type: "image/png".to_string(),
                data: crate::types::ImageData::Inline { data },
            }],
        };
        assert!(matches!(
            append_staged_user_image(&mut session, &original).user_content,
            Some(crate::RealtimeUserContentApplyOutcome::Committed(_))
        ));
        let retained_message = session.messages()[0].clone();
        let parent = session.transcript_revision().expect("parent revision");
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![
                    retained_message,
                    Message::User(UserMessage::text("new canonical neighbor")),
                ],
                TranscriptRewriteReason::new("retain-image"),
                None,
                Some(parent),
            )
            .expect("rewrite retaining exact inline image should reconcile");

        assert!(session.realtime_user_content_tombstones().is_empty());
        let replay = session
            .preflight_realtime_user_content_event(&original)
            .expect("retained image should preflight as exact replay");
        assert!(matches!(
            replay,
            crate::RealtimeUserContentApplyOutcome::AlreadyCommitted(_)
        ));
        assert_eq!(session.messages().len(), 2);
    }

    #[test]
    fn transcript_rewrite_rejects_atomically_while_image_blob_anchor_is_pending() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("before rewrite")));
        let pending = crate::PendingRealtimeUserContentBlob {
            idempotency_key: "pending-rewrite-key".to_string(),
            item_id: "pending-rewrite-item".to_string(),
            previous_item_id: None,
            content_index: 0,
            blob_id: crate::blob::content_blob_id("image/png", "pending-bytes"),
            media_type: "image/png".to_string(),
        };
        session
            .stage_pending_realtime_user_content_blob(pending.clone())
            .expect("stage durable pending anchor");
        let parent = session.transcript_revision().expect("parent revision");
        let error = session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text("after rewrite"))],
                TranscriptRewriteReason::new("blocked-pending-image"),
                None,
                Some(parent),
            )
            .expect_err("rewrite must not cross an unresolved image anchor");
        assert!(
            error
                .to_string()
                .contains("history_rewrite_pending_user_content_blob")
        );
        assert!(matches!(
            &session.messages()[0],
            Message::User(user) if user.text_content() == "before rewrite"
        ));
        assert_eq!(session.pending_realtime_user_content_blob(), Some(pending));
    }

    #[test]
    fn realtime_user_image_rejects_noncanonical_blob_and_multiblock_shape() {
        let mut session = Session::new();
        for (key, content) in [
            (
                "invalid-blob",
                vec![ContentBlock::Image {
                    media_type: "image/png".to_string(),
                    data: crate::types::ImageData::Blob {
                        blob_id: crate::BlobId::new("sha256:not-a-digest"),
                    },
                }],
            ),
            (
                "multi-block",
                vec![
                    ContentBlock::Image {
                        media_type: "image/png".to_string(),
                        data: crate::types::ImageData::Inline {
                            data: "payload".to_string(),
                        },
                    },
                    ContentBlock::Text {
                        text: "smuggled".to_string(),
                    },
                ],
            ),
        ] {
            let outcome = session.append_realtime_transcript_event(
                RealtimeTranscriptEvent::UserContentFinal {
                    idempotency_key: key.to_string(),
                    item_id: format!("item-{key}"),
                    previous_item_id: None,
                    content_index: 0,
                    content,
                },
            );
            assert!(matches!(
                outcome.user_content,
                Some(crate::RealtimeUserContentApplyOutcome::RejectedInvalidIdentity { .. })
            ));
        }
        assert!(session.messages().is_empty());
        let encoded = serde_json::to_string(&session).expect("session should serialize");
        serde_json::from_str::<Session>(&encoded).expect("rejections must leave restorable state");
    }

    #[test]
    fn realtime_restore_rejects_malformed_causal_graphs_and_accepts_waiting_dag() {
        fn restore(
            items: serde_json::Value,
            first_seen_order: Vec<&str>,
        ) -> Result<
            crate::realtime_transcript_revision::SessionRealtimeTranscriptState,
            crate::realtime_transcript_revision::RealtimeTranscriptShellError,
        > {
            let state = serde_json::from_value(serde_json::json!({
                "items": items,
                "first_seen_order": first_seen_order,
            }))
            .expect("test state shape should deserialize");
            crate::realtime_transcript_revision::restore_realtime_transcript_state(state)
        }

        assert!(
            restore(
                serde_json::json!({
                    "child": { "role": "user", "previous_item_id": "missing" }
                }),
                vec!["child"],
            )
            .is_ok(),
            "an unmaterialized out-of-order item must survive cold restore until its predecessor arrives"
        );
        assert!(
            restore(
                serde_json::json!({
                    "child": {
                        "role": "user",
                        "previous_item_id": "missing",
                        "ready": true,
                        "materialized": true
                    }
                }),
                vec!["child"],
            )
            .is_err(),
            "a materialized item cannot reference a missing predecessor"
        );
        assert!(
            restore(
                serde_json::json!({
                    "self": { "role": "user", "previous_item_id": "self" }
                }),
                vec!["self"],
            )
            .is_err(),
            "self edge must fail cold restore"
        );
        assert!(
            restore(
                serde_json::json!({
                    "a": { "role": "user", "previous_item_id": "b" },
                    "b": { "role": "user", "previous_item_id": "a" }
                }),
                vec!["a", "b"],
            )
            .is_err(),
            "cycle must fail cold restore"
        );
        assert!(
            restore(
                serde_json::json!({
                    "root": { "role": "user" },
                    "materialized_child": {
                        "role": "user",
                        "previous_item_id": "root",
                        "ready": true,
                        "materialized": true
                    }
                }),
                vec!["root", "materialized_child"],
            )
            .is_err(),
            "materialized child cannot have unmaterialized ancestry"
        );
        assert!(
            restore(
                serde_json::json!({
                    "root": { "role": "user" },
                    "waiting_child": { "role": "user", "previous_item_id": "root" }
                }),
                vec!["waiting_child", "root"],
            )
            .is_ok(),
            "valid acyclic waiting graph should restore even when first-seen order is child-first"
        );
    }

    #[test]
    fn realtime_restore_handles_long_waiting_chain_with_bounded_graph_walk() {
        const ITEM_COUNT: usize = 4_096;
        let mut items = serde_json::Map::new();
        let mut order = Vec::with_capacity(ITEM_COUNT);
        for index in 0..ITEM_COUNT {
            let item_id = format!("item-{index:04}");
            let value = if index == 0 {
                serde_json::json!({ "role": "user" })
            } else {
                serde_json::json!({
                    "role": "user",
                    "previous_item_id": format!("item-{:04}", index - 1),
                })
            };
            order.push(item_id.clone());
            items.insert(item_id, value);
        }
        let state = serde_json::from_value(serde_json::json!({
            "items": items,
            "first_seen_order": order,
        }))
        .expect("long-chain fixture should deserialize");
        crate::realtime_transcript_revision::restore_realtime_transcript_state(state)
            .expect("long valid waiting DAG should restore in one bounded graph walk");
    }

    /// R5-7: `AssistantTranscriptFinalText` injects authoritative final text
    /// into the staged item. Verifies the override semantics: a partial
    /// delta is replaced, not concatenated, and the item promotes to the
    /// Spoken lane so flush emits `AssistantBlock::Transcript`.
    #[test]
    fn realtime_transcript_final_text_overrides_partial_delta_and_promotes_to_spoken_lane() {
        let mut session = Session::new();

        // Partial delta accumulates "incom" — simulating delta loss before
        // the final arrives.
        assert!(
            session
                .append_realtime_transcript_event(
                    RealtimeTranscriptEvent::AssistantTranscriptDelta {
                        response_id: "resp_a".to_string(),
                        delta_id: "evt_1".to_string(),
                        item_id: "item_a".to_string(),
                        previous_item_id: None,
                        content_index: 0,
                        delta: "incom".to_string(),
                    }
                )
                .is_inert()
        );

        // Authoritative final text overrides the staged content.
        assert!(
            session
                .append_realtime_transcript_event(
                    RealtimeTranscriptEvent::AssistantTranscriptFinalText {
                        response_id: "resp_a".to_string(),
                        item_id: "item_a".to_string(),
                        content_index: 0,
                        text: "complete answer".to_string(),
                    }
                )
                .is_inert()
        );

        // Turn completion drives the flush.
        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert!(!outcome.is_inert());

        // Verify the materialized block has the final's authoritative text
        // (not the partial "incom") and the Spoken lane.
        assert_eq!(session.messages().len(), 1);
        match &session.messages()[0] {
            Message::BlockAssistant(assistant) => {
                let mut found_transcript = false;
                for block in &assistant.blocks {
                    if let AssistantBlock::Transcript { text, .. } = block {
                        assert_eq!(text, "complete answer");
                        found_transcript = true;
                    }
                }
                assert!(
                    found_transcript,
                    "AssistantTranscriptFinalText must promote to the Spoken lane and \
                     materialize as AssistantBlock::Transcript"
                );
            }
            other => unreachable!("expected BlockAssistant, got {other:?}"),
        }
    }

    /// R5-7: `AssistantTranscriptFinalText` works for final-only providers
    /// where no prior delta has staged an item.
    #[test]
    fn realtime_transcript_final_text_creates_item_when_no_delta_staged() {
        let mut session = Session::new();

        assert!(
            session
                .append_realtime_transcript_event(
                    RealtimeTranscriptEvent::AssistantTranscriptFinalText {
                        response_id: "resp_a".to_string(),
                        item_id: "item_a".to_string(),
                        content_index: 0,
                        text: "spoken-final-only".to_string(),
                    }
                )
                .is_inert()
        );

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert!(!outcome.is_inert());

        assert_eq!(session.messages().len(), 1);
        match &session.messages()[0] {
            Message::BlockAssistant(assistant) => {
                let has_transcript = assistant.blocks.iter().any(|b| {
                    matches!(b, AssistantBlock::Transcript { text, .. } if text == "spoken-final-only")
                });
                assert!(
                    has_transcript,
                    "final-only provider path must materialize as Transcript on the Spoken lane"
                );
            }
            other => unreachable!("expected BlockAssistant, got {other:?}"),
        }
    }

    #[test]
    fn realtime_transcript_append_orders_causally_equivalent_out_of_order_items() {
        let mut session = Session::new();

        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                    response_id: "resp_assistant".to_string(),
                    delta_id: "evt_delta_1".to_string(),
                    item_id: "item_assistant".to_string(),
                    previous_item_id: Some("item_user".to_string()),
                    content_index: 0,
                    delta: "answer".to_string(),
                })
                .is_inert()
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTurnCompleted {
                    response_id: "resp_assistant".to_string(),
                    stop_reason: StopReason::EndTurn,
                    usage: Usage::default(),
                })
                .is_inert()
        );

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_user".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "question".to_string(),
            },
        );

        assert_eq!(outcome.materialized_messages.len(), 2);
        assert_eq!(session.messages().len(), 2);
        assert!(matches!(
            &session.messages()[0],
            Message::User(user) if user.text_content() == "question"
        ));
        assert!(matches!(
            &session.messages()[1],
            Message::BlockAssistant(assistant) if block_assistant_text(assistant) == "answer"
        ));
    }

    #[test]
    fn realtime_transcript_replay_of_seen_provider_items_is_inert() {
        let mut session = Session::new();
        let events = vec![
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_user".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "hello".to_string(),
            },
            RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_assistant".to_string(),
                delta_id: "evt_delta_1".to_string(),
                item_id: "item_assistant".to_string(),
                previous_item_id: Some("item_user".to_string()),
                content_index: 0,
                delta: "world".to_string(),
            },
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_assistant".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        ];

        for event in events.iter().cloned() {
            let _ = session.append_realtime_transcript_event(event);
        }
        let first_messages = serde_json::to_value(session.messages()).unwrap();

        for event in events {
            assert!(session.append_realtime_transcript_event(event).is_inert());
        }

        assert_eq!(
            serde_json::to_value(session.messages()).unwrap(),
            first_messages
        );
    }

    #[test]
    fn realtime_transcript_user_final_replay_cannot_erase_existing_segment() {
        let mut session = Session::new();

        let user = RealtimeTranscriptEvent::UserTranscriptFinal {
            item_id: "item_user".to_string(),
            previous_item_id: None,
            content_index: 0,
            text: "remember amber lantern".to_string(),
        };
        assert!(
            !session
                .append_realtime_transcript_event(user.clone())
                .is_inert()
        );
        let first_messages = serde_json::to_value(session.messages()).unwrap();

        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::UserTranscriptFinal {
                    item_id: "item_user".to_string(),
                    previous_item_id: None,
                    content_index: 0,
                    text: String::new(),
                })
                .is_inert()
        );
        assert!(session.append_realtime_transcript_event(user).is_inert());
        assert_eq!(
            serde_json::to_value(session.messages()).unwrap(),
            first_messages
        );
    }

    #[test]
    fn realtime_transcript_empty_user_final_can_be_filled_by_later_nonempty_replay() {
        let mut session = Session::new();

        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::UserTranscriptFinal {
                    item_id: "item_user".to_string(),
                    previous_item_id: None,
                    content_index: 0,
                    text: String::new(),
                })
                .is_inert()
        );
        assert!(session.messages().is_empty());

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_user".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "remember amber lantern".to_string(),
            },
        );
        assert_eq!(outcome.materialized_messages.len(), 1);
        assert_eq!(session.messages().len(), 1);
        assert!(matches!(
            &session.messages()[0],
            Message::User(user) if user.text_content() == "remember amber lantern"
        ));
    }

    #[test]
    fn realtime_transcript_skipped_provider_items_preserve_causal_order_without_content() {
        let mut session = Session::new();

        let assistant_delta = RealtimeTranscriptEvent::AssistantTextDelta {
            response_id: "resp_assistant".to_string(),
            delta_id: "evt_delta_1".to_string(),
            item_id: "item_assistant".to_string(),
            previous_item_id: Some("item_tool".to_string()),
            content_index: 0,
            delta: "done".to_string(),
        };
        assert!(
            session
                .append_realtime_transcript_event(assistant_delta.clone())
                .is_inert()
        );
        let assistant_complete = RealtimeTranscriptEvent::AssistantTurnCompleted {
            response_id: "resp_assistant".to_string(),
            stop_reason: StopReason::EndTurn,
            usage: Usage::default(),
        };
        assert!(
            session
                .append_realtime_transcript_event(assistant_complete.clone())
                .is_inert()
        );

        let skipped = RealtimeTranscriptEvent::ItemSkipped {
            item_id: "item_tool".to_string(),
            previous_item_id: Some("item_user".to_string()),
        };
        assert!(
            session
                .append_realtime_transcript_event(skipped.clone())
                .is_inert(),
            "a skipped provider item must not append transcript content"
        );
        assert!(session.messages().is_empty());

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_user".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "please use the tool".to_string(),
            },
        );
        assert_eq!(outcome.materialized_messages.len(), 2);
        assert_eq!(session.messages().len(), 2);
        assert!(matches!(
            &session.messages()[0],
            Message::User(user) if user.text_content() == "please use the tool"
        ));
        assert!(matches!(
            &session.messages()[1],
            Message::BlockAssistant(assistant) if block_assistant_text(assistant) == "done"
        ));

        let first_messages = serde_json::to_value(session.messages()).unwrap();
        assert!(session.append_realtime_transcript_event(skipped).is_inert());
        assert!(
            session
                .append_realtime_transcript_event(assistant_delta)
                .is_inert()
        );
        assert!(
            session
                .append_realtime_transcript_event(assistant_complete)
                .is_inert()
        );
        assert_eq!(
            serde_json::to_value(session.messages()).unwrap(),
            first_messages
        );
    }

    #[test]
    fn realtime_transcript_interrupted_assistant_item_unblocks_later_provider_items() {
        // R5-5 (Round-5): the staged assistant content is a Display-lane item
        // (`AssistantTextDelta`). Under the new lane-aware barge-in contract,
        // the Display lane survives interruption and materializes. The User
        // "Stop." item, gated on the chained Display item being materialized,
        // also unblocks. Round-4's "must stay non-canonical" assertion was
        // wrong — that contract was lane-blind.
        let mut session = Session::new();

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_repeat".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "repeat until stop".to_string(),
            },
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                    response_id: "resp_loop".to_string(),
                    delta_id: "evt_loop_1".to_string(),
                    item_id: "item_loop".to_string(),
                    previous_item_id: Some("item_repeat".to_string()),
                    content_index: 0,
                    delta: "Looping now".to_string(),
                })
                .is_inert()
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::UserTranscriptFinal {
                    item_id: "item_stop".to_string(),
                    previous_item_id: Some("item_loop".to_string()),
                    content_index: 0,
                    text: "Stop.".to_string(),
                })
                .is_inert(),
            "the stop turn waits until the interrupted assistant provider item is resolved"
        );

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnInterrupted {
                response_id: "resp_loop".to_string(),
            },
        );

        // R5-5: materializer commits 2 messages (the retained Display item +
        // the unblocked "Stop." User message).
        assert_eq!(outcome.materialized_messages.len(), 2);
        // Canonical history: User-repeat, BlockAssistant(Display "Looping now"), User-Stop.
        assert_eq!(session.messages().len(), 3);
        assert!(matches!(
            &session.messages()[0],
            Message::User(user) if user.text_content() == "repeat until stop"
        ));
        match &session.messages()[1] {
            Message::BlockAssistant(assistant) => {
                let text = block_assistant_text(assistant);
                assert_eq!(text, "Looping now");
            }
            other => unreachable!(
                "Display lane assistant item must be retained on Interrupted, got {other:?}"
            ),
        }
        assert!(matches!(
            &session.messages()[2],
            Message::User(user) if user.text_content() == "Stop."
        ));
    }

    #[test]
    fn realtime_transcript_late_interrupted_assistant_delta_stays_noncanonical() {
        let mut session = Session::new();

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_repeat".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "repeat until stop".to_string(),
            },
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::ItemObserved {
                    item_id: "item_loop".to_string(),
                    previous_item_id: Some("item_repeat".to_string()),
                    role: RealtimeTranscriptRole::Assistant,
                    response_id: None,
                })
                .is_inert(),
            "provider can observe an assistant item before the adapter learns its response id"
        );
        assert!(
            session
                .append_realtime_transcript_event(
                    RealtimeTranscriptEvent::AssistantTurnInterrupted {
                        response_id: "resp_loop".to_string(),
                    }
                )
                .is_inert(),
            "an interruption can arrive before delayed transcript deltas for the response"
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::UserTranscriptFinal {
                    item_id: "item_stop".to_string(),
                    previous_item_id: Some("item_loop".to_string()),
                    content_index: 0,
                    text: "Stop.".to_string(),
                })
                .is_inert(),
            "the stop turn waits for the provider's interrupted assistant item anchor"
        );

        let late_delta_outcome =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_loop".to_string(),
                delta_id: "evt_loop_late".to_string(),
                item_id: "item_loop".to_string(),
                previous_item_id: Some("item_repeat".to_string()),
                content_index: 0,
                delta: "Looping now".to_string(),
            });
        assert_eq!(late_delta_outcome.materialized_messages.len(), 1);
        assert!(matches!(
            &session.messages()[1],
            Message::User(user) if user.text_content() == "Stop."
        ));
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTurnCompleted {
                    response_id: "resp_loop".to_string(),
                    stop_reason: StopReason::EndTurn,
                    usage: Usage::default(),
                })
                .is_inert(),
            "late completion for an interrupted response must not resurrect its deltas"
        );
        assert!(
            session
                .messages()
                .iter()
                .filter_map(|message| match message {
                    Message::BlockAssistant(assistant) => Some(block_assistant_text(assistant)),
                    _ => None,
                })
                .all(|text| !text.contains("Looping now")),
            "late interrupted assistant text must remain non-canonical"
        );
    }

    #[test]
    fn realtime_transcript_completion_only_finalizes_matching_response() {
        let mut session = Session::new();

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_user".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "question".to_string(),
            },
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                    response_id: "resp_a".to_string(),
                    delta_id: "evt_a".to_string(),
                    item_id: "item_a".to_string(),
                    previous_item_id: Some("item_user".to_string()),
                    content_index: 0,
                    delta: "answer a".to_string(),
                })
                .is_inert()
        );

        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTurnCompleted {
                    response_id: "resp_b".to_string(),
                    stop_reason: StopReason::EndTurn,
                    usage: Usage::default(),
                })
                .is_inert(),
            "a completion for another response must not finalize buffered assistant text"
        );
        assert_eq!(session.messages().len(), 1);

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert_eq!(outcome.materialized_messages.len(), 1);
        assert_eq!(session.messages().len(), 2);
        assert!(matches!(
            &session.messages()[1],
            Message::BlockAssistant(assistant) if block_assistant_text(assistant) == "answer a"
        ));
    }

    #[test]
    fn realtime_transcript_completion_before_later_delta_is_response_scoped() {
        let mut session = Session::new();

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_user".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "question".to_string(),
            },
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTurnCompleted {
                    response_id: "resp_a".to_string(),
                    stop_reason: StopReason::EndTurn,
                    usage: Usage::default(),
                })
                .is_inert()
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                    response_id: "resp_b".to_string(),
                    delta_id: "evt_b".to_string(),
                    item_id: "item_b".to_string(),
                    previous_item_id: Some("item_user".to_string()),
                    content_index: 0,
                    delta: "wrong response".to_string(),
                })
                .is_inert(),
            "a later delta for another response must not be finalized by resp_a's pending completion"
        );

        let outcome =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_a".to_string(),
                delta_id: "evt_a".to_string(),
                item_id: "item_a".to_string(),
                previous_item_id: Some("item_user".to_string()),
                content_index: 0,
                delta: "right response".to_string(),
            });

        assert_eq!(outcome.materialized_messages.len(), 1);
        assert_eq!(session.messages().len(), 2);
        assert!(matches!(
            &session.messages()[1],
            Message::BlockAssistant(assistant) if block_assistant_text(assistant) == "right response"
        ));
    }

    #[test]
    fn realtime_transcript_late_duplicate_completion_cannot_finalize_unrelated_response() {
        let mut session = Session::new();

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_user".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "question".to_string(),
            },
        );
        let _ =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_a".to_string(),
                delta_id: "evt_a".to_string(),
                item_id: "item_a".to_string(),
                previous_item_id: Some("item_user".to_string()),
                content_index: 0,
                delta: "first".to_string(),
            });
        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert_eq!(session.messages().len(), 2);

        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                    response_id: "resp_b".to_string(),
                    delta_id: "evt_b".to_string(),
                    item_id: "item_b".to_string(),
                    previous_item_id: Some("item_a".to_string()),
                    content_index: 0,
                    delta: "second".to_string(),
                })
                .is_inert()
        );
        assert!(
            session
                .append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTurnCompleted {
                    response_id: "resp_a".to_string(),
                    stop_reason: StopReason::EndTurn,
                    usage: Usage::default(),
                })
                .is_inert(),
            "a duplicate late terminal for resp_a must not finalize resp_b"
        );
        assert_eq!(session.messages().len(), 2);

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_b".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert_eq!(outcome.materialized_messages.len(), 1);
        assert_eq!(session.messages().len(), 3);
    }

    #[test]
    fn realtime_transcript_interruption_discards_only_matching_response() {
        // R5-5: cross-response isolation invariant — Interrupted on resp_a
        // does NOT touch resp_b's staged content. Both responses use
        // `AssistantTextDelta` (Display lane); under R5-5 resp_a's Display
        // item is RETAINED at Interrupted time and resp_b's continues
        // unaffected, materializing on its later TurnCompleted.
        let mut session = Session::new();

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "item_user".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "question".to_string(),
            },
        );
        let _ =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_a".to_string(),
                delta_id: "evt_a".to_string(),
                item_id: "item_a".to_string(),
                previous_item_id: Some("item_user".to_string()),
                content_index: 0,
                delta: "interrupted display".to_string(),
            });
        let _ =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_b".to_string(),
                delta_id: "evt_b".to_string(),
                item_id: "item_b".to_string(),
                previous_item_id: Some("item_user".to_string()),
                content_index: 0,
                delta: "keep me".to_string(),
            });

        // R5-5: Interrupted commits the resp_a Display item; resp_b
        // remains untouched.
        let interrupt_outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnInterrupted {
                response_id: "resp_a".to_string(),
            },
        );
        assert_eq!(
            interrupt_outcome.materialized_messages.len(),
            1,
            "resp_a's Display item commits on Interrupted"
        );

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_b".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert_eq!(
            outcome.materialized_messages.len(),
            1,
            "resp_b commits on its TurnCompleted, untouched by resp_a's Interrupted"
        );

        // 1 user + 2 assistant messages.
        assert_eq!(session.messages().len(), 3);
        assert!(matches!(
            &session.messages()[1],
            Message::BlockAssistant(assistant) if block_assistant_text(assistant) == "interrupted display"
        ));
        assert!(matches!(
            &session.messages()[2],
            Message::BlockAssistant(assistant) if block_assistant_text(assistant) == "keep me"
        ));
    }

    // Performance tests for Arc-based CoW

    #[test]
    fn test_fork_shares_arc_no_clone() {
        let mut session = Session::new();
        for i in 0..100 {
            session.push(Message::User(UserMessage::text(format!("Message {i}"))));
        }

        // Fork should share the same Arc, not clone messages
        let forked = session.fork();

        // Both should point to the same underlying data (Arc refcount > 1)
        assert!(Arc::ptr_eq(&session.messages, &forked.messages));
        assert_eq!(forked.messages().len(), 100);
    }

    #[test]
    fn test_fork_at_shares_arc_prefix() {
        let mut session = Session::new();
        for i in 0..100 {
            session.push(Message::User(UserMessage::text(format!("Message {i}"))));
        }

        // Fork at 50 should create new Arc with copied prefix
        let forked = session.fork_at(50);
        assert_eq!(forked.messages().len(), 50);

        // Original should be unchanged
        assert_eq!(session.messages().len(), 100);
    }

    #[test]
    fn test_fork_at_resets_transcript_history_state_for_branch_identity() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text(
            "summarize this".to_string(),
        )));
        session.push(Message::BlockAssistant(BlockAssistantMessage::new(
            vec![AssistantBlock::Text {
                text: "long assistant trace".to_string(),
                meta: None,
            }],
            StopReason::EndTurn,
        )));
        let parent_revision = session.transcript_revision().expect("parent revision");
        session
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 1, end: 2 },
                vec![Message::BlockAssistant(BlockAssistantMessage::new(
                    vec![AssistantBlock::Text {
                        text: "compact trace".to_string(),
                        meta: None,
                    }],
                    StopReason::EndTurn,
                ))],
                TranscriptRewriteReason::new("compaction"),
                Some("test".to_string()),
                Some(parent_revision),
            )
            .expect("rewrite should commit");

        let source_head = session.transcript_revision().expect("source head");
        let mut forked = session.fork_at(1);
        assert_ne!(forked.id(), session.id());
        assert!(
            !forked
                .metadata()
                .contains_key(SESSION_TRANSCRIPT_HISTORY_STATE_KEY)
        );
        assert_eq!(
            forked.transcript_revision().expect("fork head"),
            transcript_messages_digest(forked.messages()).expect("fork digest")
        );
        assert!(
            forked
                .transcript_revision_messages(&source_head)
                .expect("fork history lookup")
                .is_none()
        );

        let fork_parent = forked.transcript_revision().expect("fork parent");
        let commit = forked
            .commit_transcript_rewrite(
                TranscriptRewriteSelection::MessageRange { start: 0, end: 1 },
                vec![Message::User(UserMessage::text(
                    "branch prompt".to_string(),
                ))],
                TranscriptRewriteReason::new("branch_edit"),
                Some("test".to_string()),
                Some(fork_parent.clone()),
            )
            .expect("fork rewrite should use fork-local parent");
        assert_eq!(commit.parent_revision, fork_parent);
    }

    #[test]
    fn test_push_cow_behavior() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("First".to_string())));

        // Fork shares the Arc
        let forked = session.fork();
        assert!(Arc::ptr_eq(&session.messages, &forked.messages));

        // Push on original triggers CoW - original gets new Arc
        session.push(Message::User(UserMessage::text("Second".to_string())));

        // Now they should have different Arcs
        assert!(!Arc::ptr_eq(&session.messages, &forked.messages));
        assert_eq!(session.messages().len(), 2);
        assert_eq!(forked.messages().len(), 1);
    }

    // Performance tests for lazy timestamp updates

    #[test]
    fn test_push_batch_single_timestamp() {
        let mut session = Session::new();
        let initial_updated = session.updated_at();

        // Use push_batch to add multiple messages without repeated syscalls
        session.push_batch(vec![
            Message::User(UserMessage::text("First".to_string())),
            Message::User(UserMessage::text("Second".to_string())),
            Message::User(UserMessage::text("Third".to_string())),
        ]);

        assert_eq!(session.messages().len(), 3);
        // Timestamp should have been updated once
        assert!(session.updated_at() >= initial_updated);
    }

    #[test]
    fn test_touch_updates_timestamp() {
        let mut session = Session::new();
        let initial = session.updated_at();

        std::thread::sleep(std::time::Duration::from_millis(10));

        // Explicit touch to update timestamp
        session.touch();

        assert!(session.updated_at() > initial);
    }

    #[test]
    fn test_session_push() {
        let mut session = Session::new();
        let initial_updated = session.updated_at();

        // Small delay to ensure time changes
        std::thread::sleep(std::time::Duration::from_millis(10));

        session.push(Message::User(UserMessage::text("Hello".to_string())));

        assert_eq!(session.messages().len(), 1);
        assert!(session.updated_at() > initial_updated);
    }

    #[test]
    fn test_session_fork() {
        let mut session = Session::new();
        session.push(Message::System(SystemMessage::new("System prompt")));
        session.push(Message::User(UserMessage::text("Hello".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "Hi!".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));

        // Fork at index 2 (system + user)
        let forked = session.fork_at(2);
        assert_eq!(forked.messages().len(), 2);
        assert_ne!(forked.id(), session.id());

        // Full fork
        let full_fork = session.fork();
        assert_eq!(full_fork.messages().len(), 3);
    }

    #[test]
    fn test_session_forks_drop_generated_authority_metadata() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("original")));
        session.set_metadata("ordinary", serde_json::json!("keep"));
        session
            .set_build_state(SessionBuildState::default())
            .expect("build state should serialize");
        session
            .set_system_context_state(SessionSystemContextState::default())
            .expect("system-context state should serialize");
        session
            .set_deferred_turn_state(SessionDeferredTurnState::default())
            .expect("deferred-turn state should serialize");
        session
            .set_tool_visibility_state(
                AuthorizedSessionToolVisibilityState::from_generated_authority(
                    SessionToolVisibilityState::default(),
                ),
            )
            .expect("visibility state should serialize");
        let _ = session.append_realtime_transcript_event(RealtimeTranscriptEvent::ItemObserved {
            item_id: "rt-item".to_string(),
            previous_item_id: None,
            role: RealtimeTranscriptRole::User,
            response_id: None,
        });
        session.metadata.insert(
            crate::memory::SESSION_COMPACTION_PROJECTION_INTENTS_KEY.to_string(),
            serde_json::json!([{"sealed_projection": "must-not-fork"}]),
        );
        assert!(
            session
                .metadata()
                .contains_key(SESSION_REALTIME_TRANSCRIPT_STATE_KEY),
            "test setup should install realtime transcript authority state"
        );

        let forked_at = session.fork_at(1);
        let full_fork = session.fork();
        let replaced = session
            .fork_replacing(
                0,
                TranscriptReplacement::Message {
                    message: Message::User(UserMessage::text("replacement")),
                },
            )
            .expect("replacement fork should succeed");

        for forked in [&forked_at, &full_fork, &replaced] {
            assert_eq!(forked.metadata().get("ordinary").unwrap(), "keep");
            assert!(
                !forked.metadata().contains_key(SESSION_BUILD_STATE_KEY),
                "forked sessions must not raw-copy durable build-state authority"
            );
            assert!(
                !forked
                    .metadata()
                    .contains_key(SESSION_SYSTEM_CONTEXT_STATE_KEY),
                "forked sessions must not raw-copy system-context authority state"
            );
            assert!(
                !forked
                    .metadata()
                    .contains_key(SESSION_DEFERRED_TURN_STATE_KEY),
                "forked sessions must not raw-copy deferred-turn authority state"
            );
            assert!(
                !forked
                    .metadata()
                    .contains_key(SESSION_TOOL_VISIBILITY_STATE_KEY),
                "forked sessions must not raw-copy tool-visibility authority state"
            );
            assert!(
                !forked
                    .metadata()
                    .contains_key(SESSION_REALTIME_TRANSCRIPT_STATE_KEY),
                "forked sessions must not raw-copy realtime transcript authority state"
            );
            assert!(
                !forked
                    .metadata()
                    .contains_key(crate::memory::SESSION_COMPACTION_PROJECTION_INTENTS_KEY),
                "forked sessions must not raw-copy compaction outbox authority"
            );
        }
    }

    #[test]
    fn test_session_metadata() {
        let mut session = Session::new();
        session.set_metadata("key", serde_json::json!("value"));

        assert_eq!(session.metadata().get("key").unwrap(), "value");
    }

    #[test]
    fn identical_metadata_projection_is_checkpoint_idempotent() {
        let mut session = Session::new();
        session.set_metadata("key", serde_json::json!({ "value": 1 }));
        let updated_at = session.updated_at;
        let digest = crate::session_checkpoint_digest(&session)
            .expect("checkpoint digest before identical projection");

        session.set_metadata("key", serde_json::json!({ "value": 1 }));
        session.remove_metadata("already_absent");

        assert_eq!(
            session.updated_at, updated_at,
            "an identical durable projection must not manufacture a content mutation"
        );
        assert_eq!(
            crate::session_checkpoint_digest(&session)
                .expect("checkpoint digest after identical projection"),
            digest,
            "an identical durable projection must not rotate checkpoint authority"
        );
    }

    #[test]
    fn session_metadata_realm_id_is_back_read_compatible_string() {
        // A typed realm_id serializes as a bare JSON string (byte-identical to
        // the prior Option<String> durable shape).
        let metadata = SessionMetadata {
            schema_version: SESSION_METADATA_SCHEMA_VERSION,
            model: "test-model".to_string(),
            max_tokens: 1024,
            structured_output_retries: 2,
            provider: Provider::Other,
            self_hosted_server_id: None,
            provider_params: None,
            tooling: SessionTooling::default(),
            keep_alive: false,
            comms_name: None,
            peer_meta: None,
            realm_id: Some(crate::RealmId::parse("env_default").unwrap()),
            instance_id: None,
            backend: None,
            config_generation: None,
            auth_binding: None,
            mob_member_binding: None,
        };
        let value = serde_json::to_value(&metadata).unwrap();
        assert_eq!(
            value.get("realm_id"),
            Some(&serde_json::json!("env_default")),
            "typed realm_id must serialize as a bare slug string"
        );

        // A legacy persisted row stored realm_id as a JSON string; it must
        // deserialize into the typed RealmId (durable back-read).
        let legacy = serde_json::json!({
            "schema_version": SESSION_METADATA_SCHEMA_VERSION,
            "model": "test-model",
            "max_tokens": 1024,
            "structured_output_retries": 2,
            "provider": "other",
            "tooling": SessionTooling::default(),
            "keep_alive": false,
            "comms_name": null,
            "realm_id": "legacy_realm",
        });
        let restored: SessionMetadata = serde_json::from_value(legacy).unwrap();
        assert_eq!(
            restored.realm_id.as_ref().map(crate::RealmId::as_str),
            Some("legacy_realm")
        );
    }

    /// Ask 6: `SessionTooling.tool_access_policy` is additive — a persisted
    /// row without the field back-reads as `None` (unrestricted), `None` is
    /// omitted on write (durable shape unchanged for ungated sessions), and a
    /// resolved policy round-trips intact.
    #[test]
    fn session_tooling_tool_access_policy_round_trip_and_absent_default() {
        // Absent field back-reads as None.
        let legacy = serde_json::json!({});
        let restored: SessionTooling = serde_json::from_value(legacy).unwrap();
        assert_eq!(restored.tool_access_policy, None);

        // None is omitted on write — ungated sessions keep their prior shape.
        let value = serde_json::to_value(SessionTooling::default()).unwrap();
        assert!(
            value.get("tool_access_policy").is_none(),
            "None policy must not serialize"
        );

        // A resolved policy round-trips intact.
        let tooling = SessionTooling {
            tool_access_policy: Some(crate::ops::ToolAccessPolicy::AllowList(
                ["read_file", "send_message"].into_iter().collect(),
            )),
            ..SessionTooling::default()
        };
        let value = serde_json::to_value(&tooling).unwrap();
        let restored: SessionTooling = serde_json::from_value(value).unwrap();
        assert_eq!(restored.tool_access_policy, tooling.tool_access_policy);
    }

    #[test]
    fn lifecycle_terminal_typed_round_trip() {
        let mut session = Session::new();
        assert_eq!(session.lifecycle_terminal(), None);

        session
            .set_lifecycle_terminal(SessionLifecycleTerminal::Archived)
            .expect("typed terminal write should serialize");
        assert_eq!(
            session.lifecycle_terminal(),
            Some(SessionLifecycleTerminal::Archived)
        );
        assert!(
            session
                .lifecycle_terminal()
                .is_some_and(SessionLifecycleTerminal::is_archived)
        );
        // Persisted JSON for the typed key is the snake_case variant string.
        assert_eq!(
            session
                .metadata()
                .get(SESSION_LIFECYCLE_TERMINAL_KEY)
                .unwrap(),
            &serde_json::json!("archived")
        );
    }

    #[test]
    fn lifecycle_terminal_key_rejects_raw_mutation() {
        let mut session = Session::new();
        assert!(
            session
                .try_set_metadata(
                    SESSION_LIFECYCLE_TERMINAL_KEY,
                    serde_json::json!("archived")
                )
                .is_err(),
            "the typed lifecycle-terminal key is reserved for session authority"
        );
    }

    #[test]
    fn test_session_metadata_backfill_preserves_timestamp() {
        let mut session = Session::new();
        let initial_updated = session.updated_at();

        std::thread::sleep(std::time::Duration::from_millis(10));

        assert!(session.backfill_metadata_if_absent("key", serde_json::json!("value")));
        assert_eq!(session.metadata().get("key").unwrap(), "value");
        assert_eq!(session.updated_at(), initial_updated);
        assert!(!session.backfill_metadata_if_absent("key", serde_json::json!("other")));
        assert_eq!(session.metadata().get("key").unwrap(), "value");
        assert_eq!(session.updated_at(), initial_updated);
    }

    #[test]
    fn test_reserved_generated_authority_metadata_rejects_raw_mutation() {
        let mut session = Session::new();

        assert!(
            session
                .try_set_metadata(SESSION_SYSTEM_CONTEXT_STATE_KEY, serde_json::json!({}))
                .is_err()
        );
        assert!(
            session
                .try_set_metadata(SESSION_METADATA_KEY, serde_json::json!({}))
                .is_err()
        );
        assert!(
            session
                .try_set_metadata(SESSION_BUILD_STATE_KEY, serde_json::json!({}))
                .is_err()
        );
        let compaction_intents_key = crate::memory::SESSION_COMPACTION_PROJECTION_INTENTS_KEY;
        let sealed_compaction_intents =
            serde_json::json!([{"sealed_projection": "typed-owner-only"}]);
        session.metadata.insert(
            compaction_intents_key.to_string(),
            sealed_compaction_intents.clone(),
        );
        assert!(
            session
                .try_set_metadata(compaction_intents_key, serde_json::json!([]))
                .is_err(),
            "raw metadata must not overwrite compaction outbox authority"
        );
        session.remove_metadata(compaction_intents_key);
        assert_eq!(
            session.metadata().get(compaction_intents_key),
            Some(&sealed_compaction_intents),
            "raw metadata removal must not erase compaction outbox authority"
        );
        let mut absent = Session::new();
        assert!(
            !absent.backfill_metadata_if_absent(
                compaction_intents_key,
                serde_json::json!([{"forged_projection": true}])
            ),
            "compatibility backfill must not fabricate compaction outbox authority"
        );
        assert!(!absent.metadata().contains_key(compaction_intents_key));
        session
            .set_session_metadata(SessionMetadata {
                schema_version: SESSION_METADATA_SCHEMA_VERSION,
                model: "test-model".to_string(),
                max_tokens: 1024,
                structured_output_retries: 2,
                provider: Provider::Other,
                self_hosted_server_id: None,
                provider_params: None,
                tooling: SessionTooling::default(),
                keep_alive: false,
                comms_name: None,
                peer_meta: None,
                realm_id: None,
                instance_id: None,
                backend: None,
                config_generation: None,
                auth_binding: None,
                mob_member_binding: None,
            })
            .expect("typed metadata setter should route through generated authority");
        session
            .set_build_state(SessionBuildState::default())
            .expect("typed build-state setter should route through generated authority");
        session.remove_metadata(SESSION_METADATA_KEY);
        session.remove_metadata(SESSION_BUILD_STATE_KEY);
        assert!(
            session.metadata().contains_key(SESSION_METADATA_KEY),
            "raw removal must not delete generated-authority session metadata"
        );
        assert!(
            session.metadata().contains_key(SESSION_BUILD_STATE_KEY),
            "raw removal must not delete generated-authority build state"
        );
        session.set_metadata(SESSION_DEFERRED_TURN_STATE_KEY, serde_json::json!({}));
        assert!(
            !session
                .metadata()
                .contains_key(SESSION_DEFERRED_TURN_STATE_KEY)
        );
        assert!(
            !session.backfill_metadata_if_absent(
                SESSION_SYSTEM_CONTEXT_STATE_KEY,
                serde_json::json!({})
            )
        );

        let state = SessionSystemContextState::default();
        session
            .set_system_context_state(state.clone())
            .expect("typed setter should route through generated authority");
        session.remove_metadata(SESSION_SYSTEM_CONTEXT_STATE_KEY);
        assert_eq!(
            session
                .try_system_context_state()
                .expect("typed state should restore"),
            Some(state)
        );

        session.metadata.insert(
            SESSION_SYSTEM_CONTEXT_STATE_KEY.to_string(),
            serde_json::json!("not-a-state"),
        );
        assert!(
            session.try_system_context_state().is_err(),
            "malformed generated authority state must not decode as absent/default"
        );

        session.metadata.insert(
            SESSION_METADATA_KEY.to_string(),
            serde_json::json!("not-metadata"),
        );
        assert!(
            session.try_session_metadata().is_err(),
            "malformed session metadata must not decode as absent/default"
        );

        session.metadata.insert(
            SESSION_BUILD_STATE_KEY.to_string(),
            serde_json::json!("not-build-state"),
        );
        assert!(
            session.try_build_state().is_err(),
            "malformed build state must not decode as absent/default"
        );

        assert!(
            session
                .try_set_metadata(SESSION_TOOL_VISIBILITY_STATE_KEY, serde_json::json!({}))
                .is_err()
        );
        session
            .set_tool_visibility_state(
                AuthorizedSessionToolVisibilityState::from_generated_authority(
                    SessionToolVisibilityState::default(),
                ),
            )
            .expect("typed visibility setter should route through typed authority handoff");
        session.remove_metadata(SESSION_TOOL_VISIBILITY_STATE_KEY);
        assert!(
            session
                .metadata()
                .contains_key(SESSION_TOOL_VISIBILITY_STATE_KEY)
        );
        session.clear_tool_visibility_state();
        assert!(
            !session
                .metadata()
                .contains_key(SESSION_TOOL_VISIBILITY_STATE_KEY)
        );
        assert!(
            session
                .try_set_metadata(SESSION_REALTIME_TRANSCRIPT_STATE_KEY, serde_json::json!({}))
                .is_err()
        );
        let _ = session.append_realtime_transcript_event(RealtimeTranscriptEvent::ItemObserved {
            item_id: "rt-item".to_string(),
            previous_item_id: None,
            role: RealtimeTranscriptRole::User,
            response_id: None,
        });
        assert!(
            session
                .metadata()
                .contains_key(SESSION_REALTIME_TRANSCRIPT_STATE_KEY),
            "typed realtime transcript append should retain authority to persist its state"
        );
        session.metadata.insert(
            SESSION_REALTIME_TRANSCRIPT_STATE_KEY.to_string(),
            serde_json::json!("not-a-state"),
        );
        assert!(
            session.try_realtime_transcript_state().is_err(),
            "malformed realtime generated authority state must not decode as absent/default"
        );
    }

    #[test]
    fn test_session_mob_tool_authority_context_persists_projection_without_authority_seal() {
        let mut session = Session::new();
        session
            .set_build_state(SessionBuildState::default())
            .expect("session build state should serialize");
        let authority = MobToolAuthorityContext::generated_for_test(
            crate::service::OpaquePrincipalToken::new("opaque-principal"),
            false,
            false,
            false,
            std::collections::BTreeSet::from(["mob-a".to_string()]),
            std::collections::BTreeMap::new(),
            None,
            Some("audit-1".to_string()),
        );

        session
            .set_mob_tool_authority_context(Some(authority))
            .expect("authority should serialize");
        assert!(session.mob_tool_authority_context().is_none());
        let stored = session
            .build_state()
            .and_then(|state| state.mob_tool_authority_context)
            .expect("stored projection should deserialize");
        assert!(!stored.is_generated_authority_context());
        assert!(!stored.can_manage_mob("mob-a"));

        session
            .set_mob_tool_authority_context(None)
            .expect("authority should clear");
        assert!(session.mob_tool_authority_context().is_none());
    }

    #[test]
    fn test_session_build_state_rejects_forged_mob_authority_projection() {
        let mut session = Session::new();
        let authority = MobToolAuthorityContext::generated_for_test(
            crate::service::OpaquePrincipalToken::new("opaque-principal"),
            false,
            false,
            false,
            std::collections::BTreeSet::from(["mob-a".to_string()]),
            std::collections::BTreeMap::new(),
            None,
            Some("audit-1".to_string()),
        );
        let forged_projection: MobToolAuthorityContext =
            serde_json::from_value(serde_json::to_value(authority).expect("serialize authority"))
                .expect("deserialize projection");
        assert!(!forged_projection.is_generated_authority_context());

        let err = session
            .set_build_state(SessionBuildState {
                mob_tool_authority_context: Some(forged_projection),
                ..Default::default()
            })
            .expect_err("forged build state must be rejected by generated authority");
        // The build-state-persist admission decision now lives in the canonical
        // SessionDocumentMachine durable-config region (LUC-524); the rejection
        // surfaces with that machine's authority wording.
        assert!(
            err.to_string()
                .contains("generated session document authority rejected"),
            "unexpected error: {err}"
        );
    }

    #[test]
    fn test_session_tool_visibility_state_roundtrip() {
        let mut session = Session::new();
        let state = SessionToolVisibilityState {
            inherited_base_filter: ToolFilter::Allow(["visible".to_string()].into_iter().collect()),
            active_filter: ToolFilter::Allow(
                ["visible".to_string(), "missing".to_string()]
                    .into_iter()
                    .collect(),
            ),
            staged_filter: ToolFilter::Allow(
                ["visible".to_string(), "missing".to_string()]
                    .into_iter()
                    .collect(),
            ),
            active_revision: 1,
            staged_revision: 2,
            ..Default::default()
        };

        session
            .set_tool_visibility_state(
                AuthorizedSessionToolVisibilityState::from_generated_authority(state.clone()),
            )
            .expect("tool visibility state should serialize");
        assert_eq!(session.tool_visibility_state().unwrap(), Some(state));
    }

    #[test]
    fn test_session_tool_visibility_state_malformed_returns_error() {
        let mut session = Session::new();
        session.metadata.insert(
            SESSION_TOOL_VISIBILITY_STATE_KEY.to_string(),
            serde_json::json!({
                "active_filter": {
                    "unexpected_filter_kind": ["secret"]
                }
            }),
        );

        assert!(
            session.tool_visibility_state().is_err(),
            "malformed canonical visibility metadata must not decode as absent/default"
        );
    }

    #[test]
    fn test_session_serialization() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("Test".to_string())));

        let json = serde_json::to_string(&session).unwrap();
        let parsed: Session = serde_json::from_str(&json).unwrap();

        assert_eq!(parsed.id(), session.id());
        assert_eq!(parsed.messages().len(), 1);
        assert_eq!(parsed.version(), SESSION_VERSION);
    }

    #[test]
    fn test_session_meta_from_session() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("Hello".to_string())));
        session.push(Message::BlockAssistant(BlockAssistantMessage {
            blocks: vec![AssistantBlock::Text {
                text: "Hi!".to_string(),
                meta: None,
            }],
            stop_reason: StopReason::EndTurn,
            identity: crate::types::TranscriptMessageIdentity::default(),
            created_at: crate::types::message_timestamp_now(),
        }));
        session.record_usage(Usage {
            input_tokens: 10,
            output_tokens: 5,
            cache_creation_tokens: None,
            cache_read_tokens: None,
        });

        let meta = SessionMeta::from(&session);
        assert_eq!(meta.id, *session.id());
        assert_eq!(meta.message_count, 2);
        assert_eq!(meta.total_tokens, 15);
    }

    #[test]
    fn system_context_state_preserves_applied_runtime_context() {
        let accepted_at = SystemTime::UNIX_EPOCH;
        let mut state = SessionSystemContextState::default();
        state
            .stage_append(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::run_primitive::CoreRenderable::text(
                        "Authoritative peer token is birch seventeen.".to_string(),
                    ),
                    source: Some(
                        "peer_response_terminal:analyst:018f6f79-7a82-7c4e-a552-a3b86f9630f1"
                            .to_string(),
                    ),
                    idempotency_key: Some("018f6f79-7a82-7c4e-a552-a3b86f9630f1".to_string()),
                    source_kind: SystemContextSource::Normal,
                    peer_response_terminal: None,
                },
                accepted_at,
            )
            .expect("append should stage");

        state.mark_pending_applied();

        assert!(state.pending.is_empty());
        assert_eq!(state.applied.len(), 1);
        assert_eq!(
            state.applied[0].content.render_text(),
            "Authoritative peer token is birch seventeen."
        );
        assert_eq!(
            state.applied[0].source.as_deref(),
            Some("peer_response_terminal:analyst:018f6f79-7a82-7c4e-a552-a3b86f9630f1")
        );

        let round_tripped: SessionSystemContextState =
            serde_json::from_value(serde_json::to_value(&state).expect("serialize state"))
                .expect("deserialize state");
        assert_eq!(round_tripped.applied, state.applied);
    }

    #[test]
    fn active_turn_system_context_is_discarded_when_not_applied() {
        let mut state = SessionSystemContextState::default();
        state
            .stage_active_turn_append(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::run_primitive::CoreRenderable::text(
                        "only for the active run".to_string(),
                    ),
                    source: Some("runtime:steer:input-1".to_string()),
                    idempotency_key: Some("runtime:steer:input-1".to_string()),
                    source_kind: SystemContextSource::RuntimeSteer,
                    peer_response_terminal: None,
                },
                SystemTime::UNIX_EPOCH,
            )
            .expect("active context should stage");

        let discarded = state.discard_unapplied_active_turn_pending();

        assert_eq!(discarded.len(), 1);
        assert!(state.pending.is_empty());
        assert!(state.applied.is_empty());
        assert!(state.active_turn_pending_keys.is_empty());
        assert!(state.active_turn_pending_indices.is_empty());
        assert!(
            state.seen.is_empty(),
            "discarded active-turn context should not block later idempotency keys"
        );
    }

    #[test]
    fn keyless_active_turn_system_context_is_owned_and_discarded() {
        let mut state = SessionSystemContextState::default();
        state
            .stage_active_turn_append(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::run_primitive::CoreRenderable::text(
                        "keyless active-turn context".to_string(),
                    ),
                    source: Some("test:keyless-active-turn".to_string()),
                    idempotency_key: None,
                    source_kind: SystemContextSource::RuntimeSteer,
                    peer_response_terminal: None,
                },
                SystemTime::UNIX_EPOCH,
            )
            .expect("keyless active context should stage");

        assert!(state.active_turn_pending_keys.is_empty());
        assert_eq!(state.active_turn_pending_len(), 1);
        let discarded = state.discard_unapplied_active_turn_pending();

        assert_eq!(discarded.len(), 1);
        assert!(state.pending.is_empty());
        assert_eq!(state.active_turn_pending_len(), 0);
    }

    #[test]
    fn active_turn_system_context_can_roll_back_targeted_keys() {
        let mut state = SessionSystemContextState::default();
        for key in ["runtime:steer:input-1", "runtime:steer:input-2"] {
            state
                .stage_active_turn_append(
                    &AppendSystemContextRequest {
                        content: crate::lifecycle::run_primitive::CoreRenderable::text(format!(
                            "context for {key}"
                        )),
                        source: Some(key.to_string()),
                        idempotency_key: Some(key.to_string()),
                        source_kind: SystemContextSource::RuntimeSteer,
                        peer_response_terminal: None,
                    },
                    SystemTime::UNIX_EPOCH,
                )
                .expect("active context should stage");
        }

        let discarded =
            state.discard_active_turn_pending_by_keys(&["runtime:steer:input-1".to_string()]);

        assert_eq!(discarded.len(), 1);
        assert_eq!(
            discarded[0].idempotency_key.as_deref(),
            Some("runtime:steer:input-1")
        );
        assert_eq!(state.pending.len(), 1);
        assert_eq!(
            state.pending[0].idempotency_key.as_deref(),
            Some("runtime:steer:input-2")
        );
        assert!(!state.seen.contains_key("runtime:steer:input-1"));
        assert!(state.seen.contains_key("runtime:steer:input-2"));
        assert!(
            !state
                .active_turn_pending_keys
                .contains("runtime:steer:input-1")
        );
        assert!(
            state
                .active_turn_pending_keys
                .contains("runtime:steer:input-2")
        );
    }

    #[test]
    fn active_turn_system_context_is_transient_when_boundary_consumes_it() {
        let mut state = SessionSystemContextState::default();
        state
            .stage_active_turn_append(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::run_primitive::CoreRenderable::text(
                        "visible to this run".to_string(),
                    ),
                    source: Some("runtime:steer:input-2".to_string()),
                    idempotency_key: Some("runtime:steer:input-2".to_string()),
                    source_kind: SystemContextSource::RuntimeSteer,
                    peer_response_terminal: None,
                },
                SystemTime::UNIX_EPOCH,
            )
            .expect("active context should stage");

        state.mark_pending_applied();
        let discarded = state.discard_unapplied_active_turn_pending();

        assert!(discarded.is_empty());
        assert!(state.pending.is_empty());
        assert!(state.applied.is_empty());
        assert!(state.active_turn_pending_keys.is_empty());
        assert!(state.active_turn_pending_indices.is_empty());
        assert_eq!(
            state.seen.get("runtime:steer:input-2"),
            None,
            "consumed active-turn steer context must not become durable state"
        );
    }

    #[test]
    fn discard_transient_runtime_steer_context_removes_steer_via_typed_marker() {
        let mut session = Session::new();
        // The runtime-steer fact is carried by the typed `source_kind`, not by
        // the `source` string. The durable peer fact uses the same `source`
        // string scheme but is marked `Normal`, so only the steers are removed.
        session.set_system_prompt(format!(
            "base{}{}{}{}",
            SYSTEM_CONTEXT_SEPARATOR,
            render_system_context_block(&PendingSystemContextAppend {
                content: crate::lifecycle::run_primitive::CoreRenderable::text(
                    "old steer".to_string()
                ),
                source: Some("steer-source-old".to_string()),
                idempotency_key: Some("steer-key-old".to_string()),
                source_kind: SystemContextSource::RuntimeSteer,
                peer_response_terminal: None,
                accepted_at: SystemTime::UNIX_EPOCH,
            }),
            SYSTEM_CONTEXT_SEPARATOR,
            render_system_context_block(&PendingSystemContextAppend {
                content: crate::lifecycle::run_primitive::CoreRenderable::text(
                    "durable peer fact".to_string()
                ),
                source: Some("peer_response_terminal:analyst:req".to_string()),
                idempotency_key: Some("peer_response_terminal:analyst:req".to_string()),
                source_kind: SystemContextSource::Normal,
                peer_response_terminal: None,
                accepted_at: SystemTime::UNIX_EPOCH,
            })
        ));
        session
            .set_system_context_state(SessionSystemContextState {
                pending: vec![PendingSystemContextAppend {
                    content: crate::lifecycle::run_primitive::CoreRenderable::text(
                        "pending steer".to_string(),
                    ),
                    source: Some("steer-source-pending".to_string()),
                    idempotency_key: Some("steer-key-pending".to_string()),
                    source_kind: SystemContextSource::RuntimeSteer,
                    peer_response_terminal: None,
                    accepted_at: SystemTime::UNIX_EPOCH,
                }],
                applied: vec![
                    PendingSystemContextAppend {
                        content: crate::lifecycle::run_primitive::CoreRenderable::text(
                            "old steer".to_string(),
                        ),
                        source: Some("steer-source-old".to_string()),
                        idempotency_key: Some("steer-key-old".to_string()),
                        source_kind: SystemContextSource::RuntimeSteer,
                        peer_response_terminal: None,
                        accepted_at: SystemTime::UNIX_EPOCH,
                    },
                    PendingSystemContextAppend {
                        content: crate::lifecycle::run_primitive::CoreRenderable::text(
                            "durable peer fact".to_string(),
                        ),
                        source: Some("peer_response_terminal:analyst:req".to_string()),
                        idempotency_key: Some("peer_response_terminal:analyst:req".to_string()),
                        source_kind: SystemContextSource::Normal,
                        peer_response_terminal: None,
                        accepted_at: SystemTime::UNIX_EPOCH,
                    },
                ],
                seen: BTreeMap::from([(
                    "steer-key-old".to_string(),
                    SeenSystemContextKey {
                        content: crate::lifecycle::run_primitive::CoreRenderable::text(
                            "old steer".to_string(),
                        ),
                        source: Some("steer-source-old".to_string()),
                        source_kind: SystemContextSource::RuntimeSteer,
                        state: SeenSystemContextState::Applied,
                    },
                )]),
                active_turn_pending_keys: BTreeSet::from(["steer-key-pending".to_string()]),
                active_turn_pending_indices: BTreeSet::from([0]),
            })
            .expect("system context state should serialize");

        let removed = session.discard_transient_runtime_steer_context();

        assert!(removed >= 4);
        let system_prompt = match session.messages().first() {
            Some(Message::System(system)) => system.content.as_str(),
            other => panic!("expected system prompt, got {other:?}"),
        };
        assert!(!system_prompt.contains("old steer"));
        assert!(system_prompt.contains("durable peer fact"));
        let state = session.system_context_state().unwrap_or_default();
        assert!(state.pending.is_empty());
        assert_eq!(state.applied.len(), 1);
        assert_eq!(state.applied[0].content.render_text(), "durable peer fact");
        assert!(state.seen.is_empty());
        assert!(state.active_turn_pending_keys.is_empty());
    }

    #[test]
    fn append_system_context_blocks_records_typed_applied_context() {
        let append = PendingSystemContextAppend {
            content: crate::lifecycle::run_primitive::CoreRenderable::text(
                "Authoritative peer token is birch seventeen.".to_string(),
            ),
            source: Some(
                "peer_response_terminal:analyst:018f6f79-7a82-7c4e-a552-a3b86f9630f1".to_string(),
            ),
            idempotency_key: Some("018f6f79-7a82-7c4e-a552-a3b86f9630f1".to_string()),
            source_kind: SystemContextSource::Normal,
            peer_response_terminal: None,
            accepted_at: SystemTime::UNIX_EPOCH,
        };
        let mut session = Session::new();

        session.append_system_context_blocks(std::slice::from_ref(&append));

        let state = session
            .system_context_state()
            .expect("append should persist typed context state");
        assert_eq!(state.applied, vec![append]);
    }

    fn roster_append() -> PendingSystemContextAppend {
        PendingSystemContextAppend {
            content: crate::lifecycle::run_primitive::CoreRenderable::text(
                "peer roster: lead-1, w-1".to_string(),
            ),
            source: Some("comms:roster".to_string()),
            idempotency_key: Some("comms:roster:v1".to_string()),
            source_kind: SystemContextSource::Normal,
            peer_response_terminal: None,
            accepted_at: SystemTime::UNIX_EPOCH,
        }
    }

    fn resumed_session_with_context_appended_prompt(base: &str) -> Session {
        let mut session = Session::new();
        session.set_system_prompt(base.to_string());
        session.push(Message::User(UserMessage::text("hello".to_string())));
        session.append_system_context_blocks(std::slice::from_ref(&roster_append()));
        session
    }

    #[test]
    fn reconcile_resumed_system_prompt_preserves_identical_base() {
        let mut session = Session::new();
        session.set_system_prompt("base prompt".to_string());
        session.push(Message::User(UserMessage::text("hello".to_string())));
        let digest_before = transcript_messages_digest(session.messages()).unwrap();

        let outcome = session
            .reconcile_resumed_system_prompt("base prompt".to_string(), None)
            .expect("reconcile");

        assert_eq!(
            outcome,
            ResumedSystemPromptReconciliation::PreservedContinuation
        );
        assert_eq!(
            transcript_messages_digest(session.messages()).unwrap(),
            digest_before,
            "identical base must leave the transcript revision unchanged"
        );
    }

    #[test]
    fn reconcile_resumed_system_prompt_preserves_context_appended_base() {
        let mut session = resumed_session_with_context_appended_prompt("base prompt");
        let digest_before = transcript_messages_digest(session.messages()).unwrap();

        let outcome = session
            .reconcile_resumed_system_prompt("base prompt".to_string(), None)
            .expect("reconcile");

        assert_eq!(
            outcome,
            ResumedSystemPromptReconciliation::PreservedContinuation
        );
        assert_eq!(
            transcript_messages_digest(session.messages()).unwrap(),
            digest_before,
            "a base extended only by runtime context appends must stay untouched"
        );
        let system = match session.messages().first() {
            Some(Message::System(system)) => system.clone(),
            other => panic!("expected system message, got {other:?}"),
        };
        assert!(system.content.contains("peer roster: lead-1, w-1"));
        assert!(
            system.mutation_kind.is_runtime_context_append(),
            "the persisted mutation provenance must survive reconciliation"
        );
    }

    #[test]
    fn reconcile_resumed_system_prompt_rewrites_changed_base_preserving_tail() {
        let mut session = resumed_session_with_context_appended_prompt("base prompt");

        let outcome = session
            .reconcile_resumed_system_prompt("new base prompt".to_string(), None)
            .expect("reconcile");

        assert_eq!(outcome, ResumedSystemPromptReconciliation::RewrittenBase);
        let system_content = match session.messages().first() {
            Some(Message::System(system)) => system.content.clone(),
            other => panic!("expected system message, got {other:?}"),
        };
        assert!(
            system_content.starts_with("new base prompt"),
            "the changed base must be applied: {system_content}"
        );
        assert!(
            system_content.contains("peer roster: lead-1, w-1"),
            "the runtime-applied context tail must survive the base change: {system_content}"
        );
        let state = session
            .transcript_history_state()
            .expect("history state deserializes")
            .expect("rewrite must record transcript history");
        assert_eq!(state.commits.len(), 1);
        assert_eq!(
            state.commits[0].reason.kind,
            RESUME_SYSTEM_PROMPT_REFRESH_REWRITE_REASON
        );
        assert_eq!(
            state.head,
            transcript_messages_digest(session.messages()).unwrap(),
            "the committed head must match the rewritten transcript"
        );
    }

    #[test]
    fn reconcile_resumed_system_prompt_inserts_prompt_on_promptless_transcript() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("hello".to_string())));

        let outcome = session
            .reconcile_resumed_system_prompt("late prompt".to_string(), None)
            .expect("reconcile");

        assert_eq!(outcome, ResumedSystemPromptReconciliation::RewrittenBase);
        assert!(matches!(
            session.messages().first(),
            Some(Message::System(system)) if system.content == "late prompt"
        ));
        let state = session
            .transcript_history_state()
            .expect("history state deserializes")
            .expect("insert must record transcript history");
        assert_eq!(state.commits.len(), 1);
        assert_eq!(
            state.commits[0].reason.kind,
            RESUME_SYSTEM_PROMPT_REFRESH_REWRITE_REASON
        );
    }

    fn leading_system_content(session: &Session) -> String {
        match session.messages().first() {
            Some(Message::System(system)) => system.content.clone(),
            other => panic!("expected leading system message, got {other:?}"),
        }
    }

    #[test]
    fn reconcile_resumed_system_prompt_preserves_full_context_prompt_from_empty_base() {
        // Promptless/empty-base build: appends compose as the WHOLE System
        // content with no separator prefix. A resume with a non-empty
        // explicit base must carry the verified all-context tail onto the
        // new base instead of discarding it as an "empty tail".
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("hello".to_string())));
        session.append_system_context_blocks(std::slice::from_ref(&roster_append()));
        let all_context_content = leading_system_content(&session);
        assert!(all_context_content.contains("peer roster: lead-1, w-1"));

        let outcome = session
            .reconcile_resumed_system_prompt("new base prompt".to_string(), None)
            .expect("reconcile");

        assert_eq!(outcome, ResumedSystemPromptReconciliation::RewrittenBase);
        assert_eq!(
            leading_system_content(&session),
            format!("new base prompt{SYSTEM_CONTEXT_SEPARATOR}{all_context_content}"),
            "the all-context prompt must survive as the runtime tail of the new base"
        );
    }

    #[test]
    fn reconcile_resumed_system_prompt_preserves_context_only_prompt_on_empty_base_resume() {
        // Empty-base → empty-base resume: the all-context prompt IS the
        // expected composition; it must be preserved untouched.
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("hello".to_string())));
        session.append_system_context_blocks(std::slice::from_ref(&roster_append()));
        let digest_before = transcript_messages_digest(session.messages()).unwrap();

        let outcome = session
            .reconcile_resumed_system_prompt(String::new(), None)
            .expect("reconcile");

        assert_eq!(
            outcome,
            ResumedSystemPromptReconciliation::PreservedContinuation
        );
        assert_eq!(
            transcript_messages_digest(session.messages()).unwrap(),
            digest_before
        );
    }

    #[test]
    fn reconcile_resumed_system_prompt_applies_shortened_base_with_recorded_prior() {
        // The separator is ordinary markdown: a base prompt may legitimately
        // contain it. Shortening the base must be APPLIED (audited rewrite),
        // not silently classified as a preserved context-append continuation.
        let full_base = format!("part one{SYSTEM_CONTEXT_SEPARATOR}part two");
        let mut session = Session::new();
        session.set_system_prompt(full_base.clone());
        session.push(Message::User(UserMessage::text("hello".to_string())));
        session
            .set_build_state(SessionBuildState {
                assembled_system_prompt: Some(full_base),
                ..Default::default()
            })
            .expect("build state");

        let outcome = session
            .reconcile_resumed_system_prompt("part one".to_string(), None)
            .expect("reconcile");

        assert_eq!(outcome, ResumedSystemPromptReconciliation::RewrittenBase);
        assert_eq!(leading_system_content(&session), "part one");
    }

    #[test]
    fn reconcile_resumed_system_prompt_applies_shortened_base_without_context_provenance() {
        // No recorded prior base, no applied records, and the persisted
        // prompt's mutation provenance is not a runtime context append: the
        // machine rejects the structural-extends continuation, so the
        // shortened base is applied instead of silently ignored.
        let full_base = format!("part one{SYSTEM_CONTEXT_SEPARATOR}part two");
        let mut session = Session::new();
        session.set_system_prompt(full_base);
        session.push(Message::User(UserMessage::text("hello".to_string())));

        let outcome = session
            .reconcile_resumed_system_prompt("part one".to_string(), None)
            .expect("reconcile");

        assert_eq!(outcome, ResumedSystemPromptReconciliation::RewrittenBase);
        assert_eq!(leading_system_content(&session), "part one");
    }

    #[test]
    fn reconcile_resumed_system_prompt_preserves_appended_prompt_without_applied_records() {
        // The runtime persistence path sweeps applied records and pre-0.7.15
        // rows have no recorded assembled base. The typed
        // RuntimeContextAppend provenance on the persisted message still
        // admits the continuation through the machine fast path.
        let mut session = resumed_session_with_context_appended_prompt("base prompt");
        session
            .set_system_context_state(SessionSystemContextState::default())
            .expect("sweep applied records");
        let digest_before = transcript_messages_digest(session.messages()).unwrap();

        let outcome = session
            .reconcile_resumed_system_prompt("base prompt".to_string(), None)
            .expect("reconcile");

        assert_eq!(
            outcome,
            ResumedSystemPromptReconciliation::PreservedContinuation
        );
        assert_eq!(
            transcript_messages_digest(session.messages()).unwrap(),
            digest_before
        );
    }

    #[test]
    fn reconcile_resumed_system_prompt_clears_orphaned_applied_records_on_tail_drop() {
        let mut session = resumed_session_with_context_appended_prompt("base prompt");
        // An out-of-band prompt mutation makes the applied records'
        // re-render no longer reproduce the persisted content (and no
        // assembled base was recorded): the tail is unverifiable and must be
        // dropped by the rewrite.
        session.set_system_prompt(format!(
            "mutated base{SYSTEM_CONTEXT_SEPARATOR}stale-looking tail"
        ));

        let outcome = session
            .reconcile_resumed_system_prompt("new base prompt".to_string(), None)
            .expect("reconcile");

        assert_eq!(outcome, ResumedSystemPromptReconciliation::RewrittenBase);
        assert_eq!(leading_system_content(&session), "new base prompt");
        let state = session.system_context_state().unwrap_or_default();
        assert!(
            state.applied.is_empty(),
            "orphaned applied records must be cleared so the context stays restorable"
        );
        assert!(
            state.seen.is_empty(),
            "orphaned idempotency keys must be cleared so keyed re-sends re-apply"
        );

        // A host re-send of the same keyed append restores the context
        // instead of deduplicating against the dropped application.
        session.append_system_context_blocks(std::slice::from_ref(&roster_append()));
        assert!(
            leading_system_content(&session).contains("peer roster: lead-1, w-1"),
            "re-sent keyed context must re-apply after the drop"
        );
    }

    #[test]
    fn append_system_context_blocks_renders_pre_marked_pending_context() {
        let accepted_at = SystemTime::UNIX_EPOCH;
        let mut state = SessionSystemContextState::default();
        state
            .stage_append(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::run_primitive::CoreRenderable::text(
                        "Apply this staged context at the request boundary.".to_string(),
                    ),
                    source: Some("rpc/session_inject_context".to_string()),
                    idempotency_key: Some("ctx-boundary".to_string()),
                    source_kind: SystemContextSource::Normal,
                    peer_response_terminal: None,
                },
                accepted_at,
            )
            .expect("append should stage");
        let pending = state.pending.clone();
        state.mark_pending_applied();
        let mut session = Session::new();
        session
            .set_system_context_state(state)
            .expect("state should serialize");

        session.append_system_context_blocks(&pending);

        let system_prompt = session
            .messages()
            .first()
            .and_then(|message| match message {
                Message::System(system) => Some(system.content.as_str()),
                _ => None,
            })
            .unwrap_or_default();
        assert!(system_prompt.contains("Apply this staged context at the request boundary."));
        let state = session
            .system_context_state()
            .expect("append should persist typed context state");
        assert_eq!(state.applied.len(), 1);
        assert_eq!(
            state.seen["ctx-boundary"].state,
            SeenSystemContextState::Applied
        );
    }

    #[test]
    fn append_system_context_blocks_renders_pre_marked_context_without_idempotency_key() {
        let accepted_at = SystemTime::UNIX_EPOCH;
        let mut state = SessionSystemContextState::default();
        state
            .stage_append(
                &AppendSystemContextRequest {
                    content: crate::lifecycle::run_primitive::CoreRenderable::text(
                        "Apply this unkeyed staged context at the request boundary.".to_string(),
                    ),
                    source: Some("rpc/session_inject_context".to_string()),
                    idempotency_key: None,
                    source_kind: SystemContextSource::Normal,
                    peer_response_terminal: None,
                },
                accepted_at,
            )
            .expect("append should stage");
        let pending = state.pending.clone();
        state.mark_pending_applied();
        let mut session = Session::new();
        session
            .set_system_context_state(state)
            .expect("state should serialize");

        session.append_system_context_blocks(&pending);

        let system_prompt = session
            .messages()
            .first()
            .and_then(|message| match message {
                Message::System(system) => Some(system.content.as_str()),
                _ => None,
            })
            .unwrap_or_default();
        assert!(
            system_prompt.contains("Apply this unkeyed staged context at the request boundary.")
        );
    }

    /// K5 invariant: the typed `CoreRenderable` travels end-to-end through
    /// staging — the pending append stores the renderable itself, and the
    /// ONE lowering to prompt text happens at the transcript render seam.
    #[test]
    fn staged_system_context_carries_typed_renderable_to_render_seam() {
        use crate::lifecycle::run_primitive::CoreRenderable;

        let accepted_at = SystemTime::UNIX_EPOCH;
        let mut state = SessionSystemContextState::default();
        let renderable = CoreRenderable::Json {
            value: serde_json::json!({"alert": "disk-full", "severity": 2}),
        };
        state
            .stage_append(
                &AppendSystemContextRequest {
                    content: renderable.clone(),
                    source: Some("ops/monitor".to_string()),
                    idempotency_key: Some("alert-1".to_string()),
                    source_kind: SystemContextSource::Normal,
                    peer_response_terminal: None,
                },
                accepted_at,
            )
            .expect("typed renderable append should stage");

        // The pending append owns the typed renderable — no pre-flattened
        // text shadow exists anywhere on the staging path.
        assert_eq!(state.pending.len(), 1);
        assert_eq!(state.pending[0].content, renderable);

        // Lowering happens exactly once, at the render seam, via the single
        // canonical projection.
        let rendered = render_system_context_block(&state.pending[0]);
        assert!(rendered.starts_with(SYSTEM_CONTEXT_RENDER_LABEL));
        assert!(
            rendered.contains(renderable.render_text().trim()),
            "render seam must lower via CoreRenderable::render_text: {rendered}"
        );
    }

    #[test]
    fn append_system_context_blocks_skips_duplicate_idempotency_key() {
        let first = PendingSystemContextAppend {
            content: crate::lifecycle::run_primitive::CoreRenderable::text(
                "Authoritative peer token is birch seventeen.".to_string(),
            ),
            source: Some("peer_response_terminal:analyst:req-1".to_string()),
            idempotency_key: Some("req-1".to_string()),
            source_kind: SystemContextSource::Normal,
            peer_response_terminal: None,
            accepted_at: SystemTime::UNIX_EPOCH,
        };
        let duplicate = PendingSystemContextAppend {
            accepted_at: SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(1),
            ..first.clone()
        };
        let mut session = Session::new();

        session.append_system_context_blocks(std::slice::from_ref(&first));
        session.append_system_context_blocks(std::slice::from_ref(&duplicate));

        let state = session
            .system_context_state()
            .expect("append should persist typed context state");
        assert_eq!(state.applied, vec![first]);
        let system_prompt = session
            .messages()
            .first()
            .and_then(|message| match message {
                Message::System(system) => Some(system.content.as_str()),
                _ => None,
            })
            .unwrap_or_default();
        assert_eq!(
            system_prompt
                .matches("Authoritative peer token is birch seventeen.")
                .count(),
            1
        );
    }

    #[test]
    fn append_system_context_blocks_skips_conflicting_duplicate_idempotency_key() {
        let first = PendingSystemContextAppend {
            content: crate::lifecycle::run_primitive::CoreRenderable::text(
                "Authoritative peer token is birch seventeen.".to_string(),
            ),
            source: Some("peer_response_terminal:analyst:req-1".to_string()),
            idempotency_key: Some("req-1".to_string()),
            source_kind: SystemContextSource::Normal,
            peer_response_terminal: None,
            accepted_at: SystemTime::UNIX_EPOCH,
        };
        let conflicting = PendingSystemContextAppend {
            content: crate::lifecycle::run_primitive::CoreRenderable::text(
                "Conflicting peer token should not reach the prompt.".to_string(),
            ),
            accepted_at: SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(1),
            ..first.clone()
        };
        let mut session = Session::new();

        session.append_system_context_blocks(std::slice::from_ref(&first));
        session.append_system_context_blocks(std::slice::from_ref(&conflicting));

        let state = session
            .system_context_state()
            .expect("append should persist typed context state");
        assert_eq!(state.applied, vec![first]);
        let system_prompt = session
            .messages()
            .first()
            .and_then(|message| match message {
                Message::System(system) => Some(system.content.as_str()),
                _ => None,
            })
            .unwrap_or_default();
        assert!(system_prompt.contains("Authoritative peer token is birch seventeen."));
        assert!(!system_prompt.contains("Conflicting peer token should not reach the prompt."));
    }

    // ------------------------------------------------------------------
    // T9/T10: realtime transcript lane materialization.
    //
    // The display-text lane (`AssistantTextDelta`) materializes as
    // `AssistantBlock::Text`; the spoken-transcript lane
    // (`AssistantTranscriptDelta`) materializes as
    // `AssistantBlock::Transcript { source: TranscriptSource::Spoken }`.
    // These regressions pin both flushes and prove the materializer
    // dispatches on the per-item `TranscriptLane`.
    // ------------------------------------------------------------------

    #[test]
    fn realtime_transcript_assistant_transcript_delta_materializes_transcript_block() {
        let mut session = Session::new();

        let delta = RealtimeTranscriptEvent::AssistantTranscriptDelta {
            response_id: "resp_spoken".to_string(),
            delta_id: "evt_delta_spoken_1".to_string(),
            item_id: "item_spoken".to_string(),
            previous_item_id: None,
            content_index: 0,
            delta: "I said hi".to_string(),
        };
        assert!(
            session.append_realtime_transcript_event(delta).is_inert(),
            "delta alone is inert until turn-completed flushes"
        );

        let terminal = RealtimeTranscriptEvent::AssistantTurnCompleted {
            response_id: "resp_spoken".to_string(),
            stop_reason: StopReason::EndTurn,
            usage: Usage::default(),
        };
        let outcome = session.append_realtime_transcript_event(terminal);
        assert_eq!(outcome.materialized_messages.len(), 1);

        // T9/T10: must be a Transcript block, NOT Text.
        let messages = session.messages();
        assert_eq!(messages.len(), 1);
        match &messages[0] {
            Message::BlockAssistant(assistant) => {
                assert_eq!(assistant.blocks.len(), 1);
                match &assistant.blocks[0] {
                    AssistantBlock::Transcript { text, source, .. } => {
                        assert_eq!(text, "I said hi");
                        assert_eq!(*source, crate::types::TranscriptSource::Spoken);
                    }
                    other => unreachable!(
                        "AssistantTranscriptDelta must materialize as AssistantBlock::Transcript, got {other:?}"
                    ),
                }
            }
            other => unreachable!("expected BlockAssistant message, got {other:?}"),
        }
    }

    #[test]
    fn round4_cc4_in_flight_response_ids_lists_distinct_unmaterialized_responses() {
        // CC4 (Round-4 architectural reconciliation): the helper that
        // powers `signal_turn_interrupt`'s cross-layer fan-out must
        // return every distinct provider response_id that has at least
        // one unmaterialized assistant item, EXCLUDING already-discarded
        // responses and EXCLUDING the user role.
        let mut session = Session::new();

        // Two transcript-delta items on resp_a (different content_index
        // ranges), one on resp_b. resp_c gets a delta and is then
        // discarded explicitly via AssistantTurnInterrupted.
        for (i, response_id) in [
            ("resp_a", "resp_a"),
            ("resp_a_extra", "resp_a"),
            ("resp_b", "resp_b"),
            ("resp_c", "resp_c"),
        ]
        .iter()
        .enumerate()
        {
            let event = RealtimeTranscriptEvent::AssistantTranscriptDelta {
                response_id: response_id.1.to_string(),
                delta_id: format!("delta_{i}"),
                item_id: response_id.0.to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "x".to_string(),
            };
            let _ = session.append_realtime_transcript_event(event);
        }

        // Discard resp_c — it should not appear in the in-flight list.
        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnInterrupted {
                response_id: "resp_c".to_string(),
            },
        );

        // User-role item should never appear (CC4 only fans interrupts
        // to assistant responses).
        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::UserTranscriptFinal {
                item_id: "u_item".to_string(),
                previous_item_id: None,
                content_index: 0,
                text: "hi".to_string(),
            },
        );

        let in_flight = session.in_flight_realtime_assistant_response_ids();
        assert!(in_flight.contains(&"resp_a".to_string()), "{in_flight:?}");
        assert!(in_flight.contains(&"resp_b".to_string()), "{in_flight:?}");
        assert!(
            !in_flight.contains(&"resp_c".to_string()),
            "discarded response must not appear in in_flight: {in_flight:?}"
        );
        // resp_a appears exactly once even though two items reference it.
        assert_eq!(
            in_flight.iter().filter(|r| *r == "resp_a").count(),
            1,
            "distinct response_ids only: {in_flight:?}"
        );
    }

    #[test]
    fn round4_cc2_assistant_turn_completed_after_transcript_deltas_materializes_transcript() {
        // CC2 (Round-4 architectural reconciliation): once
        // `signal_turn_completed` synthesizes
        // `RealtimeTranscriptEvent::AssistantTurnCompleted`, the staging
        // materializer commits every staged transcript-delta item for
        // that response_id as `AssistantBlock::Transcript { Spoken }`.
        // This pins the production end-to-end shape the sink relies on.
        let mut session = Session::new();

        let delta = RealtimeTranscriptEvent::AssistantTranscriptDelta {
            response_id: "resp_cc2".to_string(),
            delta_id: "delta_cc2_1".to_string(),
            item_id: "item_cc2".to_string(),
            previous_item_id: None,
            content_index: 0,
            delta: "hello world".to_string(),
        };
        assert!(session.append_realtime_transcript_event(delta).is_inert());

        // Pre-completion: in-flight list reports resp_cc2.
        assert_eq!(
            session.in_flight_realtime_assistant_response_ids(),
            vec!["resp_cc2".to_string()]
        );

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_cc2".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert_eq!(outcome.materialized_messages.len(), 1);

        // Post-completion: in-flight list is empty (item is materialized).
        assert!(
            session
                .in_flight_realtime_assistant_response_ids()
                .is_empty(),
            "materialized items must not appear in in_flight_realtime_assistant_response_ids"
        );

        let messages = session.messages();
        let assistant = messages.iter().find_map(|m| match m {
            Message::BlockAssistant(a) => Some(a),
            _ => None,
        });
        let assistant = assistant.expect("assistant block message expected");
        assert_eq!(assistant.blocks.len(), 1);
        assert!(matches!(
            &assistant.blocks[0],
            AssistantBlock::Transcript {
                source: crate::types::TranscriptSource::Spoken,
                ..
            }
        ));
    }

    #[test]
    fn realtime_transcript_assistant_text_delta_still_materializes_text_block() {
        // Counter-regression: the display-text lane must continue to
        // produce `AssistantBlock::Text` after T9/T10. Prevents an
        // accidental cross-lane flip.
        let mut session = Session::new();

        let delta = RealtimeTranscriptEvent::AssistantTextDelta {
            response_id: "resp_display".to_string(),
            delta_id: "evt_delta_display_1".to_string(),
            item_id: "item_display".to_string(),
            previous_item_id: None,
            content_index: 0,
            delta: "I wrote".to_string(),
        };
        let _ = session.append_realtime_transcript_event(delta);

        let terminal = RealtimeTranscriptEvent::AssistantTurnCompleted {
            response_id: "resp_display".to_string(),
            stop_reason: StopReason::EndTurn,
            usage: Usage::default(),
        };
        let outcome = session.append_realtime_transcript_event(terminal);
        assert_eq!(outcome.materialized_messages.len(), 1);

        let messages = session.messages();
        match &messages[0] {
            Message::BlockAssistant(assistant) => match &assistant.blocks[0] {
                AssistantBlock::Text { text, .. } => assert_eq!(text, "I wrote"),
                other => unreachable!(
                    "AssistantTextDelta must keep materializing AssistantBlock::Text, got {other:?}"
                ),
            },
            other => unreachable!("expected BlockAssistant message, got {other:?}"),
        }
    }

    #[test]
    fn round4_cc7_mixed_response_persists_text_and_transcript_in_order() {
        // CC7 (Round-4 adversarial-verifier follow-up): a single mixed-modality
        // realtime response that emits BOTH display-text deltas
        // (`AssistantTextDelta`) AND spoken-transcript deltas
        // (`AssistantTranscriptDelta`) under the same response_id must
        // materialize as ONE `Message::BlockAssistant` whose `blocks` field
        // contains exactly two ordered entries:
        //   1. AssistantBlock::Text       (display-text lane)
        //   2. AssistantBlock::Transcript { source: Spoken } (spoken lane)
        // Pre-fix the materializer emitted one Message::BlockAssistant per
        // staged item, splitting the mixed response into two messages.
        //
        // This test drives the production materializer end-to-end: deltas
        // stage in `SessionRealtimeTranscriptState`; `AssistantTurnCompleted`
        // triggers the materializer; canonical history is the assertion
        // surface — exactly the same code path that
        // `SessionServiceProjectionSink::signal_turn_completed` invokes via
        // `runtime.append_realtime_transcript_event` in production.
        let mut session = Session::new();

        // Provider-arrival order: display first, then spoken.
        let display_a = RealtimeTranscriptEvent::AssistantTextDelta {
            response_id: "resp_mixed_1".to_string(),
            delta_id: "delta_disp_1".to_string(),
            item_id: "item_display".to_string(),
            previous_item_id: None,
            content_index: 0,
            delta: "Here's the report:".to_string(),
        };
        assert!(
            session
                .append_realtime_transcript_event(display_a)
                .is_inert()
        );

        let display_b = RealtimeTranscriptEvent::AssistantTextDelta {
            response_id: "resp_mixed_1".to_string(),
            delta_id: "delta_disp_2".to_string(),
            item_id: "item_display".to_string(),
            previous_item_id: None,
            content_index: 0,
            delta: " (still writing)".to_string(),
        };
        assert!(
            session
                .append_realtime_transcript_event(display_b)
                .is_inert()
        );

        // Spoken items chain after the display item to mirror provider
        // arrival semantics — `previous_item_id` carries arrival ordering
        // that the materializer must preserve as block ordering inside the
        // single emitted message.
        let spoken_a = RealtimeTranscriptEvent::AssistantTranscriptDelta {
            response_id: "resp_mixed_1".to_string(),
            delta_id: "delta_spoken_1".to_string(),
            item_id: "item_spoken".to_string(),
            previous_item_id: Some("item_display".to_string()),
            content_index: 0,
            delta: "I'm reading the report aloud:".to_string(),
        };
        assert!(
            session
                .append_realtime_transcript_event(spoken_a)
                .is_inert()
        );

        let spoken_b = RealtimeTranscriptEvent::AssistantTranscriptDelta {
            response_id: "resp_mixed_1".to_string(),
            delta_id: "delta_spoken_2".to_string(),
            item_id: "item_spoken".to_string(),
            previous_item_id: Some("item_display".to_string()),
            content_index: 0,
            delta: " sentence two.".to_string(),
        };
        assert!(
            session
                .append_realtime_transcript_event(spoken_b)
                .is_inert()
        );

        // TurnCompleted triggers the materializer to flush all staged items
        // for this response_id into ONE BlockAssistant message.
        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_mixed_1".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage {
                    input_tokens: 11,
                    output_tokens: 22,
                    cache_creation_tokens: None,
                    cache_read_tokens: None,
                },
            },
        );
        // Materializer reports two staged items got materialized.
        assert_eq!(outcome.materialized_messages.len(), 2);

        // Canonical history MUST contain exactly ONE BlockAssistant message
        // (the CC7 fix: mixed lanes interleave into one message, not two).
        let messages = session.messages();
        let assistants: Vec<&BlockAssistantMessage> = messages
            .iter()
            .filter_map(|m| match m {
                Message::BlockAssistant(a) => Some(a),
                _ => None,
            })
            .collect();
        assert_eq!(
            assistants.len(),
            1,
            "mixed display+spoken response under one response_id must produce exactly ONE BlockAssistant message, got: {assistants:?}"
        );
        let assistant = assistants[0];
        assert_eq!(
            assistant.blocks.len(),
            2,
            "mixed response message must carry both blocks: {:?}",
            assistant.blocks
        );

        // Block 0: display-text (concatenated deltas).
        match &assistant.blocks[0] {
            AssistantBlock::Text { text, .. } => {
                assert_eq!(text, "Here's the report: (still writing)");
            }
            other => unreachable!(
                "first block must be AssistantBlock::Text (display lane), got {other:?}"
            ),
        }
        // Block 1: spoken transcript (concatenated deltas), tagged Spoken.
        match &assistant.blocks[1] {
            AssistantBlock::Transcript { text, source, .. } => {
                assert_eq!(text, "I'm reading the report aloud: sentence two.");
                assert_eq!(*source, crate::types::TranscriptSource::Spoken);
            }
            other => unreachable!(
                "second block must be AssistantBlock::Transcript {{ source: Spoken }}, got {other:?}"
            ),
        }

        // Usage was recorded once for the turn.
        assert_eq!(session.usage.input_tokens, 11);
        assert_eq!(session.usage.output_tokens, 22);
    }

    #[test]
    fn round5_r55_mixed_response_barge_in_preserves_display_drops_spoken() {
        // R5-5 (Round-5 contract update): barge-in MUST filter staged items
        // by lane — `Spoken` is invalidated (the user spoke over the audio
        // they were hearing) but `Display` survives as committed history
        // (sideband display text from the same response is not "spoken
        // over"). Round-4's `round4_cc7_mixed_response_barge_in_discards_*`
        // pinned the wrong invariant; this test replaces it.
        //
        // Architectural decision: `AssistantTurnInterrupted` is terminal for
        // the response on the realtime-staging path — any later
        // `AssistantTurnCompleted { stop_reason: Cancelled }` short-circuits
        // via the `discarded_assistant_response_ids` guard. So the
        // Interrupted handler must seed a synthetic
        // `assistant_completions` entry (`StopReason::Cancelled`,
        // `Usage::default()`) so retained Display items materialize
        // immediately rather than stranding forever.
        let mut session = Session::new();

        let display = RealtimeTranscriptEvent::AssistantTextDelta {
            response_id: "resp_mixed_2".to_string(),
            delta_id: "delta_disp_1".to_string(),
            item_id: "item_display_2".to_string(),
            previous_item_id: None,
            content_index: 0,
            delta: "Working on the report...".to_string(),
        };
        let _ = session.append_realtime_transcript_event(display);

        let spoken = RealtimeTranscriptEvent::AssistantTranscriptDelta {
            response_id: "resp_mixed_2".to_string(),
            delta_id: "delta_spoken_1".to_string(),
            item_id: "item_spoken_2".to_string(),
            previous_item_id: Some("item_display_2".to_string()),
            content_index: 0,
            delta: "I'm reading the report".to_string(),
        };
        let _ = session.append_realtime_transcript_event(spoken);

        // Barge-in arrives BEFORE TurnCompleted. The Display item with
        // staged content materializes immediately under the synthetic
        // Cancelled completion.
        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnInterrupted {
                response_id: "resp_mixed_2".to_string(),
            },
        );
        assert_eq!(
            outcome.materialized_messages.len(),
            1,
            "Display lane item must materialize on Interrupted: {outcome:?}"
        );

        // A late `AssistantTurnCompleted` (the provider's response.done
        // emitted after cancel) must be a no-op: the Display item is
        // already materialized; the Spoken item was dropped at Interrupted.
        let late_completion = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_mixed_2".to_string(),
                stop_reason: StopReason::Cancelled,
                usage: Usage::default(),
            },
        );
        assert_eq!(
            late_completion.materialized_messages.len(),
            0,
            "post-barge-in TurnCompleted must not resurrect anything"
        );

        // Canonical history: exactly one BlockAssistant carrying the
        // Display text (no Transcript block — Spoken was dropped).
        let messages = session.messages();
        let assistants: Vec<&BlockAssistantMessage> = messages
            .iter()
            .filter_map(|m| match m {
                Message::BlockAssistant(a) => Some(a),
                _ => None,
            })
            .collect();
        assert_eq!(
            assistants.len(),
            1,
            "barge-in must commit exactly one BlockAssistant containing the Display lane: {assistants:?}"
        );
        let assistant = assistants[0];
        assert_eq!(assistant.blocks.len(), 1, "blocks: {:?}", assistant.blocks);
        match &assistant.blocks[0] {
            AssistantBlock::Text { text, .. } => {
                assert_eq!(text, "Working on the report...");
            }
            other => {
                unreachable!("Display lane must materialize as AssistantBlock::Text, got {other:?}")
            }
        }
        // No Transcript block — Spoken lane was dropped.
        assert!(
            !assistant
                .blocks
                .iter()
                .any(|b| matches!(b, AssistantBlock::Transcript { .. })),
            "Spoken lane must be dropped on barge-in"
        );

        // The in-flight tracker reports the response as no longer in flight
        // (the Display item is materialized; the Spoken item is skipped).
        assert!(
            !session
                .in_flight_realtime_assistant_response_ids()
                .contains(&"resp_mixed_2".to_string()),
            "barged-in response must not appear in in_flight_realtime_assistant_response_ids"
        );
    }

    #[test]
    fn round5_r55_barge_in_preserves_display_lane_drops_spoken() {
        // R5-5 unit test: pin the lane-filter behavior at the staged-item
        // level (no chained predecessor). One Display item, one Spoken item,
        // both unchained, both staged before Interrupted.
        let mut session = Session::new();

        let _ =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_a".to_string(),
                delta_id: "delta_d_1".to_string(),
                item_id: "item_display".to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "display-text".to_string(),
            });
        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTranscriptDelta {
                response_id: "resp_a".to_string(),
                delta_id: "delta_s_1".to_string(),
                item_id: "item_spoken".to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "spoken-transcript".to_string(),
            },
        );

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnInterrupted {
                response_id: "resp_a".to_string(),
            },
        );
        // Display materializes, Spoken does not.
        assert_eq!(outcome.materialized_messages.len(), 1);

        let messages = session.messages();
        let assistants: Vec<&BlockAssistantMessage> = messages
            .iter()
            .filter_map(|m| match m {
                Message::BlockAssistant(a) => Some(a),
                _ => None,
            })
            .collect();
        assert_eq!(assistants.len(), 1);
        // Single Text block (the Display lane) — no Transcript.
        assert_eq!(assistants[0].blocks.len(), 1);
        match &assistants[0].blocks[0] {
            AssistantBlock::Text { text, .. } => assert_eq!(text, "display-text"),
            other => unreachable!("expected Text, got {other:?}"),
        }
    }

    #[test]
    fn round5_r55_barge_in_finalizes_retained_display_into_committed_block() {
        // R5-5: the architectural decision — Interrupted is terminal for the
        // response. Display lane must commit at Interrupted time, not wait
        // on a hypothetical AssistantTurnCompleted that may never arrive
        // (or arrives Cancelled and short-circuits).
        let mut session = Session::new();

        let _ =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_a".to_string(),
                delta_id: "delta_d_1".to_string(),
                item_id: "item_display".to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "committed-display-text".to_string(),
            });

        // Pre-condition: nothing committed yet.
        assert!(session.messages().is_empty());

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnInterrupted {
                response_id: "resp_a".to_string(),
            },
        );
        assert_eq!(
            outcome.materialized_messages.len(),
            1,
            "Interrupted must finalize retained Display lane immediately"
        );

        // Post-condition: BlockAssistant in canonical history, no Transcript.
        let messages = session.messages();
        assert_eq!(messages.len(), 1);
        match &messages[0] {
            Message::BlockAssistant(assistant) => {
                assert_eq!(assistant.blocks.len(), 1);
                match &assistant.blocks[0] {
                    AssistantBlock::Text { text, .. } => {
                        assert_eq!(text, "committed-display-text");
                    }
                    other => unreachable!("expected Text, got {other:?}"),
                }
            }
            other => unreachable!("expected BlockAssistant, got {other:?}"),
        }
    }

    #[test]
    fn round5_r56_truncation_promotes_default_lane_item_to_spoken() {
        // R5-6: when truncation is the first content-bearing event for an
        // item (no prior delta), the staged item's lane MUST be promoted to
        // Spoken so the materializer commits as `AssistantBlock::Transcript`.
        // Without the explicit promotion, the lane stays `Display` (the
        // default) and the heard audio transcript persists as
        // `AssistantBlock::Text`.
        let mut session = Session::new();

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTranscriptTruncated {
                response_id: "resp_a".to_string(),
                item_id: "item_a".to_string(),
                content_index: 0,
                text: "what was actually heard".to_string(),
            },
        );

        let outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert_eq!(outcome.materialized_messages.len(), 1);

        assert_eq!(session.messages().len(), 1);
        match &session.messages()[0] {
            Message::BlockAssistant(assistant) => {
                assert_eq!(assistant.blocks.len(), 1);
                match &assistant.blocks[0] {
                    AssistantBlock::Transcript { text, source, .. } => {
                        assert_eq!(text, "what was actually heard");
                        assert_eq!(*source, crate::types::TranscriptSource::Spoken);
                    }
                    other => unreachable!(
                        "truncation-only path must materialize as AssistantBlock::Transcript, got {other:?}"
                    ),
                }
            }
            other => unreachable!("expected BlockAssistant, got {other:?}"),
        }
    }

    #[test]
    fn round5_r56_truncation_after_display_delta_is_no_op_keeping_display_content() {
        // R5-6 edge case: a Display delta arrived first and staged Display
        // content; a truncation event arrives for the SAME item id
        // (provider bug — truncation only applies to spoken/audio output).
        // Contract: the staged Display content must NOT be clobbered by
        // the truncation text. `promote_item_lane` keeps the existing
        // Display lane and emits a `tracing::warn!`; the truncation arm
        // sees the lane stayed Display and skips the segment-write.
        let mut session = Session::new();

        let _ =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_a".to_string(),
                delta_id: "delta_d_1".to_string(),
                item_id: "item_a".to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "display-text-from-delta".to_string(),
            });

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTranscriptTruncated {
                response_id: "resp_a".to_string(),
                item_id: "item_a".to_string(),
                content_index: 0,
                text: "spoken-truncation-text".to_string(),
            },
        );

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );

        // Display content survives unchanged — the truncation text was
        // refused. Materializes as `AssistantBlock::Text` (Display lane).
        assert_eq!(session.messages().len(), 1);
        match &session.messages()[0] {
            Message::BlockAssistant(assistant) => {
                assert_eq!(assistant.blocks.len(), 1);
                match &assistant.blocks[0] {
                    AssistantBlock::Text { text, .. } => {
                        assert_eq!(text, "display-text-from-delta");
                    }
                    other => unreachable!(
                        "Display content must survive misrouted truncation, got {other:?}"
                    ),
                }
            }
            other => unreachable!("expected BlockAssistant, got {other:?}"),
        }
    }

    /// R5-6 sibling: a Spoken-classified item (transcript-truncation
    /// arrived first and locked the lane to Spoken) must reject a later
    /// `AssistantTextDelta` rather than silently appending the Display
    /// text into the Spoken-locked content_segment. Pre-fix the delta
    /// arm called `promote_item_lane` and unconditionally pushed the
    /// delta — clobbering the lane invariant. Post-fix the delta is
    /// dropped (warn fires) and the Spoken-truncation text survives.
    #[test]
    fn round5_r56_sibling_display_delta_skipped_on_spoken_item() {
        let mut session = Session::new();

        // Truncation arrives first and locks the item to the Spoken lane.
        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTranscriptTruncated {
                response_id: "resp_a".to_string(),
                item_id: "item_a".to_string(),
                content_index: 0,
                text: "what was actually heard".to_string(),
            },
        );

        // A Display delta arrives later for the SAME item id (provider
        // lane-classification bug). It MUST be dropped.
        let _ =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_a".to_string(),
                delta_id: "delta_d_1".to_string(),
                item_id: "item_a".to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "should-not-appear".to_string(),
            });

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );

        // The Spoken-truncation text survives intact; no Display text
        // leaked into the Spoken lane content.
        assert_eq!(session.messages().len(), 1);
        match &session.messages()[0] {
            Message::BlockAssistant(assistant) => {
                assert_eq!(assistant.blocks.len(), 1);
                match &assistant.blocks[0] {
                    AssistantBlock::Transcript { text, source, .. } => {
                        assert_eq!(text, "what was actually heard");
                        assert_eq!(*source, crate::types::TranscriptSource::Spoken);
                    }
                    other => unreachable!(
                        "Spoken-locked item must materialize as Transcript, got {other:?}"
                    ),
                }
            }
            other => unreachable!("expected BlockAssistant, got {other:?}"),
        }
    }

    /// R5-6 sibling: a Display-classified item (a Display delta arrived
    /// first and locked the lane to Display) must reject a later
    /// `AssistantTranscriptDelta` rather than appending the Spoken text
    /// into the Display-locked content_segment. Pre-fix the transcript
    /// delta arm called `promote_item_lane` and unconditionally pushed —
    /// silently mixing a Spoken stream into a Display block.
    #[test]
    fn round5_r56_sibling_spoken_delta_skipped_on_display_item() {
        let mut session = Session::new();

        // Display delta arrives first and locks the item to the Display lane.
        let _ =
            session.append_realtime_transcript_event(RealtimeTranscriptEvent::AssistantTextDelta {
                response_id: "resp_a".to_string(),
                delta_id: "delta_d_1".to_string(),
                item_id: "item_a".to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "display-locked-text".to_string(),
            });

        // A spoken-transcript delta arrives later for the SAME item id
        // (provider lane-classification bug). It MUST be dropped.
        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTranscriptDelta {
                response_id: "resp_a".to_string(),
                delta_id: "delta_s_1".to_string(),
                item_id: "item_a".to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "should-not-appear".to_string(),
            },
        );

        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );

        // The Display text survives intact; no Spoken text leaked in.
        assert_eq!(session.messages().len(), 1);
        match &session.messages()[0] {
            Message::BlockAssistant(assistant) => {
                assert_eq!(assistant.blocks.len(), 1);
                match &assistant.blocks[0] {
                    AssistantBlock::Text { text, .. } => {
                        assert_eq!(text, "display-locked-text");
                    }
                    other => {
                        unreachable!("Display-locked item must materialize as Text, got {other:?}")
                    }
                }
            }
            other => unreachable!("expected BlockAssistant, got {other:?}"),
        }
    }

    /// R5-7: a late `AssistantTranscriptFinalText` arriving AFTER
    /// `AssistantTurnCompleted` already materialized the item must NOT
    /// mutate `content_segments` and must NOT rewrite the canonical
    /// `Message::BlockAssistant` (append-only history is a stronger
    /// invariant than typed text repair). The committed message keeps
    /// the delta-accumulated text; the late final is dropped with a
    /// warn; the materializer outcome is inert (no new messages).
    #[test]
    fn round5_r57_late_final_text_after_turn_completed_warns_and_skips() {
        let mut session = Session::new();

        // Delta accumulates partial text on the Spoken lane.
        let _ = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTranscriptDelta {
                response_id: "resp_a".to_string(),
                delta_id: "delta_s_1".to_string(),
                item_id: "item_a".to_string(),
                previous_item_id: None,
                content_index: 0,
                delta: "delta-accumulated".to_string(),
            },
        );

        // TurnCompleted materializes the item with the delta-accumulated text.
        let commit_outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTurnCompleted {
                response_id: "resp_a".to_string(),
                stop_reason: StopReason::EndTurn,
                usage: Usage::default(),
            },
        );
        assert_eq!(commit_outcome.materialized_messages.len(), 1);

        // Late FinalText arrives — provider-side ordering bug. It MUST
        // be dropped: no canonical message rewrite, no segment mutation,
        // outcome is inert.
        let late_outcome = session.append_realtime_transcript_event(
            RealtimeTranscriptEvent::AssistantTranscriptFinalText {
                response_id: "resp_a".to_string(),
                item_id: "item_a".to_string(),
                content_index: 0,
                text: "authoritative-final-that-must-not-land".to_string(),
            },
        );
        assert!(
            late_outcome.is_inert(),
            "late FinalText after materialization must produce inert outcome"
        );

        // Canonical history: still one message with the original
        // delta-accumulated text — NOT the authoritative final.
        assert_eq!(session.messages().len(), 1);
        match &session.messages()[0] {
            Message::BlockAssistant(assistant) => {
                assert_eq!(assistant.blocks.len(), 1);
                match &assistant.blocks[0] {
                    AssistantBlock::Transcript { text, .. } => {
                        assert_eq!(
                            text, "delta-accumulated",
                            "canonical message must preserve delta-accumulated text; \
                             append-only history forbids late FinalText repair"
                        );
                    }
                    other => unreachable!("expected Transcript, got {other:?}"),
                }
            }
            other => unreachable!("expected BlockAssistant, got {other:?}"),
        }
    }

    fn metadata_seam_session_metadata() -> SessionMetadata {
        SessionMetadata {
            schema_version: SESSION_METADATA_SCHEMA_VERSION,
            model: "test-model".to_string(),
            max_tokens: 1024,
            structured_output_retries: 2,
            provider: Provider::Anthropic,
            self_hosted_server_id: None,
            provider_params: None,
            tooling: SessionTooling::default(),
            keep_alive: false,
            comms_name: Some("team/reviewer/alice".to_string()),
            peer_meta: None,
            realm_id: None,
            instance_id: None,
            backend: None,
            config_generation: None,
            auth_binding: None,
            mob_member_binding: Some(crate::MobMemberBinding {
                mob_id: "team".to_string(),
                role: "reviewer".to_string(),
                member: "alice".to_string(),
            }),
        }
    }

    /// Lockstep pin: the metadata-only partial decode must read the exact
    /// envelope that `SessionSerde` writes. If a field rename or serde-shape
    /// change lands on the full envelope without the partial decoder
    /// following, this test fails.
    #[test]
    fn session_metadata_document_lockstep_with_full_envelope() {
        let mut session = Session::new();
        session.push(Message::User(UserMessage::text("hello".to_string())));
        session
            .set_session_metadata(metadata_seam_session_metadata())
            .expect("session metadata should persist");
        session
            .set_lifecycle_terminal(SessionLifecycleTerminal::Archived)
            .expect("lifecycle terminal should persist");

        let bytes = serde_json::to_vec(&session).expect("session should serialize");
        let document = session_metadata_document_from_slice(&bytes)
            .expect("partial decode must accept the canonical envelope");

        assert_eq!(document.session_id(), session.id());
        assert_eq!(
            document.session_metadata_value(),
            session.metadata().get(SESSION_METADATA_KEY),
            "partial decode must project the identical raw session-metadata value"
        );
        assert_eq!(
            document.lifecycle_terminal_value(),
            session.metadata().get(SESSION_LIFECYCLE_TERMINAL_KEY),
            "partial decode must project the identical raw lifecycle-terminal value"
        );

        let view = document
            .try_into_view()
            .expect("typed view must decode from the partial document");
        let full_view =
            PersistedSessionMetadataView::try_from_session(&session).expect("full-session view");
        assert_eq!(view.session_id, full_view.session_id);
        assert_eq!(
            view.session_metadata.as_ref().map(|m| m.model.clone()),
            full_view.session_metadata.as_ref().map(|m| m.model.clone())
        );
        assert_eq!(
            view.mob_member_binding(),
            full_view.mob_member_binding(),
            "typed binding must be identical across the two decode paths"
        );
        assert_eq!(
            view.lifecycle_terminal,
            Some(SessionLifecycleTerminal::Archived)
        );
        assert_eq!(
            full_view.lifecycle_terminal,
            Some(SessionLifecycleTerminal::Archived)
        );
    }

    /// The metadata-only partial decode fails closed on an unsupported
    /// envelope version — same contract as the full deserializer.
    #[test]
    fn session_metadata_document_fails_closed_on_envelope_version() {
        let session = Session::new();
        let mut value = serde_json::to_value(&session).expect("session should serialize");
        value["version"] = serde_json::json!(SESSION_VERSION + 999);
        let bytes = serde_json::to_vec(&value).expect("mangled envelope should serialize");

        session_metadata_document_from_slice(&bytes)
            .expect_err("an unsupported envelope version must fail the partial decode closed");
    }

    /// Corrupt values under either reserved key are a read FAULT for the
    /// metadata view — never coalesced into "absent".
    #[test]
    fn persisted_session_metadata_view_fails_closed_on_corrupt_values() {
        let session_id = SessionId::new();

        let mut corrupt_metadata = serde_json::Map::new();
        corrupt_metadata.insert(SESSION_METADATA_KEY.to_string(), serde_json::json!(42));
        PersistedSessionMetadataView::try_from_metadata_map(session_id.clone(), &corrupt_metadata)
            .expect_err("corrupt session_metadata must fail the view decode closed");

        let mut corrupt_terminal = serde_json::Map::new();
        corrupt_terminal.insert(
            SESSION_LIFECYCLE_TERMINAL_KEY.to_string(),
            serde_json::json!("definitely-not-a-terminal"),
        );
        PersistedSessionMetadataView::try_from_metadata_map(session_id, &corrupt_terminal)
            .expect_err("corrupt lifecycle terminal must fail the view decode closed");
    }

    /// Absent reserved keys decode as typed absence through the view.
    #[test]
    fn persisted_session_metadata_view_reads_absent_facts_as_none() {
        let view = PersistedSessionMetadataView::try_from_metadata_map(
            SessionId::new(),
            &serde_json::Map::new(),
        )
        .expect("empty metadata map must decode");
        assert!(view.session_metadata.is_none());
        assert!(view.lifecycle_terminal.is_none());
        assert!(view.mob_member_binding().is_none());
    }
}