Sync agent instructions from main

crates/oa-core/examples/release_dense_views.rs

@@ -230,7 +230,7 @@ fn fixture() -> (Project, Id, Vec<Id>, Vec<Id>, Vec<Id>) {
             )
         })
         .collect();
-    p.diagrams.insert(diagram, Diagram { id: diagram, alias: "forty_exchange_view".into(), name: "Forty service exchanges · all concerns".into(), description: "Start with All. Compare first category, overlapping concerns, global coverage and chosen processes. No hand-routed edges.".into(), layer: Layer::Oa, projection: ProjectionKind::FunctionalDataflow, view_options: ViewOptions::default(), nodes, layout: None, routes: vec![] });
+    p.diagrams.insert(diagram, Diagram { id: diagram, alias: "forty_exchange_view".into(), name: "Forty service exchanges · all concerns".into(), description: "Start with All. Compare first category, overlapping concerns, global coverage and chosen processes. No hand-routed edges.".into(), layer: Layer::Oa, projection: ProjectionKind::FunctionalDataflow, view_options: ViewOptions::default(), nodes, routes: vec![] });
     (p, diagram, exchanges, categories, contexts)
 }
 

crates/oa-core/src/demo.rs

@@ -81,7 +81,6 @@ fn diagram(
             projection,
             view_options: Default::default(),
             nodes: BTreeMap::new(),
-            layout: None,
             routes: vec![],
         },
     );

crates/oa-core/src/language.rs

@@ -1823,7 +1823,7 @@ pub(crate) fn resolve_declarations(
                         return Err(conversion_error(std::format!("Unknown diagram field '{key}' in the frozen pre6 contract.")));
                     }
                     let defaults =
-                        serde_json::json!({"description":"","layer":"Oa","projection":"Overview","routes":[],"view_options":crate::view_options::ViewOptions::default(),"layout":null});
+                        serde_json::json!({"description":"","layer":"Oa","projection":"Overview","routes":[],"view_options":crate::view_options::ViewOptions::default()});
                     let mut record = merge_fields(defaults.as_object().unwrap().clone(), fields)
                         .map_err(&conversion_error)?;
                     header(&mut record, d, true);

crates/oa-core/src/lib.rs

@@ -8,7 +8,6 @@ pub mod ports;
 pub mod projection;
 pub mod references;
 pub mod routing;
-pub mod scenario_layout;
 pub mod semantic;
 pub mod session;
 pub mod source_files;
@@ -19,9 +18,6 @@ pub mod validation;
 pub mod view_options;
 pub use model::*;
 pub use ports::*;
-pub use scenario_layout::{
-    DiagramLayout, ScenarioLanePosition, ScenarioLayout, ScenarioMessagePosition,
-};
 pub use semantic::*;
 pub use session::*;
 mod demo;

crates/oa-core/src/model.rs

@@ -1436,7 +1436,6 @@ pub enum ProjectionKind {
     FunctionalDataflow,
     Capabilities,
     StateMachine { machine: Id },
-    Scenario { scenario: Id },
 }
 impl ProjectionKind {
     pub fn state_machine(self) -> Option<Id> {
@@ -1446,30 +1445,8 @@ impl ProjectionKind {
         }
     }
 
-    /// The semantic owner of a saved Scenario representation.
-    pub fn scenario(self) -> Option<Id> {
-        match self {
-            Self::Scenario { scenario } => Some(scenario),
-            _ => None,
-        }
-    }
-
-    /// Explicitly classify architecture views; absence of a state machine is insufficient.
-    pub fn is_architecture(self) -> bool {
-        match self {
-            Self::Overview
-            | Self::Decomposition
-            | Self::Allocation
-            | Self::Traceability
-            | Self::FunctionalDataflow
-            | Self::Capabilities => true,
-            Self::StateMachine { .. } | Self::Scenario { .. } => false,
-        }
-    }
-
     pub fn includes(self, kind: Kind) -> bool {
         match self {
-            Self::Scenario { .. } => false,
             Self::StateMachine { .. } => {
                 matches!(kind, Kind::StateMachine | Kind::Region) || kind.is_state()
             }
@@ -1494,7 +1471,6 @@ impl std::fmt::Display for ProjectionKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(match self {
             Self::StateMachine { .. } => "State machine",
-            Self::Scenario { .. } => "Scenario",
             Self::Allocation => "Architecture · allocated work",
             Self::FunctionalDataflow => "Functional dataflow",
             Self::Capabilities => "Missions & capabilities",
@@ -1519,8 +1495,6 @@ pub struct Diagram {
     pub nodes: BTreeMap<Id, NodePlacement>,
     #[serde(default)]
     pub routes: Vec<EdgeRoute>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub layout: Option<crate::scenario_layout::DiagramLayout>,
 }
 /// Authored presentation for one existing relation or trace in one diagram.
 /// Computed endpoints and automatic routing elbows are never persisted here.
@@ -1947,7 +1921,6 @@ impl Project {
                 view_options: crate::view_options::ViewOptions::default(),
                 nodes: BTreeMap::new(),
                 routes: vec![],
-                layout: None,
             },
         );
         id

crates/oa-core/src/projection.rs

@@ -278,11 +278,6 @@ fn project_diagram_impl(
     mut availability: Option<&mut BTreeMap<Id, crate::view_options::EdgeAvailability>>,
     index: Option<&crate::view_options::ViewIndex>,
 ) -> ProjectedView {
-    // Saved Scenario layout is not an architecture/state projection. Its dedicated
-    // renderer is not wired yet; never interpret its payload through this fallback.
-    if d.projection.scenario().is_some() {
-        return ProjectedView::default();
-    }
     let parents = parents(p, d);
     let mut nodes = Vec::new();
     for n in d.nodes.values() {
@@ -399,7 +394,6 @@ fn project_diagram_impl(
             continue;
         }
         let included = match d.projection {
-            ProjectionKind::Scenario { .. } => false,
             ProjectionKind::StateMachine { machine } => matches!(&r.body,
                 RelationBody::StateTransition { transition_kind, .. }
                     if *transition_kind != TransitionKind::Internal

crates/oa-core/src/references.rs

@@ -203,81 +203,7 @@ pub fn visit_relation_refs(r: &mut Relation, mut visit: impl FnMut(&mut Id)) {
         _ => {}
     }
 }
-/// Every semantic/presentation reference in a diagram, excluding its own identities.
-pub fn diagram_references(d: &Diagram) -> Vec<Id> {
-    let mut copy = d.clone();
-    let mut refs = Vec::new();
-    visit_diagram_refs(&mut copy, |id| refs.push(*id));
-    refs
-}
-
-pub fn visit_diagram_refs(d: &mut Diagram, mut visit: impl FnMut(&mut Id)) {
-    d.view_options.visit_references(&mut visit);
-    match &mut d.projection {
-        ProjectionKind::StateMachine { machine } => visit(machine),
-        ProjectionKind::Scenario { scenario } => visit(scenario),
-        _ => {}
-    }
-    if let Some(layout) = &mut d.layout {
-        layout.visit_references(&mut visit);
-    }
-    for route in &mut d.routes {
-        visit(&mut route.edge);
-    }
-    for node in d.nodes.values_mut() {
-        for anchor in &mut node.port_anchors {
-            visit(&mut anchor.port);
-        }
-        visit(&mut node.element);
-    }
-}
-
-/// Preflight reference-key collisions before the caller changes object identities.
-/// Fresh targets are allowed. This is not whole-project admission: unrelated
-/// invalid records remain repairable within a transaction. Future typed reference
-/// domains must compose their own preflight here before any remap mutation.
-pub fn check_remap(p: &Project, old: Id, new: Id) -> Result<(), ModelError> {
-    if old == new {
-        return Ok(());
-    }
-    let remap = |id: Id| if id == old { new } else { id };
-    for diagram in p.diagrams.values() {
-        let Some(DiagramLayout::Scenario(layout)) = &diagram.layout else {
-            continue;
-        };
-        let mut lanes = std::collections::BTreeMap::new();
-        for lane in &layout.lanes {
-            let affected = lane.lifeline == old;
-            if let Some(previous_affected) = lanes.insert(remap(lane.lifeline), affected)
-                && (affected || previous_affected)
-            {
-                return Err(ModelError(
-                    "Identity remap would collide with a Scenario lane position.".into(),
-                ));
-            }
-        }
-        let mut messages = std::collections::BTreeMap::new();
-        for message in &layout.messages {
-            let mut address = message.address.clone();
-            let affected = address.occurrence == old || address.references.contains(&old);
-            address.occurrence = remap(address.occurrence);
-            for reference in &mut address.references {
-                *reference = remap(*reference);
-            }
-            if let Some(previous_affected) = messages.insert(address, affected)
-                && (affected || previous_affected)
-            {
-                return Err(ModelError(
-                    "Identity remap would collide with a Scenario message position.".into(),
-                ));
-            }
-        }
-    }
-    Ok(())
-}
-
-pub fn remap_references(p: &mut Project, old: Id, new: Id) -> Result<(), ModelError> {
-    check_remap(p, old, new)?;
+pub fn remap_references(p: &mut Project, old: Id, new: Id) {
     for e in p.elements.values_mut() {
         visit_element_refs(e, |id| {
             if *id == old {
@@ -293,11 +219,31 @@ pub fn remap_references(p: &mut Project, old: Id, new: Id) -> Result<(), ModelEr
         });
     }
     for d in p.diagrams.values_mut() {
-        visit_diagram_refs(d, |id| {
+        d.view_options.visit_references(|id| {
             if *id == old {
                 *id = new;
             }
         });
+        if let ProjectionKind::StateMachine { machine } = &mut d.projection
+            && *machine == old
+        {
+            *machine = new;
+        }
+        for route in &mut d.routes {
+            if route.edge == old {
+                route.edge = new;
+            }
+        }
+        for n in d.nodes.values_mut() {
+            for anchor in &mut n.port_anchors {
+                if anchor.port == old {
+                    anchor.port = new;
+                }
+            }
+            if n.element == old {
+                n.element = new;
+            }
+        }
     }
     for a in p.artifact_links.values_mut() {
         if a.owner == old {
@@ -319,7 +265,6 @@ pub fn remap_references(p: &mut Project, old: Id, new: Id) -> Result<(), ModelEr
             });
         }
     }
-    Ok(())
 }
 /// IDs removed by a cascade. Cross-layer traced counterparts are never included.
 pub fn deletion_impact(p: &Project, id: Id) -> BTreeSet<Id> {
@@ -394,8 +339,7 @@ fn deletion_impact_inner(p: &Project, id: Id, defer_exchange_allocations: bool)
         for d in p.diagrams.values() {
             if d.projection
                 .state_machine()
-                .or_else(|| d.projection.scenario())
-                .is_some_and(|owner| removed.contains(&owner))
+                .is_some_and(|machine| removed.contains(&machine))
             {
                 removed.insert(d.id);
             }
@@ -468,7 +412,6 @@ fn remove_objects(p: &mut Project, removed: BTreeSet<Id>) {
     p.artifact_links.retain(|id, _| !removed.contains(id));
     for d in p.diagrams.values_mut() {
         d.view_options.retain_references(|id| !removed.contains(id));
-        crate::scenario_layout::prune_deleted(d, &removed);
         d.nodes.retain(|id, _| !removed.contains(id));
         d.routes.retain(|route| !removed.contains(&route.edge));
         for node in d.nodes.values_mut() {
@@ -646,7 +589,3 @@ fn remove_objects(p: &mut Project, removed: BTreeSet<Id>) {
         }
     }
 }
-
-#[cfg(test)]
-#[path = "references/scenario_layout_tests.rs"]
-mod scenario_layout_tests;

crates/oa-core/src/references/scenario_layout_tests.rs

@@ -1,388 +0,0 @@
-use super::*;
-use std::collections::BTreeMap;
-
-struct Fixture {
-    project: Project,
-    owner: Id,
-    lanes: [Id; 2],
-    messages: [Id; 2],
-    views: [Id; 2],
-}
-
-fn address(occurrence: Id) -> OccurrenceEndpoint {
-    OccurrenceEndpoint {
-        references: vec![],
-        occurrence,
-    }
-}
-
-fn layout(project: &Project, view: Id) -> &ScenarioLayout {
-    let Some(DiagramLayout::Scenario(layout)) = &project.diagrams[&view].layout else {
-        panic!("expected authored Scenario positions")
-    };
-    layout
-}
-
-fn layout_mut(project: &mut Project, view: Id) -> &mut ScenarioLayout {
-    let Some(DiagramLayout::Scenario(layout)) =
-        &mut project.diagrams.get_mut(&view).unwrap().layout
-    else {
-        panic!("expected authored Scenario positions")
-    };
-    layout
-}
-
-fn admitted(project: &Project) {
-    let errors: Vec<_> = crate::validation::validate(project)
-        .into_iter()
-        .filter(|issue| issue.severity == crate::validation::Severity::Error)
-        .collect();
-    assert!(errors.is_empty(), "{errors:?}");
-}
-
-fn fixture() -> Fixture {
-    let mut project = Project::empty();
-    let owner = project
-        .add_element(Kind::Scenario, Layer::Oa, "Delivery", None)
-        .unwrap();
-    let lanes = ["Sender", "Receiver"].map(|name| {
-        project
-            .add_element(Kind::Lifeline, Layer::Oa, name, Some(owner))
-            .unwrap()
-    });
-    let messages = ["First message", "Second message"].map(|name| {
-        let id = project
-            .add_element(Kind::Occurrence, Layer::Oa, name, Some(owner))
-            .unwrap();
-        *project.elements.get_mut(&id).unwrap().shared_mut().unwrap() = SharedBody::Occurrence {
-            body: OccurrenceBody::Exchange {
-                exchange: None,
-                sender: Some(lanes[0]),
-                receiver: Some(lanes[1]),
-                message_kind: MessageKind::Asynchronous,
-                reply_to: None,
-                values: vec![],
-                operation: None,
-            },
-            precondition: String::new(),
-            postcondition: String::new(),
-        };
-        id
-    });
-    *project
-        .elements
-        .get_mut(&owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap() = messages.to_vec();
-    let views = ["delivery_view", "review_view"].map(|alias| {
-        let id = Id::new_v4();
-        project.diagrams.insert(
-            id,
-            Diagram {
-                id,
-                alias: alias.into(),
-                name: alias.into(),
-                description: String::new(),
-                layer: Layer::Oa,
-                projection: ProjectionKind::Scenario { scenario: owner },
-                view_options: Default::default(),
-                nodes: BTreeMap::new(),
-                routes: vec![],
-                layout: Some(DiagramLayout::Scenario(ScenarioLayout {
-                    lanes: vec![
-                        ScenarioLanePosition {
-                            lifeline: lanes[0],
-                            x: 120.,
-                        },
-                        ScenarioLanePosition {
-                            lifeline: lanes[1],
-                            x: 420.,
-                        },
-                    ],
-                    messages: vec![
-                        ScenarioMessagePosition {
-                            address: address(messages[0]),
-                            send_y: 220.,
-                        },
-                        ScenarioMessagePosition {
-                            address: address(messages[1]),
-                            send_y: 360.,
-                        },
-                    ],
-                })),
-            },
-        );
-        id
-    });
-    admitted(&project);
-    Fixture {
-        project,
-        owner,
-        lanes,
-        messages,
-        views,
-    }
-}
-
-#[test]
-fn fresh_identity_swap_preserves_coordinates_and_semantic_sequence() {
-    let mut f = fixture();
-    let before = f.project.clone();
-    let temporary = Id::new_v4();
-    for ids in [f.lanes, f.messages] {
-        f.project = crate::execute_batch(
-            &f.project,
-            &[
-                Command::Reidentify(ids[0], temporary),
-                Command::Reidentify(ids[1], ids[0]),
-                Command::Reidentify(temporary, ids[1]),
-            ],
-        )
-        .unwrap();
-    }
-    admitted(&f.project);
-    assert_eq!(
-        f.project.elements[&f.owner].steps().unwrap(),
-        &vec![f.messages[1], f.messages[0]]
-    );
-    for view in f.views {
-        let rows = layout(&f.project, view);
-        assert_eq!(
-            rows.lanes,
-            vec![
-                ScenarioLanePosition {
-                    lifeline: f.lanes[1],
-                    x: 120.
-                },
-                ScenarioLanePosition {
-                    lifeline: f.lanes[0],
-                    x: 420.
-                }
-            ]
-        );
-        assert_eq!(
-            rows.messages,
-            vec![
-                ScenarioMessagePosition {
-                    address: address(f.messages[1]),
-                    send_y: 220.
-                },
-                ScenarioMessagePosition {
-                    address: address(f.messages[0]),
-                    send_y: 360.
-                }
-            ]
-        );
-    }
-    // Reverse the swaps: no values or identities other than those requested drift.
-    for ids in [f.lanes, f.messages] {
-        f.project = crate::execute_batch(
-            &f.project,
-            &[
-                Command::Reidentify(ids[0], temporary),
-                Command::Reidentify(ids[1], ids[0]),
-                Command::Reidentify(temporary, ids[1]),
-            ],
-        )
-        .unwrap();
-    }
-    assert_eq!(f.project, before);
-}
-
-#[test]
-fn colliding_lane_or_message_remap_rejects_before_any_reference_changes() {
-    for message in [false, true] {
-        let mut f = fixture();
-        let [old, new] = if message { f.messages } else { f.lanes };
-        let before = f.project.clone();
-        assert!(check_remap(&f.project, old, new).is_err());
-        assert!(remap_references(&mut f.project, old, new).is_err());
-        assert_eq!(f.project, before);
-    }
-}
-
-#[test]
-fn reidentify_preflight_precedes_object_map_mutation_for_fresh_colliding_target() {
-    let mut f = fixture();
-    let fresh = Id::new_v4();
-    // A repair candidate can already have a dangling coordinate key. It must not
-    // silently merge with the live lane, even though the destination ID is vacant.
-    layout_mut(&mut f.project, f.views[0]).lanes[1].lifeline = fresh;
-    let before = f.project.clone();
-    assert!(crate::session::reidentify(&mut f.project, f.lanes[0], fresh).is_err());
-    assert_eq!(f.project, before);
-}
-
-#[test]
-fn full_address_paths_are_walked_and_collision_checked_without_admitting_expansion() {
-    let mut f = fixture();
-    let [old, new] = [Id::new_v4(), Id::new_v4()];
-    let rows = layout_mut(&mut f.project, f.views[0]);
-    // Future/invalid expanded candidates still participate in reference safety.
-    rows.messages[0].address.references = vec![old];
-    rows.messages[1].address = OccurrenceEndpoint {
-        references: vec![new],
-        occurrence: f.messages[0],
-    };
-    let refs = diagram_references(&f.project.diagrams[&f.views[0]]);
-    assert!(refs.contains(&f.owner) && refs.contains(&old) && refs.contains(&new));
-    let before = f.project.clone();
-    assert!(remap_references(&mut f.project, old, new).is_err());
-    assert_eq!(f.project, before);
-    let fresh = Id::new_v4();
-    remap_references(&mut f.project, old, fresh).unwrap();
-    let rows = layout(&f.project, f.views[0]);
-    assert_eq!(rows.messages[0].address.references, vec![fresh]);
-    assert_eq!(rows.messages[0].address.occurrence, f.messages[0]);
-    assert_eq!(rows.messages[1].address.references, vec![new]);
-}
-
-#[test]
-fn owner_reidentify_and_delete_cover_all_saved_views_without_deleting_other_owners() {
-    let mut f = fixture();
-    let other_owner = f
-        .project
-        .add_element(Kind::Scenario, Layer::Oa, "Independent", None)
-        .unwrap();
-    let mut other_view = f.project.diagrams[&f.views[0]].clone();
-    other_view.id = Id::new_v4();
-    other_view.alias = "independent_view".into();
-    other_view.projection = ProjectionKind::Scenario {
-        scenario: other_owner,
-    };
-    other_view.layout = None;
-    f.project.diagrams.insert(other_view.id, other_view.clone());
-    admitted(&f.project);
-    let fresh_owner = Id::new_v4();
-    f.project = crate::prepare_command(&f.project, &Command::Reidentify(f.owner, fresh_owner))
-        .unwrap()
-        .project;
-    for view in f.views {
-        assert_eq!(
-            f.project.diagrams[&view].projection.scenario(),
-            Some(fresh_owner)
-        );
-    }
-    let impact = deletion_impact(&f.project, fresh_owner);
-    assert!(
-        f.views
-            .iter()
-            .chain(&f.lanes)
-            .chain(&f.messages)
-            .all(|id| impact.contains(id))
-    );
-    assert!(!impact.contains(&other_owner) && !impact.contains(&other_view.id));
-    delete_cascade(&mut f.project, fresh_owner);
-    assert_eq!(f.project.diagrams[&other_view.id], other_view);
-    assert!(
-        f.views
-            .iter()
-            .all(|id| !f.project.diagrams.contains_key(id))
-    );
-    admitted(&f.project);
-}
-
-#[test]
-fn deletion_then_recreation_never_resurrects_lane_or_message_coordinates() {
-    let mut f = fixture();
-    let lane = f.project.elements[&f.lanes[0]].clone();
-    let message = f.project.elements[&f.messages[0]].clone();
-    delete_cascade(&mut f.project, lane.id);
-    for view in f.views {
-        let rows = layout(&f.project, view);
-        assert_eq!(rows.lanes.len(), 1);
-        assert_eq!(rows.lanes[0].lifeline, f.lanes[1]);
-        // Missing endpoint assignment does not erase a still-live message's spacing.
-        assert_eq!(rows.messages.len(), 2);
-    }
-    let mut pending = BTreeSet::new();
-    delete_cascade_deferred(&mut f.project, message.id, &mut pending);
-    // Pruning happens during deletion, before later batch commands can recreate IDs.
-    assert!(
-        layout(&f.project, f.views[0])
-            .messages
-            .iter()
-            .all(|row| row.address.occurrence != message.id)
-    );
-    f.project.elements.insert(lane.id, lane);
-    f.project.elements.insert(message.id, message);
-    f.project
-        .elements
-        .get_mut(&f.owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap()
-        .insert(0, f.messages[0]);
-    finish_deletions(&mut f.project, &pending);
-    for view in f.views {
-        let rows = layout(&f.project, view);
-        assert_eq!(rows.lanes.len(), 1);
-        assert_eq!(
-            rows.messages,
-            vec![ScenarioMessagePosition {
-                address: address(f.messages[1]),
-                send_y: 360.
-            }]
-        );
-    }
-    admitted(&f.project);
-}
-
-#[test]
-fn unrelated_invalid_records_do_not_block_scoped_remap_or_get_repaired_implicitly() {
-    let mut f = fixture();
-    let unrelated = Id::new_v4();
-    let rows = layout_mut(&mut f.project, f.views[1]);
-    let invalid = ScenarioLanePosition {
-        lifeline: unrelated,
-        x: MAX_COORDINATE * 2.,
-    };
-    rows.lanes.extend([invalid.clone(), invalid]);
-    let fresh = Id::new_v4();
-    let untouched = f.project.diagrams[&f.views[1]].clone();
-    let before = f.project.clone();
-    remap_references(&mut f.project, f.owner, f.owner).unwrap();
-    assert_eq!(f.project, before);
-    // The duplicate lane records do not involve the remapped message identity.
-    remap_references(&mut f.project, f.messages[0], fresh).unwrap();
-    assert_eq!(
-        layout(&f.project, f.views[1]).lanes,
-        layout_from(&untouched).lanes
-    );
-    assert_eq!(
-        layout(&f.project, f.views[1]).messages[0]
-            .address
-            .occurrence,
-        fresh
-    );
-    assert_eq!(layout(&f.project, f.views[1]).messages[0].send_y, 220.);
-}
-
-fn layout_from(diagram: &Diagram) -> &ScenarioLayout {
-    let Some(DiagramLayout::Scenario(layout)) = &diagram.layout else {
-        panic!("missing layout")
-    };
-    layout
-}
-
-#[test]
-fn deletion_prunes_an_explicit_address_path_without_pruning_other_message_rows() {
-    let mut f = fixture();
-    // Expanded addresses are not admitted in this slice, but deleting their
-    // explicit references must still make an intermediate repair candidate safe.
-    layout_mut(&mut f.project, f.views[0]).messages[0]
-        .address
-        .references = vec![f.lanes[0]];
-    delete_cascade(&mut f.project, f.lanes[0]);
-    assert_eq!(
-        layout(&f.project, f.views[0]).messages,
-        vec![ScenarioMessagePosition {
-            address: address(f.messages[1]),
-            send_y: 360.
-        }]
-    );
-    assert_eq!(layout(&f.project, f.views[1]).messages.len(), 2);
-    assert!(f.project.elements.contains_key(&f.messages[0]));
-    admitted(&f.project);
-}

crates/oa-core/src/scenario_layout.rs

@@ -1,429 +0,0 @@
-//! Authored Scenario presentation. Structural admission never changes event order.
-use crate::{
-    Diagram, Id, Kind, Layer, MAX_COORDINATE, ModelError, OccurrenceBody, OccurrenceEndpoint,
-    Project, SharedBody, validation,
-};
-use serde::{Deserialize, Serialize};
-use std::collections::BTreeSet;
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub enum DiagramLayout {
-    Scenario(ScenarioLayout),
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
-#[serde(deny_unknown_fields)]
-pub struct ScenarioLayout {
-    #[serde(default)]
-    pub lanes: Vec<ScenarioLanePosition>,
-    #[serde(default)]
-    pub messages: Vec<ScenarioMessagePosition>,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ScenarioLanePosition {
-    pub lifeline: Id,
-    pub x: f32,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ScenarioMessagePosition {
-    pub address: OccurrenceEndpoint,
-    /// Actual send endpoint, not the renderer's receive-oriented lifecycle row.
-    pub send_y: f32,
-}
-
-impl DiagramLayout {
-    /// Visit every explicit reference, including unsupported paths in a candidate.
-    /// The caller owns remap preflight and final atomic validation.
-    pub fn visit_references(&mut self, mut visit: impl FnMut(&mut Id)) {
-        match self {
-            Self::Scenario(layout) => {
-                for lane in &mut layout.lanes {
-                    visit(&mut lane.lifeline);
-                }
-                for message in &mut layout.messages {
-                    for reference in &mut message.address.references {
-                        visit(reference);
-                    }
-                    visit(&mut message.address.occurrence);
-                }
-            }
-        }
-    }
-}
-
-/// Proposed aggregate accounting contribution; the shared admission owner applies it.
-/// One payload plus one record per lane/message. No graph objects are introduced.
-pub fn record_count(diagram: &Diagram) -> usize {
-    match &diagram.layout {
-        None => 0,
-        Some(DiagramLayout::Scenario(layout)) => 1usize
-            .saturating_add(layout.lanes.len())
-            .saturating_add(layout.messages.len()),
-    }
-}
-
-fn coordinate(value: f32) -> bool {
-    value.is_finite() && value.abs() <= MAX_COORDINATE
-}
-
-fn owner(p: &Project, diagram: &Diagram) -> Result<Id, ModelError> {
-    let scenario = diagram
-        .projection
-        .scenario()
-        .ok_or_else(|| ModelError("Scenario layout requires a Scenario projection.".into()))?;
-    if !p
-        .elements
-        .get(&scenario)
-        .is_some_and(|element| element.kind() == Kind::Scenario && element.layer() == diagram.layer)
-    {
-        return Err(ModelError(
-            "Scenario projection requires an existing Scenario in the diagram layer.".into(),
-        ));
-    }
-    Ok(scenario)
-}
-
-fn lane_member(p: &Project, owner: Id, layer: Layer, lifeline: Id) -> bool {
-    p.elements.get(&lifeline).is_some_and(|element| {
-        element.kind() == Kind::Lifeline
-            && element.parent == Some(owner)
-            && element.layer() == layer
-    })
-}
-
-/// Only actual steps of this Scenario and its own Fragment/Branch sequences.
-/// ScenarioUse/SequenceReference are deliberately never expanded. Invalid graph
-/// cycles terminate, and malformed parent/step links do not manufacture membership.
-fn direct_messages(p: &Project, owner: Id, layer: Layer) -> BTreeSet<Id> {
-    let mut messages = BTreeSet::new();
-    let mut visited = BTreeSet::new();
-    let mut pending = vec![owner];
-    while let Some(scope) = pending.pop() {
-        if !visited.insert(scope) {
-            continue;
-        }
-        let Some(element) = p.elements.get(&scope) else {
-            continue;
-        };
-        for id in element.steps().into_iter().flatten() {
-            let Some(item) = p.elements.get(id) else {
-                continue;
-            };
-            if item.parent != Some(scope) || item.layer() != layer {
-                continue;
-            }
-            match item.shared() {
-                Some(SharedBody::Occurrence {
-                    body: OccurrenceBody::Exchange { .. },
-                    ..
-                }) => {
-                    messages.insert(*id);
-                }
-                Some(SharedBody::Occurrence {
-                    body: OccurrenceBody::Fragment { branches, .. },
-                    ..
-                }) => {
-                    for branch in branches {
-                        if p.elements.get(branch).is_some_and(|operand| {
-                            operand.parent == Some(*id)
-                                && operand.layer() == layer
-                                && matches!(
-                                    operand.shared(),
-                                    Some(SharedBody::Occurrence {
-                                        body: OccurrenceBody::Branch { .. },
-                                        ..
-                                    })
-                                )
-                        }) {
-                            pending.push(*branch);
-                        }
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-    messages
-}
-
-pub(crate) fn validate_diagram(p: &Project, diagram: &Diagram, out: &mut Vec<validation::Issue>) {
-    if diagram.projection.scenario().is_none() {
-        if diagram.layout.is_some() {
-            validation::error(
-                out,
-                diagram.id,
-                "scenario_layout_projection",
-                "layout",
-                "Only a Scenario projection accepts a Scenario layout, including an empty payload.",
-            );
-        }
-        return;
-    }
-    let scenario = match owner(p, diagram) {
-        Ok(owner) => owner,
-        Err(error) => {
-            validation::error(
-                out,
-                diagram.id,
-                "scenario_diagram_context",
-                "projection",
-                error.0,
-            );
-            return;
-        }
-    };
-    if !diagram.nodes.is_empty() || !diagram.routes.is_empty() {
-        validation::error(
-            out,
-            diagram.id,
-            "scenario_diagram_content",
-            "layout",
-            "Scenario views do not accept architecture node placements or edge routes.",
-        );
-    }
-    let Some(DiagramLayout::Scenario(layout)) = &diagram.layout else {
-        return;
-    };
-    let mut lanes = BTreeSet::new();
-    for lane in &layout.lanes {
-        if !lanes.insert(lane.lifeline) {
-            validation::error(
-                out,
-                diagram.id,
-                "duplicate_scenario_lane",
-                "layout",
-                "A Scenario layout has at most one position per lifeline.",
-            );
-        }
-        if !lane_member(p, scenario, diagram.layer, lane.lifeline) {
-            validation::error(
-                out,
-                diagram.id,
-                "scenario_layout_lifeline",
-                "layout",
-                "Lane positions reference a Lifeline directly owned by the projected Scenario.",
-            );
-        }
-        if !coordinate(lane.x) {
-            validation::error(
-                out,
-                diagram.id,
-                "scenario_layout_coordinate",
-                "layout",
-                "Scenario positions must be finite and within the shared coordinate bounds.",
-            );
-        }
-    }
-    let members = direct_messages(p, scenario, diagram.layer);
-    let mut addresses = BTreeSet::new();
-    for message in &layout.messages {
-        // Reject expanded paths without cloning or indexing their potentially large contents.
-        if !message.address.references.is_empty() {
-            validation::error(
-                out,
-                diagram.id,
-                "scenario_layout_address",
-                "layout",
-                "Expanded-reference message positions are not supported; references must be empty.",
-            );
-        } else if !addresses.insert(message.address.occurrence) {
-            validation::error(
-                out,
-                diagram.id,
-                "duplicate_scenario_message",
-                "layout",
-                "A Scenario layout has at most one position per message address.",
-            );
-        }
-        if !members.contains(&message.address.occurrence) {
-            validation::error(
-                out,
-                diagram.id,
-                "scenario_layout_message",
-                "layout",
-                "Message positions reference Exchange occurrences in the Scenario's own ordered sequence tree.",
-            );
-        }
-        if !coordinate(message.send_y) {
-            validation::error(
-                out,
-                diagram.id,
-                "scenario_layout_coordinate",
-                "layout",
-                "Scenario positions must be finite and within the shared coordinate bounds.",
-            );
-        }
-    }
-}
-
-fn editable(p: &Project, id: Id) -> Result<(&Diagram, Id), ModelError> {
-    let diagram = p
-        .diagrams
-        .get(&id)
-        .ok_or_else(|| ModelError("Scenario diagram does not exist.".into()))?;
-    let scenario = owner(p, diagram)?;
-    if !diagram.nodes.is_empty() || !diagram.routes.is_empty() {
-        return Err(ModelError(
-            "Scenario views do not accept architecture node placements or edge routes.".into(),
-        ));
-    }
-    Ok((diagram, scenario))
-}
-
-fn check_message(
-    p: &Project,
-    diagram: &Diagram,
-    owner: Id,
-    address: &OccurrenceEndpoint,
-) -> Result<(), ModelError> {
-    if !address.references.is_empty() {
-        return Err(ModelError(
-            "Expanded-reference message positions are not supported; references must be empty."
-                .into(),
-        ));
-    }
-    if !direct_messages(p, owner, diagram.layer).contains(&address.occurrence) {
-        return Err(ModelError("Message position requires an Exchange occurrence in the Scenario's own ordered sequence tree.".into()));
-    }
-    Ok(())
-}
-
-fn payload(diagram: &mut Diagram) -> &mut ScenarioLayout {
-    let DiagramLayout::Scenario(layout) = diagram
-        .layout
-        .get_or_insert_with(|| DiagramLayout::Scenario(ScenarioLayout::default()));
-    layout
-}
-
-/// Target-scoped preparation, not whole-project or whole-layout validation.
-/// Unrelated intermediate errors remain repairable by later commands in a batch.
-pub fn set_lane(
-    p: &Project,
-    diagram: Id,
-    position: ScenarioLanePosition,
-) -> Result<Diagram, ModelError> {
-    let (current, owner) = editable(p, diagram)?;
-    if !lane_member(p, owner, current.layer, position.lifeline) || !coordinate(position.x) {
-        return Err(ModelError(
-            "Lane position requires an owned Lifeline and a finite bounded x coordinate.".into(),
-        ));
-    }
-    let mut result = current.clone();
-    let layout = payload(&mut result);
-    if layout
-        .lanes
-        .iter()
-        .filter(|row| row.lifeline == position.lifeline)
-        .count()
-        > 1
-    {
-        return Err(ModelError(
-            "Cannot set an ambiguous duplicate lane position.".into(),
-        ));
-    }
-    if let Some(existing) = layout
-        .lanes
-        .iter_mut()
-        .find(|row| row.lifeline == position.lifeline)
-    {
-        if existing.x != position.x {
-            *existing = position;
-        }
-    } else {
-        layout.lanes.push(position);
-    }
-    Ok(result)
-}
-
-pub fn remove_lane(p: &Project, diagram: Id, lifeline: Id) -> Result<Diagram, ModelError> {
-    let (current, owner) = editable(p, diagram)?;
-    if !lane_member(p, owner, current.layer, lifeline) {
-        return Err(ModelError(
-            "Removing a lane position requires an owned Lifeline.".into(),
-        ));
-    }
-    let mut result = current.clone();
-    if let Some(DiagramLayout::Scenario(layout)) = &mut result.layout {
-        layout.lanes.retain(|row| row.lifeline != lifeline);
-    }
-    Ok(result)
-}
-
-pub fn set_message(
-    p: &Project,
-    diagram: Id,
-    position: ScenarioMessagePosition,
-) -> Result<Diagram, ModelError> {
-    let (current, owner) = editable(p, diagram)?;
-    check_message(p, current, owner, &position.address)?;
-    if !coordinate(position.send_y) {
-        return Err(ModelError(
-            "Message position requires a finite bounded send_y coordinate.".into(),
-        ));
-    }
-    let mut result = current.clone();
-    let layout = payload(&mut result);
-    if layout
-        .messages
-        .iter()
-        .filter(|row| row.address == position.address)
-        .count()
-        > 1
-    {
-        return Err(ModelError(
-            "Cannot set an ambiguous duplicate message position.".into(),
-        ));
-    }
-    if let Some(existing) = layout
-        .messages
-        .iter_mut()
-        .find(|row| row.address == position.address)
-    {
-        if existing.send_y != position.send_y {
-            *existing = position;
-        }
-    } else {
-        layout.messages.push(position);
-    }
-    Ok(result)
-}
-
-pub fn remove_message(
-    p: &Project,
-    diagram: Id,
-    address: &OccurrenceEndpoint,
-) -> Result<Diagram, ModelError> {
-    let (current, owner) = editable(p, diagram)?;
-    check_message(p, current, owner, address)?;
-    let mut result = current.clone();
-    if let Some(DiagramLayout::Scenario(layout)) = &mut result.layout {
-        layout.messages.retain(|row| &row.address != address);
-    }
-    Ok(result)
-}
-
-/// Prune only identities in the caller's actual deletion closure, never visibility
-/// or missing endpoint assignments. Owner-view cascade remains the caller's job.
-pub fn prune_deleted(diagram: &mut Diagram, deleted: &BTreeSet<Id>) {
-    if let Some(DiagramLayout::Scenario(layout)) = &mut diagram.layout {
-        layout
-            .lanes
-            .retain(|lane| !deleted.contains(&lane.lifeline));
-        layout.messages.retain(|message| {
-            !deleted.contains(&message.address.occurrence)
-                && !message
-                    .address
-                    .references
-                    .iter()
-                    .any(|id| deleted.contains(id))
-        });
-    }
-}
-
-#[cfg(test)]
-mod tests;

crates/oa-core/src/scenario_layout/tests.rs

@@ -1,800 +0,0 @@
-use super::*;
-use crate::{
-    Element, FragmentOperator, MessageKind, ProjectionKind, Relation, RelationBody, RelationKind,
-    ScenarioViewpoint,
-};
-use std::collections::BTreeMap;
-
-struct Fixture {
-    project: Project,
-    owner: Id,
-    performer: Id,
-    lane: Id,
-    repeated_lane: Id,
-    first: Id,
-    second: Id,
-    nested: Id,
-    fragment: Id,
-    branch: Id,
-    view: Id,
-    other_view: Id,
-    exchange: Id,
-}
-
-fn set_body(element: &mut Element, body: OccurrenceBody) {
-    *element.shared_mut().unwrap() = SharedBody::Occurrence {
-        body,
-        precondition: String::new(),
-        postcondition: String::new(),
-    };
-}
-fn address(occurrence: Id) -> OccurrenceEndpoint {
-    OccurrenceEndpoint {
-        references: vec![],
-        occurrence,
-    }
-}
-fn diagram(owner: Id, alias: &str) -> Diagram {
-    Diagram {
-        id: Id::new_v4(),
-        alias: alias.into(),
-        name: alias.into(),
-        description: String::new(),
-        layer: Layer::Oa,
-        projection: ProjectionKind::Scenario { scenario: owner },
-        view_options: Default::default(),
-        nodes: BTreeMap::new(),
-        routes: vec![],
-        layout: None,
-    }
-}
-fn assert_admitted(project: &Project) {
-    let errors: Vec<_> = validation::validate(project)
-        .into_iter()
-        .filter(|issue| issue.severity == validation::Severity::Error)
-        .collect();
-    assert!(errors.is_empty(), "{errors:?}");
-}
-fn has_code(project: &Project, code: &str) -> bool {
-    validation::validate(project)
-        .iter()
-        .any(|issue| issue.code == code)
-}
-fn layout(diagram: &Diagram) -> &ScenarioLayout {
-    let Some(DiagramLayout::Scenario(layout)) = &diagram.layout else {
-        panic!("expected saved payload")
-    };
-    layout
-}
-fn save(project: &mut Project, replacement: Diagram) {
-    project.diagrams.insert(replacement.id, replacement);
-}
-fn fixture() -> Fixture {
-    let mut project = Project::empty();
-    let owner = project
-        .add_element(Kind::Scenario, Layer::Oa, "Nominal", None)
-        .unwrap();
-    let Some(SharedBody::Scenario { viewpoint, .. }) =
-        project.elements.get_mut(&owner).unwrap().shared_mut()
-    else {
-        panic!("Scenario fixture body");
-    };
-    *viewpoint = ScenarioViewpoint::ParticipantInteraction;
-    let performer = project
-        .add_element(Kind::Entity, Layer::Oa, "Controller", None)
-        .unwrap();
-    let receiver = project
-        .add_element(Kind::Entity, Layer::Oa, "Provider", None)
-        .unwrap();
-    let lane = project
-        .add_element(Kind::Lifeline, Layer::Oa, "Controller lane", Some(owner))
-        .unwrap();
-    let repeated_lane = project
-        .add_element(
-            Kind::Lifeline,
-            Layer::Oa,
-            "Controller review lane",
-            Some(owner),
-        )
-        .unwrap();
-    let receiver_lane = project
-        .add_element(Kind::Lifeline, Layer::Oa, "Provider lane", Some(owner))
-        .unwrap();
-    for (id, represented) in [
-        (lane, performer),
-        (repeated_lane, performer),
-        (receiver_lane, receiver),
-    ] {
-        *project.elements.get_mut(&id).unwrap().shared_mut().unwrap() = SharedBody::Lifeline {
-            represented: Some(represented),
-        };
-    }
-    let exchange = Id::new_v4();
-    project.relations.insert(
-        exchange,
-        Relation {
-            id: exchange,
-            alias: "delivery_channel".into(),
-            name: "Delivery".into(),
-            description: String::new(),
-            body: RelationBody::new(RelationKind::CommunicationMean, performer, receiver),
-        },
-    );
-    let first = project
-        .add_element(Kind::Occurrence, Layer::Oa, "First delivery", Some(owner))
-        .unwrap();
-    let second = project
-        .add_element(Kind::Occurrence, Layer::Oa, "Second delivery", Some(owner))
-        .unwrap();
-    for (id, sender) in [(first, lane), (second, repeated_lane)] {
-        set_body(
-            project.elements.get_mut(&id).unwrap(),
-            OccurrenceBody::Exchange {
-                exchange: Some(exchange),
-                sender: Some(sender),
-                receiver: Some(receiver_lane),
-                message_kind: MessageKind::Asynchronous,
-                reply_to: None,
-                values: vec![],
-                operation: None,
-            },
-        );
-    }
-    let fragment = project
-        .add_element(
-            Kind::Occurrence,
-            Layer::Oa,
-            "Optional delivery",
-            Some(owner),
-        )
-        .unwrap();
-    set_body(
-        project.elements.get_mut(&fragment).unwrap(),
-        OccurrenceBody::Fragment {
-            operator: FragmentOperator::Optional,
-            branches: vec![],
-        },
-    );
-    let branch = project
-        .add_element(Kind::Occurrence, Layer::Oa, "Option body", Some(fragment))
-        .unwrap();
-    let nested = project
-        .add_element(
-            Kind::Occurrence,
-            Layer::Oa,
-            "Unfinished nested delivery",
-            Some(branch),
-        )
-        .unwrap();
-    set_body(
-        project.elements.get_mut(&nested).unwrap(),
-        OccurrenceBody::Exchange {
-            exchange: None,
-            sender: None,
-            receiver: None,
-            message_kind: MessageKind::Asynchronous,
-            reply_to: None,
-            values: vec![],
-            operation: None,
-        },
-    );
-    set_body(
-        project.elements.get_mut(&branch).unwrap(),
-        OccurrenceBody::Branch {
-            guard: "requested".into(),
-            occurrences: vec![nested],
-        },
-    );
-    set_body(
-        project.elements.get_mut(&fragment).unwrap(),
-        OccurrenceBody::Fragment {
-            operator: FragmentOperator::Optional,
-            branches: vec![branch],
-        },
-    );
-    *project
-        .elements
-        .get_mut(&owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap() = vec![first, second, fragment];
-    let view_record = diagram(owner, "nominal_view");
-    let other_record = diagram(owner, "review_view");
-    let view = view_record.id;
-    let other_view = other_record.id;
-    save(&mut project, view_record);
-    save(&mut project, other_record);
-    assert_admitted(&project);
-    Fixture {
-        project,
-        owner,
-        performer,
-        lane,
-        repeated_lane,
-        first,
-        second,
-        nested,
-        fragment,
-        branch,
-        view,
-        other_view,
-        exchange,
-    }
-}
-
-#[test]
-fn two_views_and_repeated_semantic_definitions_keep_independent_overrides() {
-    let mut f = fixture();
-    let semantics = (f.project.elements.clone(), f.project.relations.clone());
-    for (view, line, x) in [
-        (f.view, f.lane, 420.),
-        (f.view, f.repeated_lane, 680.),
-        (f.other_view, f.lane, 900.),
-    ] {
-        let result =
-            set_lane(&f.project, view, ScenarioLanePosition { lifeline: line, x }).unwrap();
-        save(&mut f.project, result);
-    }
-    for (view, id, y) in [
-        (f.view, f.first, 200.),
-        (f.view, f.second, 350.),
-        (f.other_view, f.first, 260.),
-    ] {
-        let result = set_message(
-            &f.project,
-            view,
-            ScenarioMessagePosition {
-                address: address(id),
-                send_y: y,
-            },
-        )
-        .unwrap();
-        save(&mut f.project, result);
-    }
-    assert_eq!(
-        layout(&f.project.diagrams[&f.view]).lanes,
-        vec![
-            ScenarioLanePosition {
-                lifeline: f.lane,
-                x: 420.
-            },
-            ScenarioLanePosition {
-                lifeline: f.repeated_lane,
-                x: 680.
-            },
-        ]
-    );
-    assert_eq!(
-        layout(&f.project.diagrams[&f.view])
-            .messages
-            .iter()
-            .map(|r| (r.address.occurrence, r.send_y))
-            .collect::<Vec<_>>(),
-        vec![(f.first, 200.), (f.second, 350.)]
-    );
-    assert_eq!(
-        layout(&f.project.diagrams[&f.other_view]).messages[0].send_y,
-        260.
-    );
-    assert_eq!(layout(&f.project.diagrams[&f.other_view]).lanes[0].x, 900.);
-    assert_eq!(
-        (f.project.elements.clone(), f.project.relations.clone()),
-        semantics
-    );
-    assert_admitted(&f.project);
-}
-
-#[test]
-fn own_nested_unfinished_message_is_admitted_but_expansion_is_not() {
-    let mut f = fixture();
-    let result = set_message(
-        &f.project,
-        f.view,
-        ScenarioMessagePosition {
-            address: address(f.nested),
-            send_y: -80.,
-        },
-    )
-    .unwrap();
-    save(&mut f.project, result);
-    assert_admitted(&f.project);
-    let before = f.project.clone();
-    let expanded = OccurrenceEndpoint {
-        references: vec![f.fragment],
-        occurrence: f.nested,
-    };
-    assert!(
-        set_message(
-            &f.project,
-            f.view,
-            ScenarioMessagePosition {
-                address: expanded.clone(),
-                send_y: 400.
-            }
-        )
-        .is_err()
-    );
-    assert!(remove_message(&f.project, f.view, &expanded).is_err());
-    assert_eq!(f.project, before);
-    payload(f.project.diagrams.get_mut(&f.view).unwrap()).messages[0].address = expanded;
-    assert!(has_code(&f.project, "scenario_layout_address"));
-}
-
-#[test]
-fn only_ordered_message_appearances_and_owned_lifelines_are_targets() {
-    let mut f = fixture();
-    assert!(
-        set_lane(
-            &f.project,
-            f.view,
-            ScenarioLanePosition {
-                lifeline: f.performer,
-                x: 10.
-            }
-        )
-        .is_err()
-    );
-    for id in [f.exchange, f.fragment, f.branch, f.owner, Id::new_v4()] {
-        assert!(
-            set_message(
-                &f.project,
-                f.view,
-                ScenarioMessagePosition {
-                    address: address(id),
-                    send_y: 100.
-                }
-            )
-            .is_err()
-        );
-    }
-    let foreign = f
-        .project
-        .add_element(Kind::Scenario, Layer::Oa, "Foreign", None)
-        .unwrap();
-    let foreign_lane = f
-        .project
-        .add_element(Kind::Lifeline, Layer::Oa, "Foreign lane", Some(foreign))
-        .unwrap();
-    assert!(remove_lane(&f.project, f.view, foreign_lane).is_err());
-    f.project.elements.get_mut(&f.first).unwrap().parent = Some(foreign);
-    assert!(
-        set_message(
-            &f.project,
-            f.view,
-            ScenarioMessagePosition {
-                address: address(f.first),
-                send_y: 100.
-            }
-        )
-        .is_err()
-    );
-    f.project.elements.get_mut(&f.first).unwrap().parent = Some(f.owner);
-    f.project
-        .elements
-        .get_mut(&f.owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap()
-        .retain(|id| *id != f.first);
-    assert!(
-        set_message(
-            &f.project,
-            f.view,
-            ScenarioMessagePosition {
-                address: address(f.first),
-                send_y: 100.
-            }
-        )
-        .is_err()
-    );
-}
-
-#[test]
-fn duplicate_positions_reject_even_when_values_match() {
-    let mut f = fixture();
-    let lane = ScenarioLanePosition {
-        lifeline: f.lane,
-        x: 10.,
-    };
-    let message = ScenarioMessagePosition {
-        address: address(f.first),
-        send_y: 100.,
-    };
-    let entries = payload(f.project.diagrams.get_mut(&f.view).unwrap());
-    entries.lanes = vec![lane.clone(), lane.clone()];
-    entries.messages = vec![message.clone(), message.clone()];
-    assert!(has_code(&f.project, "duplicate_scenario_lane"));
-    assert!(has_code(&f.project, "duplicate_scenario_message"));
-    assert!(set_lane(&f.project, f.view, lane).is_err());
-    assert!(set_message(&f.project, f.view, message).is_err());
-    // Explicit removal can repair all duplicates of the targeted identity.
-    let result = remove_lane(&f.project, f.view, f.lane).unwrap();
-    save(&mut f.project, result);
-    let result = remove_message(&f.project, f.view, &address(f.first)).unwrap();
-    save(&mut f.project, result);
-    assert_admitted(&f.project);
-}
-
-#[test]
-fn sparse_absence_empty_payload_and_signed_zero_are_preserved() {
-    let mut f = fixture();
-    let absent = f.project.diagrams[&f.view].clone();
-    assert_eq!(remove_lane(&f.project, f.view, f.lane).unwrap(), absent);
-    assert_eq!(
-        remove_message(&f.project, f.view, &address(f.first)).unwrap(),
-        absent
-    );
-    assert!(
-        serde_json::to_value(&absent)
-            .unwrap()
-            .get("layout")
-            .is_none()
-    );
-    let result = set_lane(
-        &f.project,
-        f.view,
-        ScenarioLanePosition {
-            lifeline: f.lane,
-            x: -0.,
-        },
-    )
-    .unwrap();
-    save(&mut f.project, result);
-    let result = set_message(
-        &f.project,
-        f.view,
-        ScenarioMessagePosition {
-            address: address(f.first),
-            send_y: -0.,
-        },
-    )
-    .unwrap();
-    save(&mut f.project, result);
-    let result = set_lane(
-        &f.project,
-        f.view,
-        ScenarioLanePosition {
-            lifeline: f.lane,
-            x: 0.,
-        },
-    )
-    .unwrap();
-    assert_eq!(layout(&result).lanes[0].x.to_bits(), (-0.0_f32).to_bits());
-    let result = set_message(
-        &f.project,
-        f.view,
-        ScenarioMessagePosition {
-            address: address(f.first),
-            send_y: 0.,
-        },
-    )
-    .unwrap();
-    assert_eq!(
-        layout(&result).messages[0].send_y.to_bits(),
-        (-0.0_f32).to_bits()
-    );
-    assert_eq!(
-        serde_json::to_string(&result).unwrap(),
-        serde_json::to_string(&f.project.diagrams[&f.view]).unwrap()
-    );
-    let result = remove_lane(&f.project, f.view, f.lane).unwrap();
-    save(&mut f.project, result);
-    let result = remove_message(&f.project, f.view, &address(f.first)).unwrap();
-    assert_eq!(
-        result.layout,
-        Some(DiagramLayout::Scenario(ScenarioLayout::default()))
-    );
-    assert_ne!(result, absent);
-}
-
-#[test]
-fn bounds_are_structural_and_rejected_helpers_do_not_mutate_project() {
-    let mut f = fixture();
-    for value in [-MAX_COORDINATE, MAX_COORDINATE, -7., 0.] {
-        let result = set_lane(
-            &f.project,
-            f.view,
-            ScenarioLanePosition {
-                lifeline: f.lane,
-                x: value,
-            },
-        )
-        .unwrap();
-        save(&mut f.project, result);
-        let result = set_message(
-            &f.project,
-            f.view,
-            ScenarioMessagePosition {
-                address: address(f.first),
-                send_y: value,
-            },
-        )
-        .unwrap();
-        save(&mut f.project, result);
-        assert_admitted(&f.project);
-    }
-    let before = serde_json::to_string(&f.project).unwrap();
-    for value in [
-        f32::NAN,
-        f32::INFINITY,
-        f32::NEG_INFINITY,
-        MAX_COORDINATE + 1.,
-    ] {
-        assert!(
-            set_lane(
-                &f.project,
-                f.view,
-                ScenarioLanePosition {
-                    lifeline: f.lane,
-                    x: value
-                }
-            )
-            .is_err()
-        );
-        assert!(
-            set_message(
-                &f.project,
-                f.view,
-                ScenarioMessagePosition {
-                    address: address(f.first),
-                    send_y: value
-                }
-            )
-            .is_err()
-        );
-    }
-    assert_eq!(serde_json::to_string(&f.project).unwrap(), before);
-    payload(f.project.diagrams.get_mut(&f.view).unwrap()).messages[0].send_y = f32::NAN;
-    assert!(has_code(&f.project, "scenario_layout_coordinate"));
-}
-
-#[test]
-fn helpers_do_not_validate_unrelated_transient_records_in_repair_batches() {
-    let mut f = fixture();
-    payload(f.project.diagrams.get_mut(&f.view).unwrap())
-        .messages
-        .push(ScenarioMessagePosition {
-            address: address(f.second),
-            send_y: f32::INFINITY,
-        });
-    let result = set_lane(
-        &f.project,
-        f.view,
-        ScenarioLanePosition {
-            lifeline: f.lane,
-            x: 420.,
-        },
-    )
-    .unwrap();
-    save(&mut f.project, result);
-    assert!(has_code(&f.project, "scenario_layout_coordinate"));
-    let result = set_message(
-        &f.project,
-        f.view,
-        ScenarioMessagePosition {
-            address: address(f.second),
-            send_y: 300.,
-        },
-    )
-    .unwrap();
-    save(&mut f.project, result);
-    assert_admitted(&f.project);
-}
-
-#[test]
-fn projection_context_and_architecture_payloads_are_explicitly_separate() {
-    let mut f = fixture();
-    let scenario = f.project.diagrams[&f.view].projection;
-    assert_eq!(scenario.scenario(), Some(f.owner));
-    assert!(!scenario.is_architecture());
-    assert!(!scenario.includes(Kind::Lifeline));
-    assert!(ProjectionKind::Overview.is_architecture());
-    assert!(!ProjectionKind::StateMachine { machine: f.owner }.is_architecture());
-    f.project.diagrams.get_mut(&f.view).unwrap().layer = Layer::Sa;
-    assert!(has_code(&f.project, "scenario_diagram_context"));
-    assert!(remove_lane(&f.project, f.view, f.lane).is_err());
-    f.project.diagrams.get_mut(&f.view).unwrap().layer = Layer::Oa;
-    f.project
-        .diagrams
-        .get_mut(&f.view)
-        .unwrap()
-        .routes
-        .push(crate::EdgeRoute {
-            edge: f.exchange,
-            waypoints: vec![],
-            label: None,
-        });
-    assert!(has_code(&f.project, "scenario_diagram_content"));
-    f.project.diagrams.get_mut(&f.view).unwrap().routes.clear();
-    payload(f.project.diagrams.get_mut(&f.view).unwrap());
-    f.project.diagrams.get_mut(&f.view).unwrap().projection = ProjectionKind::Overview;
-    assert!(has_code(&f.project, "scenario_layout_projection"));
-    assert!(
-        set_lane(
-            &f.project,
-            f.view,
-            ScenarioLanePosition {
-                lifeline: f.lane,
-                x: 10.
-            }
-        )
-        .is_err()
-    );
-}
-
-#[test]
-fn typed_json_records_round_trip_and_reject_unknown_or_missing_fields() {
-    let mut f = fixture();
-    let result = set_message(
-        &f.project,
-        f.view,
-        ScenarioMessagePosition {
-            address: address(f.first),
-            send_y: 200.,
-        },
-    )
-    .unwrap();
-    save(&mut f.project, result);
-    let encoded = serde_json::to_value(&f.project.diagrams[&f.view]).unwrap();
-    assert_eq!(
-        serde_json::from_value::<Diagram>(encoded.clone()).unwrap(),
-        f.project.diagrams[&f.view]
-    );
-    assert_eq!(
-        encoded["layout"]["Scenario"]["messages"][0]["address"]["occurrence"],
-        serde_json::json!(f.first)
-    );
-    let mut unknown = encoded.clone();
-    unknown["layout"]["Scenario"]["messages"][0]["extra"] = serde_json::json!(1);
-    assert!(serde_json::from_value::<Diagram>(unknown).is_err());
-    let mut missing = encoded;
-    missing["layout"]["Scenario"]["messages"][0]["address"]
-        .as_object_mut()
-        .unwrap()
-        .remove("references");
-    assert!(serde_json::from_value::<Diagram>(missing).is_err());
-}
-
-#[test]
-fn deleting_only_actual_ids_preserves_latent_message_positions_and_other_views() {
-    let mut f = fixture();
-    let result = set_lane(
-        &f.project,
-        f.view,
-        ScenarioLanePosition {
-            lifeline: f.lane,
-            x: 420.,
-        },
-    )
-    .unwrap();
-    save(&mut f.project, result);
-    let result = set_message(
-        &f.project,
-        f.view,
-        ScenarioMessagePosition {
-            address: address(f.first),
-            send_y: 200.,
-        },
-    )
-    .unwrap();
-    save(&mut f.project, result);
-    let mut copied = f.project.diagrams[&f.view].clone();
-    copied.id = f.other_view;
-    copied.alias = "review_view".into();
-    copied.name = "Review view".into();
-    save(&mut f.project, copied.clone());
-    assert_admitted(&f.project);
-    assert_eq!(layout(&copied).messages[0].address.occurrence, f.first);
-    let mut candidate = f.project.diagrams[&f.view].clone();
-    prune_deleted(&mut candidate, &BTreeSet::from([f.lane, f.exchange]));
-    assert!(layout(&candidate).lanes.is_empty());
-    assert_eq!(layout(&candidate).messages.len(), 1);
-    prune_deleted(&mut candidate, &BTreeSet::from([f.first]));
-    assert!(layout(&candidate).messages.is_empty());
-    assert!(candidate.layout.is_some());
-    assert_eq!(f.project.diagrams[&f.other_view], copied);
-}
-
-#[test]
-fn reference_visitor_and_record_count_cover_explicit_rows() {
-    let f = fixture();
-    let mut d = f.project.diagrams[&f.view].clone();
-    assert_eq!(record_count(&d), 0);
-    let rows = payload(&mut d);
-    rows.lanes.push(ScenarioLanePosition {
-        lifeline: f.lane,
-        x: 50.,
-    });
-    rows.messages.push(ScenarioMessagePosition {
-        address: address(f.first),
-        send_y: 100.,
-    });
-    assert_eq!(record_count(&d), 3);
-    let replacement = Id::new_v4();
-    d.layout.as_mut().unwrap().visit_references(|id| {
-        if *id == f.first {
-            *id = replacement;
-        }
-    });
-    assert_eq!(layout(&d).messages[0].address.occurrence, replacement);
-    assert_eq!(layout(&d).messages[0].send_y, 100.);
-    assert_eq!(layout(&d).lanes[0].lifeline, f.lane);
-}
-
-#[test]
-fn a_real_scenario_use_never_imports_its_called_message_as_a_direct_target() {
-    let mut f = fixture();
-    let called = f
-        .project
-        .add_element(Kind::Scenario, Layer::Oa, "Called sequence", None)
-        .unwrap();
-    let Some(SharedBody::Scenario { viewpoint, .. }) =
-        f.project.elements.get_mut(&called).unwrap().shared_mut()
-    else {
-        panic!("Called Scenario fixture body");
-    };
-    *viewpoint = ScenarioViewpoint::ParticipantInteraction;
-    let called_message = f
-        .project
-        .add_element(Kind::Occurrence, Layer::Oa, "Called delivery", Some(called))
-        .unwrap();
-    set_body(
-        f.project.elements.get_mut(&called_message).unwrap(),
-        OccurrenceBody::Exchange {
-            exchange: None,
-            sender: None,
-            receiver: None,
-            message_kind: MessageKind::Asynchronous,
-            reply_to: None,
-            values: vec![],
-            operation: None,
-        },
-    );
-    *f.project
-        .elements
-        .get_mut(&called)
-        .unwrap()
-        .steps_mut()
-        .unwrap() = vec![called_message];
-    let usage = f
-        .project
-        .add_element(Kind::Occurrence, Layer::Oa, "Call sequence", Some(f.owner))
-        .unwrap();
-    set_body(
-        f.project.elements.get_mut(&usage).unwrap(),
-        OccurrenceBody::ScenarioUse {
-            scenario: Some(called),
-            bindings: vec![],
-        },
-    );
-    f.project
-        .elements
-        .get_mut(&f.owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap()
-        .push(usage);
-    assert_admitted(&f.project);
-    for target in [
-        address(called_message),
-        address(usage),
-        OccurrenceEndpoint {
-            references: vec![usage],
-            occurrence: called_message,
-        },
-    ] {
-        assert!(
-            set_message(
-                &f.project,
-                f.view,
-                ScenarioMessagePosition {
-                    address: target,
-                    send_y: 200.
-                }
-            )
-            .is_err()
-        );
-    }
-}
-
-mod source_lifecycle;

crates/oa-core/src/scenario_layout/tests/source_lifecycle.rs

@@ -1,245 +0,0 @@
-//! Source/command lifecycle checks for the candidate payload. Public version
-//! assignment remains the coordinated codec integration gate.
-use super::*;
-use crate::{Command, Session, language, prepare_command, source_project::*};
-
-fn authored(f: &Fixture) -> CompiledSourceProject {
-    let mut bundle = format_bundle(&f.project);
-    let initial = compile_bundle(&bundle, ProjectLimits::default()).unwrap();
-    let location = &initial.index.declarations[&f.view];
-    let source = bundle.files.get_mut(&location.path).unwrap();
-    let text = format!(
-        r#"diagram nominal_view "Nominal review" id "{}" {{
- projection {{ Scenario {{ scenario @{}; }}; }};
- layout {{ Scenario {{
-  lanes [
-   // Controller spacing rationale.
-   {{ lifeline @ // first lane identity
-      {}; x 4.20e2; }},
-   // Repeated performer has its own lane.
-   {{ lifeline @{}; x 680; }}
-  ];
-  messages [
-   // First delivery timing rationale.
-   {{ address {{ references []; occurrence @{}; }}; send_y 2.00e2; }},
-   // Second delivery timing rationale.
-   {{ address {{ references []; occurrence @{}; }}; send_y 350; }}
-  ];
- }}; }};
-}}
-"#,
-        f.view,
-        f.project.elements[&f.owner].alias,
-        f.project.elements[&f.lane].alias,
-        f.project.elements[&f.repeated_lane].alias,
-        f.project.elements[&f.first].alias,
-        f.project.elements[&f.second].alias
-    );
-    source.replace_range(location.span.start..location.span.end, &text);
-    compile_bundle(&bundle, ProjectLimits::default()).unwrap()
-}
-
-#[test]
-fn source_rows_follow_identity_order_and_keep_comments_numeric_spelling_and_file_ownership() {
-    let f = fixture();
-    let original = authored(&f);
-    let mut changed = original.decoded.project.clone();
-    let rows = payload(changed.diagrams.get_mut(&f.view).unwrap());
-    rows.lanes.swap(0, 1);
-    rows.messages.swap(0, 1);
-    rows.messages[0].send_y = 390.;
-    changed.elements.get_mut(&f.lane).unwrap().alias = "renamed_controller_lane".into();
-    let updated = update_bundle(&original, &changed, ProjectLimits::default()).unwrap();
-    assert_eq!(updated.decoded.project, changed);
-    let path = &original.index.declarations[&f.view].path;
-    assert_eq!(&updated.index.declarations[&f.view].path, path);
-    let text = &updated.bundle.files[path];
-    assert!(
-        text.find("// Repeated performer").unwrap() < text.find("// Controller spacing").unwrap(),
-        "{text}"
-    );
-    assert!(
-        text.find("// Second delivery").unwrap() < text.find("// First delivery").unwrap(),
-        "{text}"
-    );
-    assert!(
-        text.contains(
-            "lifeline @ // first lane identity\n      renamed_controller_lane; x 4.20e2;"
-        ),
-        "{text}"
-    );
-    assert!(text.contains("send_y 2.00e2"), "{text}");
-    assert!(text.contains("send_y 390"), "{text}");
-    for (other, bytes) in &original.bundle.files {
-        if other != path && !bytes.contains(&f.project.elements[&f.lane].alias) {
-            assert_eq!(&updated.bundle.files[other], bytes);
-        }
-    }
-    assert_eq!(
-        compile_bundle(&updated.bundle, ProjectLimits::default())
-            .unwrap()
-            .decoded
-            .project,
-        changed
-    );
-}
-
-#[test]
-fn source_identity_swap_keeps_each_coordinate_comment_with_its_original_object() {
-    let f = fixture();
-    let original = authored(&f);
-    let temporary = Id::new_v4();
-    let command = Command::Batch(vec![
-        Command::Reidentify(f.first, temporary),
-        Command::Reidentify(f.second, f.first),
-        Command::Reidentify(temporary, f.second),
-    ]);
-    let prepared = prepare_command(&original.decoded.project, &command).unwrap();
-    let mut changed = prepared.project;
-    payload(changed.diagrams.get_mut(&f.view).unwrap())
-        .messages
-        .swap(0, 1);
-    let updated = update_bundle_with_identity_map(
-        &original,
-        &changed,
-        &prepared.identity_map,
-        ProjectLimits::default(),
-    )
-    .unwrap();
-    assert_eq!(updated.decoded.project, changed);
-    let path = &original.index.declarations[&f.view].path;
-    let text = &updated.bundle.files[path];
-    assert!(
-        text.find("// Second delivery").unwrap() < text.find("// First delivery").unwrap(),
-        "{text}"
-    );
-    let first_comment = text.find("// First delivery").unwrap();
-    assert!(text[first_comment..].contains(&format!(
-        "occurrence @{}",
-        changed.elements[&f.second].alias
-    )));
-    assert!(text[first_comment..].contains("send_y 2.00e2"));
-}
-
-#[test]
-fn coordinate_batch_is_one_undo_and_numeric_noop_keeps_source_exact() {
-    let f = fixture();
-    let original = authored(&f);
-    let mut session = Session::new(original.decoded.project.clone());
-    session
-        .execute(Command::Batch(vec![
-            Command::SetScenarioLanePosition {
-                diagram: f.view,
-                position: ScenarioLanePosition {
-                    lifeline: f.lane,
-                    x: 510.,
-                },
-            },
-            Command::SetScenarioMessagePosition {
-                diagram: f.view,
-                position: ScenarioMessagePosition {
-                    address: address(f.second),
-                    send_y: 430.,
-                },
-            },
-        ]))
-        .unwrap();
-    let changed = session.project().clone();
-    assert_eq!(session.revision(), 1);
-    assert_eq!(changed.elements, original.decoded.project.elements);
-    assert_eq!(changed.relations, original.decoded.project.relations);
-    let updated = update_bundle(&original, &changed, ProjectLimits::default()).unwrap();
-    session.undo();
-    assert_eq!(session.project(), &original.decoded.project);
-    assert!(!session.can_undo());
-    session.redo();
-    assert_eq!(session.project(), &changed);
-    session
-        .execute(Command::SetScenarioMessagePosition {
-            diagram: f.view,
-            position: ScenarioMessagePosition {
-                address: address(f.second),
-                send_y: 430.,
-            },
-        })
-        .unwrap();
-    assert_eq!(session.revision(), 3);
-    let noop = update_bundle(&updated, session.project(), ProjectLimits::default()).unwrap();
-    assert_eq!(noop.bundle, updated.bundle);
-}
-
-#[test]
-fn absent_and_empty_payload_round_trip_distinctly_and_remove_does_not_materialize_absence() {
-    let f = fixture();
-    let before = language::format(&f.project);
-    let mut session = Session::new(f.project.clone());
-    session
-        .execute(Command::RemoveScenarioLanePosition {
-            diagram: f.view,
-            lifeline: f.lane,
-        })
-        .unwrap();
-    assert_eq!(session.project(), &f.project);
-    assert!(!session.can_undo());
-    assert_eq!(language::format(session.project()), before);
-    let mut present = f.project.clone();
-    present.diagrams.get_mut(&f.view).unwrap().layout =
-        Some(DiagramLayout::Scenario(ScenarioLayout::default()));
-    let text = language::format(&present);
-    assert_ne!(text, before);
-    assert_eq!(language::parse(&text).unwrap(), present);
-    assert_eq!(language::parse(&before).unwrap(), f.project);
-}
-
-#[test]
-fn invalid_layout_source_rejects_without_changing_last_compiled_workspace() {
-    let f = fixture();
-    let original = authored(&f);
-    let before = original.bundle.clone();
-    let path = original.index.declarations[&f.view].path.clone();
-    for replacement in ["x 1e30", "x not_a_number"] {
-        let mut candidate = before.clone();
-        let source = candidate.files.get_mut(&path).unwrap();
-        *source = source.replace("x 4.20e2", replacement);
-        assert!(compile_bundle(&candidate, ProjectLimits::default()).is_err());
-        assert_eq!(original.bundle, before);
-    }
-    let mut candidate = before.clone();
-    let source = candidate.files.get_mut(&path).unwrap();
-    *source = source.replace(
-        &format!("occurrence @{}", f.project.elements[&f.first].alias),
-        &format!("occurrence @{}", f.project.elements[&f.performer].alias),
-    );
-    assert!(compile_bundle(&candidate, ProjectLimits::default()).is_err());
-    assert_eq!(original.bundle, before);
-}
-
-#[test]
-fn explicit_none_survives_other_edits_while_real_payload_clear_removes_values() {
-    let f = fixture();
-    let mut bundle = format_bundle(&f.project);
-    let compiled = compile_bundle(&bundle, ProjectLimits::default()).unwrap();
-    let location = &compiled.index.declarations[&f.view];
-    let path = location.path.clone();
-    bundle.files.get_mut(&path).unwrap().insert_str(
-        location.span.end - 1,
-        "\n layout // explicitly automatic\n none;\n",
-    );
-    let original = compile_bundle(&bundle, ProjectLimits::default()).unwrap();
-    let mut described = original.decoded.project.clone();
-    described.diagrams.get_mut(&f.view).unwrap().description =
-        "Review spacing independently".into();
-    let updated = update_bundle(&original, &described, ProjectLimits::default()).unwrap();
-    assert!(updated.bundle.files[&path].contains("layout // explicitly automatic\n none;"));
-    assert_eq!(updated.decoded.project, described);
-    let mut empty = described.clone();
-    empty.diagrams.get_mut(&f.view).unwrap().layout =
-        Some(DiagramLayout::Scenario(ScenarioLayout::default()));
-    let present = update_bundle(&updated, &empty, ProjectLimits::default()).unwrap();
-    assert_eq!(present.decoded.project, empty);
-    assert!(present.bundle.files[&path].contains("// explicitly automatic"));
-    let cleared = update_bundle(&present, &described, ProjectLimits::default()).unwrap();
-    assert_eq!(cleared.decoded.project, described);
-    assert!(!cleared.bundle.files[&path].contains("layout"));
-    assert!(cleared.bundle.files[&path].contains("// explicitly automatic"));
-}

crates/oa-core/src/session.rs

@@ -23,22 +23,6 @@ pub enum Command {
     EditRelation(Id, Relation),
     CreateDiagram(Diagram),
     EditDiagram(Id, Diagram),
-    SetScenarioLanePosition {
-        diagram: Id,
-        position: ScenarioLanePosition,
-    },
-    RemoveScenarioLanePosition {
-        diagram: Id,
-        lifeline: Id,
-    },
-    SetScenarioMessagePosition {
-        diagram: Id,
-        position: ScenarioMessagePosition,
-    },
-    RemoveScenarioMessagePosition {
-        diagram: Id,
-        address: OccurrenceEndpoint,
-    },
     CreateArtifact(ArtifactLink),
     EditArtifact(Id, ArtifactLink),
     CreateTrace(Trace),
@@ -504,26 +488,6 @@ fn apply_command(
             reidentify_tracked(p, *old, value.id, provenance)?;
             Some(value.id)
         }
-        Command::SetScenarioLanePosition { diagram, position } => {
-            let replacement = crate::scenario_layout::set_lane(p, *diagram, position.clone())?;
-            p.diagrams.insert(*diagram, replacement);
-            Some(*diagram)
-        }
-        Command::RemoveScenarioLanePosition { diagram, lifeline } => {
-            let replacement = crate::scenario_layout::remove_lane(p, *diagram, *lifeline)?;
-            p.diagrams.insert(*diagram, replacement);
-            Some(*diagram)
-        }
-        Command::SetScenarioMessagePosition { diagram, position } => {
-            let replacement = crate::scenario_layout::set_message(p, *diagram, position.clone())?;
-            p.diagrams.insert(*diagram, replacement);
-            Some(*diagram)
-        }
-        Command::RemoveScenarioMessagePosition { diagram, address } => {
-            let replacement = crate::scenario_layout::remove_message(p, *diagram, address)?;
-            p.diagrams.insert(*diagram, replacement);
-            Some(*diagram)
-        }
         Command::CreateArtifact(value) => {
             vacant(p, value.id)?;
             p.artifact_links.insert(value.id, value.clone());
@@ -914,7 +878,6 @@ pub fn reidentify(p: &mut Project, old: Id, new: Id) -> Result<(), ModelError> {
         return Ok(());
     }
     vacant(p, new)?;
-    crate::references::check_remap(p, old, new)?;
     if p.id == old {
         p.id = new;
     } else if let Some(mut v) = p.elements.remove(&old) {
@@ -941,17 +904,12 @@ pub fn reidentify(p: &mut Project, old: Id, new: Id) -> Result<(), ModelError> {
             }
         }
     }
-    crate::references::remap_references(p, old, new)?;
+    crate::references::remap_references(p, old, new);
     Ok(())
 }
 fn layout(p: &mut Project, diagram: Id) -> Result<(), ModelError> {
     use std::collections::{BTreeMap, BTreeSet};
     let d = p.diagrams.get(&diagram).ok_or_else(missing)?;
-    if d.projection.scenario().is_some() {
-        return Err(ModelError(
-            "Scenario layout requires the Scenario geometry operation.".into(),
-        ));
-    }
     let parents = crate::projection::parents(p, d);
     let mut children: BTreeMap<Option<Id>, Vec<Id>> = BTreeMap::new();
     for (id, parent) in &parents {

crates/oa-core/src/source_project.rs

@@ -930,18 +930,7 @@ pub fn update_bundle_with_identity_map(
             };
             let local = edits.entry(path.clone()).or_default();
             update.header(&actual.header, &previous.header, &next.header, local);
-            let context = if old.diagrams.contains_key(&id) {
-                EditContext::Diagram
-            } else {
-                EditContext::Other
-            };
-            update.value(
-                &actual.fields,
-                Some(&previous.fields),
-                &next.fields,
-                context,
-                local,
-            );
+            update.value(&actual.fields, Some(&previous.fields), &next.fields, local);
         }
     }
     if old.id != project.id || old.alias != project.alias || old.name != project.name {
@@ -1130,29 +1119,6 @@ fn inserted_value(text: &str, indent: &str, source: &str) -> String {
     output
 }
 
-// Schema context is explicit: similarly named fields in arbitrary records must
-// never acquire Scenario row identity or move their authored trivia.
-#[derive(Clone, Copy)]
-enum EditContext {
-    Other,
-    Diagram,
-    Layout,
-    Scenario,
-    Lanes,
-    Messages,
-}
-impl EditContext {
-    fn field(self, name: &str) -> Self {
-        match (self, name) {
-            (Self::Diagram, "layout") => Self::Layout,
-            (Self::Layout, "Scenario") => Self::Scenario,
-            (Self::Scenario, "lanes") => Self::Lanes,
-            (Self::Scenario, "messages") => Self::Messages,
-            _ => Self::Other,
-        }
-    }
-}
-
 struct SyntaxUpdate<'a> {
     source: &'a str,
     before: &'a str,
@@ -1219,7 +1185,6 @@ impl SyntaxUpdate<'_> {
         actual: &language::EditValue,
         before: Option<&language::EditValue>,
         after: &language::EditValue,
-        context: EditContext,
         edits: &mut LocalEdits,
     ) {
         use language::EditKind;
@@ -1235,7 +1200,7 @@ impl SyntaxUpdate<'_> {
                         None
                     }
                 });
-                self.record(actual.span, fields, previous, next, context, edits);
+                self.record(actual.span, fields, previous, next, edits);
             }
             (EditKind::List(items), EditKind::List(next)) => {
                 let previous = before.and_then(|old| {
@@ -1245,7 +1210,7 @@ impl SyntaxUpdate<'_> {
                         None
                     }
                 });
-                self.list(actual.span, items, previous, next, context, edits);
+                self.list(actual.span, items, previous, next, edits);
             }
             (EditKind::Reference(_), EditKind::Reference(alias)) => {
                 let token = significant(&self.source[actual.span.start..actual.span.end])
@@ -1298,7 +1263,6 @@ impl SyntaxUpdate<'_> {
         actual: &BTreeMap<String, language::EditField>,
         before: Option<&BTreeMap<String, language::EditField>>,
         after: &BTreeMap<String, language::EditField>,
-        context: EditContext,
         edits: &mut LocalEdits,
     ) {
         // A typed constructor tag change retains shared fields and their trivia.
@@ -1322,13 +1286,7 @@ impl SyntaxUpdate<'_> {
                     },
                     new_key.clone(),
                 ));
-                self.value(
-                    &field.value,
-                    Some(&old.value),
-                    &new.value,
-                    context.field(new_key),
-                    edits,
-                );
+                self.value(&field.value, Some(&old.value), &new.value, edits);
                 return;
             }
         }
@@ -1340,16 +1298,9 @@ impl SyntaxUpdate<'_> {
                         .and_then(|fields| fields.get(key))
                         .map(|field| &field.value),
                     &next.value,
-                    context.field(key),
                     edits,
                 );
-            } else if !(matches!(context, EditContext::Diagram)
-                && key == "layout"
-                && before.is_some_and(|fields| !fields.contains_key(key)))
-            {
-                // Canonical None omits layout. Preserve an authored explicit
-                // none while another field changes; a real Some->None clear
-                // still removes the former payload and retains its trivia.
+            } else {
                 erase_syntax(self.source, field.span, edits);
             }
         }
@@ -1404,7 +1355,6 @@ impl SyntaxUpdate<'_> {
         actual: &[language::EditValue],
         before: Option<&[language::EditValue]>,
         after: &[language::EditValue],
-        context: EditContext,
         edits: &mut LocalEdits,
     ) {
         let previous = before.unwrap_or(&[]);
@@ -1417,7 +1367,6 @@ impl SyntaxUpdate<'_> {
                     self.old_aliases,
                     self.legacy_value_paths,
                     None,
-                    context,
                 )
             })
             .collect();
@@ -1430,7 +1379,6 @@ impl SyntaxUpdate<'_> {
                     self.new_aliases,
                     self.legacy_value_paths,
                     self.identity_origins,
-                    context,
                 )
             })
             .collect();
@@ -1459,7 +1407,7 @@ impl SyntaxUpdate<'_> {
                 .all(|(i, source)| *source == Some(i))
         {
             for (i, (current, next)) in actual.iter().zip(after).enumerate() {
-                self.value(current, previous.get(i), next, EditContext::Other, edits);
+                self.value(current, previous.get(i), next, edits);
             }
             return;
         }
@@ -1492,13 +1440,7 @@ impl SyntaxUpdate<'_> {
                 let chunk = chunks[index];
                 text.push_str(&self.source[chunk.start..current.span.start]);
                 let mut local = Vec::new();
-                self.value(
-                    current,
-                    previous.get(index),
-                    next,
-                    EditContext::Other,
-                    &mut local,
-                );
+                self.value(current, previous.get(index), next, &mut local);
                 text.push_str(&changed_text(self.source, current.span, local));
                 suffix = &self.source[current.span.end..chunk.end];
             } else {
@@ -1541,58 +1483,14 @@ impl SyntaxUpdate<'_> {
     }
 }
 
-fn scenario_item_key(
-    value: &language::EditValue,
-    aliases: &BTreeMap<String, String>,
-    context: EditContext,
-) -> Option<String> {
-    use language::EditKind;
-    let EditKind::Record(fields) = &value.kind else {
-        return None;
-    };
-    let reference = |value: &language::EditValue| {
-        if let EditKind::Reference(alias) = &value.kind {
-            aliases.get(alias).cloned()
-        } else {
-            None
-        }
-    };
-    match context {
-        EditContext::Lanes => {
-            reference(&fields.get("lifeline")?.value).map(|id| format!("scenario-lane:{id}"))
-        }
-        EditContext::Messages => {
-            let EditKind::Record(address) = &fields.get("address")?.value.kind else {
-                return None;
-            };
-            let occurrence = reference(&address.get("occurrence")?.value)?;
-            let path: Vec<_> = match address.get("references") {
-                None => Vec::new(),
-                Some(field) => {
-                    let EditKind::List(path) = &field.value.kind else {
-                        return None;
-                    };
-                    path.iter().map(reference).collect::<Option<Vec<_>>>()?
-                }
-            };
-            Some(format!("scenario-message:{}:{occurrence}", path.join("/")))
-        }
-        _ => None,
-    }
-}
-
 fn item_key(
     value: &language::EditValue,
     source: &str,
     aliases: &BTreeMap<String, String>,
     legacy_value_paths: bool,
     origins: Option<&BTreeMap<Id, Id>>,
-    context: EditContext,
 ) -> Option<String> {
     use language::EditKind;
-    if matches!(context, EditContext::Lanes | EditContext::Messages) {
-        return scenario_item_key(value, aliases, context);
-    }
     if matches!(value.kind, EditKind::Record(_))
         && let Some(key) = language::semantic_row_key(
             &source[value.span.start..value.span.end],

crates/oa-core/src/source_project/source_migration.rs

@@ -68,11 +68,6 @@ pub(super) fn upgrade(
                 &actual.fields,
                 Some(&actual.fields),
                 &next.fields,
-                if project.diagrams.contains_key(&id) {
-                    EditContext::Diagram
-                } else {
-                    EditContext::Other
-                },
                 edits.entry(path.clone()).or_default(),
             );
         }

crates/oa-core/src/validation.rs

@@ -619,7 +619,6 @@ pub fn validate(p: &Project) -> Vec<Issue> {
         }
         text(&mut out, d.id, "name", &d.name);
         text(&mut out, d.id, "description", &d.description);
-        crate::scenario_layout::validate_diagram(p, d, &mut out);
         let option_issues = if d.projection == ProjectionKind::Traceability {
             crate::view_options::validate_options_cross_layer(p, &d.view_options)
         } else {

crates/oa-core/tests/release_routing.rs

@@ -41,7 +41,6 @@ fn fixture() -> Fixture {
             projection: ProjectionKind::Overview,
             view_options: Default::default(),
             nodes: BTreeMap::new(),
-            layout: None,
             routes: vec![],
         },
     );

crates/oa-core/tests/source7_contract.rs

@@ -261,7 +261,7 @@ fn source7_context_lifecycle_source_history_and_closed_admission() {
     assert_eq!(session.project(), &after);
     let fresh = Id::new_v4();
     let mut reidentified = after.clone();
-    references::remap_references(&mut reidentified, f.r1, fresh).unwrap();
+    references::remap_references(&mut reidentified, f.r1, fresh);
     let mut e = reidentified.elements.remove(&f.r1).unwrap();
     e.id = fresh;
     reidentified.elements.insert(fresh, e);

crates/oa-core/tests/state_diagrams.rs

@@ -20,7 +20,6 @@ fn view(p: &mut Project, machine: Id, alias: &str) -> Id {
             projection: ProjectionKind::StateMachine { machine },
             view_options: Default::default(),
             nodes: BTreeMap::new(),
-            layout: None,
             routes: vec![],
         },
     );

crates/oa-desktop/src/app/architecture_authoring.rs

@@ -138,7 +138,7 @@ pub fn validate_saved(p: &Project, s: &Saved) -> Result<(), String> {
         .diagrams
         .get(&s.diagram)
         .ok_or("The creation draft's diagram is missing.")?;
-    if !d.projection.is_architecture()
+    if matches!(d.projection, ProjectionKind::StateMachine { .. })
         || s.query.len() > 16384
         || s.page > 1_000_000
         || s.point
@@ -180,7 +180,7 @@ pub fn validate_saved(p: &Project, s: &Saved) -> Result<(), String> {
 }
 fn context_kinds(p: &Project, d: &Diagram) -> Vec<Kind> {
     let mut values = match (d.layer, d.projection) {
-        (_, ProjectionKind::StateMachine { .. } | ProjectionKind::Scenario { .. }) => vec![],
+        (_, ProjectionKind::StateMachine { .. }) => vec![],
         (Layer::Oa, ProjectionKind::FunctionalDataflow) => vec![Kind::Activity],
         (Layer::Sa, ProjectionKind::FunctionalDataflow) => vec![Kind::Function],
         (Layer::Oa, ProjectionKind::Capabilities) => vec![
@@ -208,12 +208,11 @@ pub fn kinds(app: &App) -> Vec<Kind> {
         .unwrap_or_default()
 }
 fn compatible(p: &Project, d: &Diagram, id: Id) -> bool {
-    d.projection.is_architecture()
-        && p.elements.get(&id).is_some_and(|e| {
-            e.kind() != Kind::Port
-                && d.projection.includes(e.kind())
-                && (e.layer() == d.layer || d.projection == ProjectionKind::Traceability)
-        })
+    p.elements.get(&id).is_some_and(|e| {
+        e.kind() != Kind::Port
+            && d.projection.includes(e.kind())
+            && (e.layer() == d.layer || d.projection == ProjectionKind::Traceability)
+    })
 }
 fn suggested(p: &Project, d: &Diagram, kind: Kind) -> bool {
     // Existing System remains a useful choice even when the singleton exists.
@@ -258,17 +257,6 @@ pub fn candidates(app: &App) -> Vec<(Id, String, bool)> {
 }
 impl App {
     pub(super) fn architecture_event(&mut self, event: Event) -> Task<Message> {
-        if matches!(
-            &event,
-            Event::Start(..) | Event::Allocate(..) | Event::Existing(..)
-        ) && !self
-            .active_diagram
-            .and_then(|id| self.project().diagrams.get(&id))
-            .is_some_and(|d| d.projection.is_architecture())
-        {
-            self.status = "Choose an architecture view before adding architecture content.".into();
-            return Task::none();
-        }
         match event {
             Event::Start(_, point) | Event::Allocate(_, _, point) | Event::Existing(point) => {
                 if self.architecture.is_some() {

crates/oa-desktop/src/app/diagram_reveal.rs

@@ -1,6 +1,5 @@
 //! Complete a navigation camera after the destination reports its real viewport.
 use super::*;
-use crate::behavior::scenario_layout::Representation;
 use crate::diagram_usage::{Context, Surface};
 #[cfg(test)]
 mod tests;
@@ -48,23 +47,11 @@ impl App {
                     && c.epoch == *epoch,
             ),
             Message::ScenarioCanvas(behavior::scenario::CanvasEvent::Viewport(c, size)) => (
-                match c.representation {
-                    Representation::Derived { owner } => Surface::Scenario(owner),
-                    Representation::Saved { diagram } => Surface::Saved(diagram),
-                },
+                Surface::Scenario(c.scenario),
                 *size,
                 c.document == context.document
                     && c.revision == context.revision
-                    && c.epoch == *epoch
-                    && self.pending_scenario_reveal_visit == Some(c.visit)
-                    && self.page == Page::Behavior
-                    && self.behavior.active_owner == Some(c.scenario)
-                    && self.behavior.scenario.context(
-                        self.canvas_document,
-                        c.scenario,
-                        self.document.revision(),
-                        self.canvas_epoch,
-                    ) == Some(*c),
+                    && c.epoch == *epoch,
             ),
             Message::StateDiagram(behavior::state_edit::Event::Viewport(c, size)) => (
                 Surface::Saved(c.diagram),
@@ -98,13 +85,11 @@ impl App {
                 | Message::DiagramUsage(_)
                 | Message::DiagramUsagesReady(_)
                 | Message::SourceSymbolsReady(_)
-                | Message::SourceRenameReady(_)
                 | Message::TopologyCanvas(behavior::topology::CanvasEvent::Viewport(..))
                 | Message::ScenarioCanvas(behavior::scenario::CanvasEvent::Viewport(..))
                 | Message::StateDiagram(behavior::state_edit::Event::Viewport(..))
         ) {
             self.pending_diagram_reveal = None;
-            self.pending_scenario_reveal_visit = None;
             if !Self::is_navigation_camera(message) {
                 self.diagram_navigation_focus = None;
             }
@@ -156,6 +141,5 @@ impl App {
             self.reveal_diagram_usage(&usage);
         }
         self.pending_diagram_reveal = None;
-        self.pending_scenario_reveal_visit = None;
     }
 }

crates/oa-desktop/src/app/diagram_reveal/tests.rs

@@ -98,7 +98,6 @@ fn fixture(canvas: Canvas) -> (App, Usage) {
                     layer: Layer::Oa,
                     projection: ProjectionKind::StateMachine { machine },
                     nodes: BTreeMap::new(),
-                    layout: None,
                     routes: vec![],
                     view_options: Default::default(),
                 },
@@ -144,7 +143,6 @@ fn measurement(
     epoch: u64,
     surface: Surface,
     size: Size,
-    visit: Id,
 ) -> Message {
     match canvas {
         Canvas::Architecture => Message::DiagramRevealViewport(context, epoch, size),
@@ -161,10 +159,6 @@ fn measurement(
             behavior::scenario::Context {
                 document: context.document,
                 scenario: surface.id(),
-                representation: Representation::Derived {
-                    owner: surface.id(),
-                },
-                visit,
                 revision: context.revision,
                 epoch,
             },
@@ -182,16 +176,12 @@ fn measurement(
     }
 }
 
-fn stamp(app: &App) -> (Context, u64, Id) {
+fn stamp(app: &App) -> (Context, u64) {
     let (context, _, epoch) = app
         .pending_diagram_reveal
         .as_ref()
         .expect("reveal awaits measured destination");
-    (
-        *context,
-        *epoch,
-        app.pending_scenario_reveal_visit.unwrap_or(Id::nil()),
-    )
+    (*context, *epoch)
 }
 
 fn assert_centered(app: &App, canvas: Canvas, target: &Usage) {
@@ -229,11 +219,7 @@ fn assert_centered(app: &App, canvas: Canvas, target: &Usage) {
             expected.choose_tool(target.surface.id(), behavior::scenario::CanvasTool::Select);
             expected.viewport(ACTUAL);
             expected.zoom(Some(zoom));
-            expected.camera(
-                app.project(),
-                target.surface.id(),
-                behavior::canvas_workspace::Event::Pan(pan),
-            );
+            expected.camera(behavior::canvas_workspace::Event::Pan(pan));
             assert!(app.behavior.scenario.camera_boundary() == expected.camera_boundary());
         }
     }
@@ -252,10 +238,10 @@ fn all_reveal_surfaces_recenter_once_after_the_real_viewport_and_preserve_author
             app.document.dirty(),
         );
         assert!(app.reveal_diagram_usage(&target));
-        let (context, epoch, visit) = stamp(&app);
+        let (context, epoch) = stamp(&app);
         send(
             &mut app,
-            measurement(canvas, context, epoch, target.surface, ACTUAL, visit),
+            measurement(canvas, context, epoch, target.surface, ACTUAL),
         );
         assert!(app.pending_diagram_reveal.is_none());
         assert_centered(&app, canvas, &target);
@@ -274,7 +260,7 @@ fn all_reveal_surfaces_recenter_once_after_the_real_viewport_and_preserve_author
         let camera = app.camera_boundary();
         send(
             &mut app,
-            measurement(canvas, context, epoch, target.surface, ACTUAL, visit),
+            measurement(canvas, context, epoch, target.surface, ACTUAL),
         );
         assert!(app.pending_diagram_reveal.is_none());
         assert!(app.camera_boundary() == camera);
@@ -288,7 +274,7 @@ fn malformed_or_wrong_stamp_measurements_cannot_poison_a_pending_reveal() {
         for invalid in 0..6 {
             let (mut app, target) = fixture(canvas);
             assert!(app.reveal_diagram_usage(&target));
-            let (context, epoch, visit) = stamp(&app);
+            let (context, epoch) = stamp(&app);
             let camera = app.camera_boundary();
             let mut stale = context;
             let mut wrong_epoch = epoch;
@@ -303,13 +289,13 @@ fn malformed_or_wrong_stamp_measurements_cannot_poison_a_pending_reveal() {
             }
             send(
                 &mut app,
-                measurement(canvas, stale, wrong_epoch, target.surface, size, visit),
+                measurement(canvas, stale, wrong_epoch, target.surface, size),
             );
             assert!(
                 app.pending_diagram_reveal.is_some(),
                 "{canvas:?} invalid case {invalid}"
             );
-            assert_eq!(stamp(&app), (context, epoch, visit));
+            assert_eq!(stamp(&app), (context, epoch));
             assert_eq!(app.canvas_epoch, epoch);
             assert!(
                 app.camera_boundary() == camera,
@@ -317,7 +303,7 @@ fn malformed_or_wrong_stamp_measurements_cannot_poison_a_pending_reveal() {
             );
             send(
                 &mut app,
-                measurement(canvas, context, epoch, target.surface, ACTUAL, visit),
+                measurement(canvas, context, epoch, target.surface, ACTUAL),
             );
             assert!(app.pending_diagram_reveal.is_none());
             assert_centered(&app, canvas, &target);
@@ -331,10 +317,9 @@ fn actual_window_resize_before_first_measurement_retains_focus_for_the_new_conte
         let (mut app, target) = fixture(canvas);
         let accepted = app.document.snapshot();
         assert!(app.reveal_diagram_usage(&target));
-        let (context, old_epoch, visit) = stamp(&app);
+        let (context, old_epoch) = stamp(&app);
         send(&mut app, Message::WindowResized(Size::new(1100., 700.)));
-        let (current, epoch, current_visit) = stamp(&app);
-        assert_eq!(current_visit, visit);
+        let (current, epoch) = stamp(&app);
         assert_eq!(current, context);
         assert_eq!(epoch, app.canvas_epoch);
         if matches!(canvas, Canvas::Process | Canvas::Scenario) {
@@ -342,14 +327,14 @@ fn actual_window_resize_before_first_measurement_retains_focus_for_the_new_conte
             let camera = app.camera_boundary();
             send(
                 &mut app,
-                measurement(canvas, context, old_epoch, target.surface, ACTUAL, visit),
+                measurement(canvas, context, old_epoch, target.surface, ACTUAL),
             );
-            assert_eq!(stamp(&app), (current, epoch, visit));
+            assert_eq!(stamp(&app), (current, epoch));
             assert!(app.camera_boundary() == camera);
         }
         send(
             &mut app,
-            measurement(canvas, current, epoch, target.surface, ACTUAL, visit),
+            measurement(canvas, current, epoch, target.surface, ACTUAL),
         );
         assert!(app.pending_diagram_reveal.is_none());
         assert_centered(&app, canvas, &target);
@@ -364,7 +349,7 @@ fn user_camera_edit_and_navigation_cancel_deferred_focus_without_late_snapping()
             let (mut app, target) = fixture(canvas);
             let accepted = app.document.snapshot();
             assert!(app.reveal_diagram_usage(&target));
-            let (context, epoch, visit) = stamp(&app);
+            let (context, epoch) = stamp(&app);
             let event = match action {
                 0 => match canvas {
                     Canvas::Architecture => Message::Pan(Vector::new(31., -17.)),
@@ -401,7 +386,7 @@ fn user_camera_edit_and_navigation_cancel_deferred_focus_without_late_snapping()
             // restore the old navigation camera after deliberate user input.
             send(
                 &mut app,
-                measurement(canvas, context, epoch, target.surface, WIDE, visit),
+                measurement(canvas, context, epoch, target.surface, WIDE),
             );
             assert!(app.pending_diagram_reveal.is_none());
             assert!(

crates/oa-desktop/src/app/diagram_usages.rs

@@ -1,6 +1,5 @@
 //! Navigation-only adapter: validates destinations before changing presentation.
 use super::*;
-use crate::behavior::scenario_layout::{Representation, presentation};
 use crate::diagram_usage::{self as usage, Context, Event, Panel, Surface, Target, Usage};
 #[cfg(test)]
 mod tests;
@@ -16,7 +15,6 @@ impl App {
 
     fn usage_navigation_available(&self) -> bool {
         !self.busy
-            && !self.source_rename.open()
             && self.pending.is_none()
             && self.file_prompt.is_none()
             && !self.delete_pending
@@ -165,7 +163,6 @@ impl App {
             // Only an accepted new chooser supersedes the previous reveal.
             // Rejected/stale panel envelopes leave its first measurement intact.
             self.pending_diagram_reveal = None;
-            self.pending_scenario_reveal_visit = None;
             self.diagram_navigation_focus = None;
             self.canvas_epoch = self.canvas_epoch.wrapping_add(1);
             return Task::batch([
@@ -288,78 +285,11 @@ impl App {
         Task::none()
     }
 
-    /// Explicit saved-Scenario reveal runs before generic Apply. An absent target
-    /// never selects the owner or another saved arrangement as a fallback.
-    pub(super) fn reveal_saved_scenario(&mut self, diagram: Id, selected: Id) -> Task<Message> {
-        if self.diagram_usages.is_some() || !self.usage_navigation_available() {
-            self.status = "Apply or revert pending edits before revealing a saved Scenario. Your inputs are retained.".into();
-            return Task::none();
-        }
-        if presentation::checked_owner(self.project(), Representation::Saved { diagram }).is_none()
-        {
-            return Task::none();
-        }
-        let Some(found) = self
-            .current_surface_usages(selected, Surface::Saved(diagram))
-            .into_iter()
-            .find(|row| matches!(row.target, Target::Whole | Target::ScenarioObject(_)))
-        else {
-            self.status = "This object has no visible target in that saved Scenario.".into();
-            return Task::none();
-        };
-        self.reveal_diagram_usage(&found);
-        Task::none()
-    }
-
     pub(super) fn reveal_diagram_usage(&mut self, usage: &Usage) -> bool {
         if !self.usage_navigation_available() {
             return false;
         }
         let previous_layer = self.layer;
-        let scenario_representation = match usage.surface {
-            Surface::Saved(diagram) if self.saved_scenario_diagram(diagram) => {
-                Some(Representation::Saved { diagram })
-            }
-            Surface::Scenario(owner) => Some(Representation::Derived { owner }),
-            _ => None,
-        };
-        if let Some(representation) = scenario_representation {
-            let Some(owner) = presentation::checked_owner(self.project(), representation) else {
-                return false;
-            };
-            if !self
-                .behavior
-                .scenario
-                .representation_usages(self.project(), representation, usage.subject)
-                .iter()
-                .any(|row| row == usage)
-            {
-                return false;
-            }
-            // Finish target/camera admission before changing the App route. The
-            // checked immutable owner also makes the following entry infallible.
-            let revealed = match representation {
-                Representation::Derived { .. } => self.behavior.scenario.reveal_usage(
-                    self.document.project(),
-                    self.canvas_document,
-                    owner,
-                    &usage.target,
-                ),
-                Representation::Saved { .. } => self.behavior.scenario.reveal_representation_usage(
-                    self.document.project(),
-                    self.canvas_document,
-                    owner,
-                    representation,
-                    &usage.target,
-                ),
-            };
-            if !revealed {
-                return false;
-            }
-            if !self.enter_scenario_representation(representation) {
-                return false;
-            }
-        }
         let p = self.document.project();
         let (selected, placement) = match &usage.target {
             Target::Whole => (usage.surface.id(), None),
@@ -399,10 +329,7 @@ impl App {
                 };
                 self.layer = diagram.layer;
                 self.active_diagram = Some(id);
-                if let Some(owner) = diagram.projection.scenario() {
-                    self.behavior.active_owner = Some(owner);
-                    self.page = Page::Behavior;
-                } else if let Some(machine) = diagram.projection.state_machine() {
+                if let Some(machine) = diagram.projection.state_machine() {
                     let viewport = self.behavior.diagram.viewport.unwrap_or(iced::Size::new(
                         (self.window_size.width - 610.).max(280.),
                         (self.window_size.height - 320.).max(240.),
@@ -444,14 +371,19 @@ impl App {
                 self.page = Page::Behavior;
             }
             Surface::Scenario(owner) => {
+                if !self.behavior.scenario.reveal_usage(
+                    p,
+                    self.canvas_document,
+                    owner,
+                    &usage.target,
+                ) {
+                    return false;
+                }
                 self.layer = p.elements[&owner].layer();
                 self.behavior.active_owner = Some(owner);
                 self.page = Page::Behavior;
             }
         }
-        if scenario_representation.is_none() {
-            self.behavior.scenario.forget_view();
-        }
         self.selected = selected;
         self.selected_node = placement;
         self.model_menu = None;
@@ -478,18 +410,6 @@ impl App {
             usage: usage.clone(),
             selected,
         });
-        self.pending_scenario_reveal_visit = scenario_representation.and_then(|representation| {
-            let owner = presentation::checked_owner(self.project(), representation)?;
-            self.behavior
-                .scenario
-                .context(
-                    self.canvas_document,
-                    owner,
-                    self.document.revision(),
-                    self.canvas_epoch,
-                )
-                .map(|context| context.visit)
-        });
         self.pending_diagram_reveal = Some((
             Context {
                 document: self.canvas_document,
@@ -510,20 +430,10 @@ impl App {
             Surface::Saved(id) => {
                 self.active_diagram == Some(id)
                     && matches!(self.page, Page::Diagram | Page::Behavior)
-                    && (!self.saved_scenario_diagram(id)
-                        || (self.page == Page::Behavior
-                            && self.behavior.scenario.representation()
-                                == Some(Representation::Saved { diagram: id })))
             }
-            Surface::Process(owner) => {
+            Surface::Process(owner) | Surface::Scenario(owner) => {
                 self.page == Page::Behavior && self.behavior.active_owner == Some(owner)
             }
-            Surface::Scenario(owner) => {
-                self.page == Page::Behavior
-                    && self.behavior.active_owner == Some(owner)
-                    && self.behavior.scenario.representation()
-                        == Some(Representation::Derived { owner })
-            }
         };
         (current_surface
             && focus.usage.surface == surface

crates/oa-desktop/src/app/diagram_usages/tests.rs

@@ -1029,9 +1029,10 @@ fn repeated_preview_arrows_select_the_relation_and_highlight_the_exact_caller_li
         let camera = app.behavior.topology.camera_boundary();
         if call == calls[1]
             && let Some((previous_call, previous)) = &previous_camera
-            && *previous_call != call
         {
-            assert!(&camera != previous);
+            if *previous_call != call {
+                assert!(&camera != previous);
+            }
         }
         if let Some(epoch) = previous_epoch {
             assert_ne!(app.canvas_epoch, epoch);
@@ -1374,7 +1375,7 @@ fn whole_surface_camera_fits_huge_extent_while_target_camera_remains_readable()
     };
     let viewport = iced::Size::new(800., 500.);
     let (zoom, pan) = usage::camera_for(&Target::Whole, bounds, viewport);
-    assert!((0.0001..0.05).contains(&zoom));
+    assert!(zoom < 0.05 && zoom >= 0.0001);
     assert!(bounds.width * zoom <= viewport.width - 64. + 0.01);
     assert!(bounds.height * zoom <= viewport.height - 64. + 0.01);
     assert!((bounds.center_x() * zoom + pan.x - viewport.width / 2.).abs() < 0.01);
@@ -1400,5 +1401,3 @@ fn completion_releases_worker_behind_busy_modal_without_navigation() {
     assert_eq!(location(&app), prior);
     assert_eq!(authored(&app), before);
 }
-
-mod saved_scenario;

crates/oa-desktop/src/app/diagram_usages/tests/saved_scenario.arcadia

@@ -1,108 +0,0 @@
-arcadia 7;
-project incident_workspace "Incident report review" id "70200000-0000-4000-8000-000000000001" {
-    // Two operational activities, with one lifeline appearance per Scenario.
-    oa_activity report_incident "Report incident" id "70200000-0000-4000-8000-000000000002" {}
-    oa_activity assess_incident "Assess incident" id "70200000-0000-4000-8000-000000000003" {}
-    interaction incident_report "Incident report" id "70200000-0000-4000-8000-000000000004" {
-        source @report_incident;
-        target @assess_incident;
-    }
-
-    oa_scenario incident_response "Review a reported incident" id "70200000-0000-4000-8000-000000000010" {
-        viewpoint OperationalActivity;
-        steps [@initial_report, @updated_report, @assess_call, @assess_reply, @unfinished_notice, @use_review];
-    }
-    oa_lifeline reporter "Reporting activity" id "70200000-0000-4000-8000-000000000011" {
-        parent @incident_response; represented @report_incident;
-    }
-    oa_lifeline assessor "Assessment activity" id "70200000-0000-4000-8000-000000000012" {
-        parent @incident_response; represented @assess_incident;
-    }
-    // Both appearances reuse one definition. Navigation must retain the occurrence.
-    oa_occurrence initial_report "Initial incident report" id "70200000-0000-4000-8000-000000000020" {
-        parent @incident_response;
-        body { Exchange { exchange @incident_report; sender @reporter; receiver @assessor; message_kind Asynchronous; }; };
-    }
-    oa_occurrence updated_report "Updated incident report" id "70200000-0000-4000-8000-000000000021" {
-        parent @incident_response;
-        body { Exchange { exchange @incident_report; sender @reporter; receiver @assessor; message_kind Asynchronous; }; };
-    }
-    // A correlated self call/reply with deliberately unassigned exchange definitions.
-    oa_occurrence assess_call "Assess report details" id "70200000-0000-4000-8000-000000000022" {
-        parent @incident_response;
-        body { Exchange { exchange none; sender @assessor; receiver @assessor; message_kind Call; }; };
-    }
-    oa_occurrence assess_reply "Assessment ready" id "70200000-0000-4000-8000-000000000023" {
-        parent @incident_response;
-        body { Exchange { exchange none; sender @assessor; receiver @assessor; message_kind Reply; reply_to @assess_call; }; };
-    }
-    // Intentional unfinished work: no receiver and therefore no fabricated arrow.
-    oa_occurrence unfinished_notice "Follow-up recipient undecided" id "70200000-0000-4000-8000-000000000024" {
-        parent @incident_response;
-        body { Exchange { exchange @incident_report; sender @reporter; receiver none; message_kind Asynchronous; }; };
-    }
-    oa_occurrence use_review "Use the reviewed reporting procedure" id "70200000-0000-4000-8000-000000000025" {
-        parent @incident_response;
-        body { ScenarioUse {
-            bindings [{ local @reporter; referenced @review_reporter; }, { local @assessor; referenced @review_assessor; }];
-            scenario @reporting_review;
-        }; };
-    }
-
-    // This definition stays opaque in the caller. Open it, then Back to the saved view.
-    oa_scenario reporting_review "Reporting procedure detail" id "70200000-0000-4000-8000-000000000030" {
-        viewpoint OperationalActivity;
-        steps [@review_delivery];
-    }
-    oa_lifeline review_reporter "Reporting activity in detail" id "70200000-0000-4000-8000-000000000031" {
-        parent @reporting_review; represented @report_incident;
-    }
-    oa_lifeline review_assessor "Assessment activity in detail" id "70200000-0000-4000-8000-000000000032" {
-        parent @reporting_review; represented @assess_incident;
-    }
-    oa_occurrence review_delivery "Check the incident report" id "70200000-0000-4000-8000-000000000033" {
-        parent @reporting_review;
-        body { Exchange { exchange @incident_report; sender @review_reporter; receiver @review_assessor; message_kind Asynchronous; }; };
-    }
-
-    diagram incident_readable "A - Incident review readable" id "70200000-0000-4000-8000-000000000040" {
-        layer Oa;
-        projection { Scenario { scenario @incident_response; }; };
-        layout { Scenario {
-            lanes [{ lifeline @reporter; x 160; }, { lifeline @assessor; x 640; }];
-            messages [
-                { address { references []; occurrence @initial_report; }; send_y 160; },
-                { address { references []; occurrence @updated_report; }; send_y 252; },
-                { address { references []; occurrence @assess_call; }; send_y 344; },
-                { address { references []; occurrence @assess_reply; }; send_y 436; }
-            ];
-        }; };
-    }
-    diagram incident_wide "B - Incident review negative and far" id "70200000-0000-4000-8000-000000000041" {
-        layer Oa;
-        projection { Scenario { scenario @incident_response; }; };
-        layout { Scenario {
-            lanes [{ lifeline @reporter; x -500; }, { lifeline @assessor; x 50000; }];
-            messages [
-                { address { references []; occurrence @initial_report; }; send_y 160; },
-                { address { references []; occurrence @updated_report; }; send_y 252; },
-                { address { references []; occurrence @assess_call; }; send_y 344; },
-                { address { references []; occurrence @assess_reply; }; send_y 436; }
-            ];
-        }; };
-    }
-    diagram incident_repair "C - Incident review needs layout repair" id "70200000-0000-4000-8000-000000000042" {
-        layer Oa;
-        projection { Scenario { scenario @incident_response; }; };
-        layout { Scenario {
-            // These valid authored lanes must remain saved during complete fallback.
-            lanes [{ lifeline @reporter; x 900; }, { lifeline @assessor; x -500; }];
-            messages [
-                // REPAIR: change only this 300 to 424, then Undo and Redo the edit.
-                { address { references []; occurrence @assess_reply; }; send_y 300; },
-                // This authored value stays latent while the receiver is missing.
-                { address { references []; occurrence @unfinished_notice; }; send_y 2000; }
-            ];
-        }; };
-    }
-}

crates/oa-desktop/src/app/diagram_usages/tests/saved_scenario.rs

@@ -1,356 +0,0 @@
-//! Actual App chooser/explicit-reveal checks for saved Scenario identity and source history.
-use super::*;
-use crate::behavior::scenario::{CanvasEvent, State};
-use crate::behavior::scenario_layout::{
-    Representation,
-    presentation::{self, PresentationStatus},
-};
-use iced::{Size, Vector};
-
-fn fixture() -> App {
-    let p = language::parse(include_str!("saved_scenario.arcadia")).unwrap();
-    let errors: Vec<_> = oa_core::validation::validate(&p)
-        .into_iter()
-        .filter(|d| d.severity == oa_core::validation::Severity::Error)
-        .collect();
-    assert!(errors.is_empty(), "{errors:?}");
-    App::with_project(p)
-}
-fn id(app: &App, alias: &str) -> Id {
-    app.project()
-        .identities()
-        .into_iter()
-        .find(|(_, a)| *a == alias)
-        .unwrap()
-        .0
-}
-fn representation(view: Id) -> Representation {
-    Representation::Saved { diagram: view }
-}
-fn find(app: &App, subject: Id, view: Id) -> Usage {
-    usage::saved_usages_for(app.project(), subject, Some(view))
-        .into_iter()
-        .find(|row| row.target == Target::ScenarioObject(subject))
-        .expect("exact saved occurrence")
-}
-fn context(app: &App) -> behavior::scenario::Context {
-    let owner = app.behavior.active_owner.unwrap();
-    app.behavior
-        .scenario
-        .context(
-            app.canvas_document,
-            owner,
-            app.document.revision(),
-            app.canvas_epoch,
-        )
-        .unwrap()
-}
-fn navigate(app: &mut App, subject: Id, view: Id) -> Id {
-    let (token, rows) = open(app, subject);
-    let found = rows
-        .into_iter()
-        .find(|u| u.surface == Surface::Saved(view) && u.target == Target::ScenarioObject(subject))
-        .expect("saved chooser destination");
-    choose(app, token, found);
-    assert!(app.diagram_usages.is_none());
-    assert_eq!(app.page, Page::Behavior);
-    assert_eq!(app.active_diagram, Some(view));
-    assert_eq!(
-        app.behavior.scenario.representation(),
-        Some(representation(view))
-    );
-    assert_eq!(app.selected, subject);
-    token
-}
-
-#[test]
-fn saved_queries_use_each_actual_presentation_and_keep_repeated_appearances_and_references_opaque()
-{
-    let app = fixture();
-    let owner = id(&app, "incident_response");
-    let first = id(&app, "initial_report");
-    let second = id(&app, "updated_report");
-    let exchange = id(&app, "incident_report");
-    let latent = id(&app, "unfinished_notice");
-    let callee_message = id(&app, "review_delivery");
-    let views = ["incident_readable", "incident_wide", "incident_repair"].map(|a| id(&app, a));
-    let derived = app
-        .behavior
-        .scenario
-        .diagram_usages(app.project(), owner, first)
-        .pop()
-        .unwrap();
-    let rows = views.map(|view| find(&app, first, view));
-    assert_eq!(rows[0].bounds.y - derived.bounds.y, 12.);
-    assert_ne!(rows[0].bounds, rows[1].bounds);
-    assert_eq!(
-        rows[2].bounds, derived.bounds,
-        "complete fallback cannot retain the authored lane override"
-    );
-    for view in views {
-        let represented = usage::saved_usages_for(app.project(), exchange, Some(view));
-        assert_eq!(represented.len(), 2);
-        assert!(
-            represented
-                .iter()
-                .any(|u| u.target == Target::ScenarioObject(first))
-        );
-        assert!(
-            represented
-                .iter()
-                .any(|u| u.target == Target::ScenarioObject(second))
-        );
-        assert!(
-            represented
-                .iter()
-                .all(|u| u.surface == Surface::Saved(view))
-        );
-        assert!(usage::saved_usages_for(app.project(), callee_message, Some(view)).is_empty());
-        assert_eq!(
-            find(&app, latent, view).target,
-            Target::ScenarioObject(latent)
-        );
-        let shown = presentation::present(app.project(), representation(view), owner);
-        let whole = usage::saved_usages_for(app.project(), view, Some(view));
-        assert_eq!(whole.len(), 1);
-        assert_eq!(whole[0].target, Target::Whole);
-        assert_eq!(Some(whole[0].bounds), shown.bounds());
-    }
-    let wide = presentation::present(app.project(), representation(views[1]), owner)
-        .bounds()
-        .unwrap();
-    assert!(wide.x < -500. && wide.x + wide.width > 50000.);
-    let fallback = presentation::present(app.project(), representation(views[2]), owner);
-    assert!(matches!(
-        fallback.status(),
-        PresentationStatus::Fallback { .. }
-    ));
-    assert_eq!(fallback.latent_messages(), &[latent]);
-    assert!(!fallback.capabilities().coordinate_input);
-}
-
-#[test]
-fn saved_chooser_and_explicit_reveal_preserve_complete_source_and_actual_undo_redo() {
-    for alias in ["incident_readable", "incident_wide", "incident_repair"] {
-        let mut app = fixture();
-        let view = id(&app, alias);
-        let first = id(&app, "initial_report");
-        let owner = id(&app, "incident_response");
-        let original = app.document.snapshot();
-        app.document
-            .execute(Command::Rename(first, "Reviewed incident report".into()))
-            .unwrap();
-        let edited = app.document.snapshot();
-        app.sync_source();
-        app.refresh_draft();
-        let before = authored(&app);
-        navigate(&mut app, first, view);
-        assert_eq!(app.behavior.active_owner, Some(owner));
-        assert_eq!(authored(&app), before);
-        send(&mut app, Message::RevealInDiagram(view, first));
-        assert_eq!(app.active_diagram, Some(view));
-        assert_eq!(authored(&app), before);
-        assert!(app.document.undo());
-        assert_eq!(app.project(), &original.decoded.project);
-        assert_eq!(app.document.bundle(), &original.bundle);
-        assert!(app.document.redo());
-        assert_eq!(app.project(), &edited.decoded.project);
-        assert_eq!(app.document.bundle(), &edited.bundle);
-    }
-}
-
-#[test]
-fn saved_reveal_and_chooser_refuse_source_property_and_behavior_drafts() {
-    for chooser in [false, true] {
-        for block in 0..3 {
-            let mut app = fixture();
-            let view = id(&app, "incident_repair");
-            let first = id(&app, "initial_report");
-            let choice = chooser.then(|| {
-                let (token, rows) = open(&mut app, first);
-                (
-                    token,
-                    rows.into_iter()
-                        .find(|u| u.surface == Surface::Saved(view))
-                        .unwrap(),
-                )
-            });
-            match block {
-                0 => {
-                    let cursor = app.source_editor.cursor();
-                    app.source_workspace
-                        .edit("? preserve unfinished source".into(), cursor);
-                }
-                1 => {
-                    app.draft
-                        .as_mut()
-                        .unwrap()
-                        .input("/name", "Unapplied inspector value".into());
-                    assert!(app.draft_dirty());
-                }
-                _ => {
-                    let p = app.project().clone();
-                    app.behavior
-                        .creation
-                        .update(&p, behavior::creation::Event::Open(Layer::Oa))
-                        .unwrap();
-                    assert!(app.behavior.has_pending());
-                }
-            }
-            let before = authored(&app);
-            let prior = location(&app);
-            let draft = app
-                .draft
-                .as_ref()
-                .map(|d| serde_json::to_value(d.recovery_snapshot()).unwrap());
-            if let Some((token, row)) = choice {
-                choose(&mut app, token, row);
-            } else {
-                send(&mut app, Message::RevealInDiagram(view, first));
-            }
-            assert_eq!(authored(&app), before);
-            assert_eq!(location(&app), prior);
-            assert_eq!(
-                app.draft
-                    .as_ref()
-                    .map(|d| serde_json::to_value(d.recovery_snapshot()).unwrap()),
-                draft
-            );
-        }
-    }
-}
-
-#[test]
-fn saved_a_b_a_rejects_old_visit_and_panel_callbacks_before_deferred_measurement() {
-    let mut app = fixture();
-    let a = id(&app, "incident_readable");
-    let b = id(&app, "incident_wide");
-    let first = id(&app, "initial_report");
-    let before = authored(&app);
-    let old_token = navigate(&mut app, first, a);
-    let old = context(&app);
-    navigate(&mut app, first, b);
-    navigate(&mut app, first, a);
-    let current = context(&app);
-    assert_ne!(old.visit, current.visit);
-    let held = behavior::scenario::Context {
-        epoch: current.epoch,
-        ..old
-    };
-    let camera = app.behavior.scenario.camera_boundary();
-    send(
-        &mut app,
-        Message::ScenarioCanvas(CanvasEvent::Viewport(held, Size::new(900., 900.))),
-    );
-    send(&mut app, Message::ScenarioCanvas(CanvasEvent::Focus(held)));
-    send(
-        &mut app,
-        Message::DiagramUsage(Event::Search(old_token, "obsolete filter".into())),
-    );
-    send(&mut app, Message::DiagramUsage(Event::Close(old_token)));
-    assert_eq!(app.pending_scenario_reveal_visit, Some(current.visit));
-    assert!(app.pending_diagram_reveal.is_some());
-    assert!(app.behavior.scenario.camera_boundary() == camera);
-    let bounds = find(&app, first, a).bounds;
-    send(
-        &mut app,
-        Message::ScenarioCanvas(CanvasEvent::Viewport(current, Size::new(500., 300.))),
-    );
-    assert!(app.pending_diagram_reveal.is_none());
-    assert_eq!(context(&app).visit, current.visit);
-    let mut expected = State::default();
-    expected.enter_representation(app.canvas_document, current.scenario, representation(a));
-    expected.viewport(Size::new(500., 300.));
-    expected.zoom(Some(1.25));
-    expected.camera(
-        app.project(),
-        current.scenario,
-        behavior::canvas_workspace::Event::Pan(Vector::new(
-            250. - bounds.center_x() * 1.25,
-            150. - bounds.center_y() * 1.25,
-        )),
-    );
-    assert!(app.behavior.scenario.camera_boundary() == expected.camera_boundary());
-    assert_eq!(authored(&app), before);
-}
-
-#[test]
-fn retargeted_saved_view_cannot_reveal_a_former_owner_occurrence() {
-    let mut app = fixture();
-    let first = id(&app, "initial_report");
-    let view = id(&app, "incident_readable");
-    let other = id(&app, "reporting_review");
-    let (token, rows) = open(&mut app, first);
-    let old = rows
-        .into_iter()
-        .find(|u| u.surface == Surface::Saved(view))
-        .unwrap();
-    let mut replacement = app.project().diagrams[&view].clone();
-    replacement.projection = ProjectionKind::Scenario { scenario: other };
-    replacement.layout = None;
-    app.document
-        .execute(Command::EditDiagram(view, replacement))
-        .unwrap();
-    app.sync_source();
-    app.refresh_draft();
-    let before = authored(&app);
-    let prior = location(&app);
-    choose(&mut app, token, old);
-    assert_eq!(location(&app), prior);
-    assert_eq!(authored(&app), before);
-    finish_lookup(&mut app);
-    let token = app.diagram_usages.as_ref().unwrap().token;
-    assert!(
-        app.diagram_usages
-            .as_ref()
-            .unwrap()
-            .usages
-            .iter()
-            .all(|u| u.surface != Surface::Saved(view))
-    );
-    send(&mut app, Message::DiagramUsage(Event::Close(token)));
-    send(&mut app, Message::RevealInDiagram(view, first));
-    assert_eq!(location(&app), prior);
-    assert_eq!(authored(&app), before);
-}
-
-#[test]
-fn explicit_saved_layout_repair_undo_redo_requeries_authored_and_fallback_geometry_without_extra_history()
- {
-    let mut app = fixture();
-    let view = id(&app, "incident_repair");
-    let first = id(&app, "initial_report");
-    let reply = id(&app, "assess_reply");
-    let before = app.document.snapshot();
-    let fallback = find(&app, first, view);
-    app.document
-        .execute(Command::SetScenarioMessagePosition {
-            diagram: view,
-            position: oa_core::ScenarioMessagePosition {
-                address: oa_core::OccurrenceEndpoint {
-                    references: vec![],
-                    occurrence: reply,
-                },
-                send_y: 424.,
-            },
-        })
-        .unwrap();
-    app.sync_source();
-    app.refresh_draft();
-    let repaired = app.document.snapshot();
-    let authored_row = find(&app, first, view);
-    assert_ne!(authored_row.bounds, fallback.bounds);
-    navigate(&mut app, first, view);
-    assert!(app.document.undo());
-    app.sync_source();
-    app.refresh_draft();
-    assert_eq!(app.project(), &before.decoded.project);
-    assert_eq!(app.document.bundle(), &before.bundle);
-    assert_eq!(find(&app, first, view).bounds, fallback.bounds);
-    assert!(app.document.redo());
-    app.sync_source();
-    app.refresh_draft();
-    assert_eq!(app.project(), &repaired.decoded.project);
-    assert_eq!(app.document.bundle(), &repaired.bundle);
-    assert_eq!(find(&app, first, view).bounds, authored_row.bounds);
-}

crates/oa-desktop/src/app/process_canvas.rs

@@ -65,7 +65,6 @@ impl App {
                 owner: context.owner,
                 revision: context.revision,
                 epoch: lifetime,
-                scenario_view: None,
             };
             if self.behavior.has_pending()
                 || self.draft_dirty()

crates/oa-desktop/src/app/scenario_details_tests.rs

@@ -1,281 +0,0 @@
-//! Actual arrangement selection and current-record Details admission.
-use super::*;
-use crate::behavior::canvas_workspace::tests::Mounted;
-use crate::behavior::scenario::{CanvasEvent, Context, Shelf};
-use crate::behavior::scenario_layout::Representation;
-use iced::{Point, Size, advanced::widget};
-
-const FIXTURE: &str = include_str!("diagram_usages/tests/saved_scenario.arcadia");
-
-fn id(app: &App, alias: &str) -> Id {
-    app.project()
-        .identities()
-        .into_iter()
-        .find(|(_, name)| *name == alias)
-        .unwrap()
-        .0
-}
-fn setup() -> (App, Id, Id, Id) {
-    let mut app = App::with_project(oa_core::language::parse(FIXTURE).unwrap());
-    let a = id(&app, "incident_readable");
-    let b = id(&app, "incident_wide");
-    let owner = id(&app, "incident_response");
-    let _ = app.update(Message::Select(owner));
-    let _ = app.update(Message::Page(Page::Behavior));
-    choose(&mut app, Representation::Saved { diagram: a });
-    let _ = app.update(Message::Select(a));
-    app.window_size = Size::new(1440., 1000.);
-    (app, a, b, owner)
-}
-fn send(app: &mut App, event: impl FnOnce(Context) -> CanvasEvent) {
-    let context = app.scenario_context().unwrap();
-    let _ = app.update(Message::ScenarioCanvas(event(context)));
-}
-fn choose(app: &mut App, representation: Representation) {
-    send(app, |context| {
-        CanvasEvent::Representation(context, representation)
-    });
-}
-fn model_state(app: &App) -> (u64, bool, bool, bool) {
-    (
-        app.document.revision(),
-        app.document.dirty(),
-        app.document.can_undo(),
-        app.document.can_redo(),
-    )
-}
-
-#[tokio::test]
-async fn actual_arrangement_picker_follows_selected_saved_record_and_opens_b_properties() {
-    let (mut app, a, b, _) = setup();
-    let mut mounted = Mounted::new(&mut app).await;
-    let snapshot = app.document.snapshot();
-    let before = model_state(&app);
-    let captured = app.scenario_context().unwrap();
-    let picker = mounted.geometry(&app).bounds("scenario-arrangement-picker");
-    assert!(
-        app.window_size.height - (picker.y + picker.height) > picker.y,
-        "fixture has room for Iced's menu below the actual picker"
-    );
-    assert_eq!(app.selected, a);
-    mounted.click(&mut app, picker.center()).await;
-    // iced_widget 0.14.2 overlay/menu.rs uses default line height plus
-    // vertical padding for each row. The real workspace orders Automatic,
-    // then the fixture's A/B/C Diagram IDs. Select B from the actual overlay.
-    let row_height =
-        f32::from(iced::advanced::text::LineHeight::default().to_absolute(12.into())) + 10.;
-    let b_row = Point::new(
-        picker.center_x(),
-        picker.y + picker.height + row_height * 2.5,
-    );
-    assert!(b_row.y < app.window_size.height);
-    let events = mounted.click(&mut app, b_row).await;
-    assert!(events.iter().any(|event| matches!(event,
-        Message::ScenarioCanvas(CanvasEvent::Representation(context, Representation::Saved { diagram }))
-        if *context == captured && *diagram == b)), "must exercise the actual arrangement callback");
-    assert_eq!(app.selected, b);
-    assert_eq!(app.draft.as_ref().unwrap().original, b);
-    assert_eq!(
-        app.draft.as_ref().unwrap().value["name"],
-        "B - Incident review negative and far"
-    );
-    assert_eq!(app.active_diagram, Some(b));
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        Representation::Saved { diagram: b }
-    );
-    assert_ne!(app.scenario_context().unwrap().visit, captured.visit);
-
-    send(&mut app, CanvasEvent::Focus);
-    send(&mut app, |context| {
-        CanvasEvent::Shelf(context, Shelf::Selection)
-    });
-    mounted.settle(&mut app).await;
-    let geometry = mounted.geometry(&app);
-    let (details, offset) = geometry.scrolls[&widget::Id::new("scenario-details")];
-    let point = geometry.bounds("scenario-properties").center() - offset;
-    assert!(details.contains(point));
-    let events = mounted.click(&mut app, point).await;
-    assert!(events.iter().any(|event| matches!(event,
-        Message::ScenarioCanvas(CanvasEvent::Properties(_, selected)) if *selected == b)));
-    mounted.settle(&mut app).await;
-    let geometry = mounted.geometry(&app);
-    let (inspector, offset) = geometry.scrolls[&widget::Id::new("inspector")];
-    assert!(
-        geometry
-            .text_inputs
-            .iter()
-            .any(|bounds| inspector.contains(bounds.center() - offset)),
-        "current B Properties must expose an actual editable field"
-    );
-    assert!(!app.behavior.scenario.focused());
-    assert!(
-        !geometry
-            .scrolls
-            .contains_key(&widget::Id::new("scenario-details"))
-    );
-    assert_eq!(
-        app.inspector_tab,
-        crate::navigation::InspectorTab::Properties
-    );
-    assert_eq!(app.selected, b);
-    assert_eq!(app.draft.as_ref().unwrap().original, b);
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    assert_eq!(app.project(), &snapshot.decoded.project);
-    assert_eq!(app.document.bundle(), &snapshot.bundle);
-    assert_eq!(model_state(&app), before);
-}
-
-#[test]
-fn arrangement_change_preserves_independent_semantic_and_foreign_view_selection() {
-    for alias in [
-        "initial_report",
-        "reporter",
-        "incident_response",
-        "incident_repair",
-    ] {
-        let (mut app, _, b, _) = setup();
-        let selected = id(&app, alias);
-        let _ = app.update(Message::Select(selected));
-        let snapshot = app.document.snapshot();
-        let before = model_state(&app);
-        choose(&mut app, Representation::Saved { diagram: b });
-        assert_eq!(app.selected, selected, "independent selection {alias}");
-        assert_eq!(app.draft.as_ref().unwrap().original, selected);
-        assert_eq!(app.active_diagram, Some(b));
-        assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-        assert_eq!(app.document.bundle(), &snapshot.bundle);
-        assert_eq!(model_state(&app), before);
-        if alias == "incident_repair" {
-            assert!(!behavior::scenario::properties_target(
-                app.project(),
-                app.scenario_context().unwrap(),
-                selected
-            ));
-        }
-    }
-}
-
-#[test]
-fn arrangement_follows_view_record_to_automatic_owner_but_not_owner_back_to_saved() {
-    let (mut app, _, b, owner) = setup();
-    let snapshot = app.document.snapshot();
-    let before = model_state(&app);
-    choose(&mut app, Representation::Derived { owner });
-    assert_eq!(app.selected, owner);
-    assert_eq!(app.draft.as_ref().unwrap().original, owner);
-    assert_eq!(app.active_diagram, None);
-    assert!(behavior::scenario::properties_target(
-        app.project(),
-        app.scenario_context().unwrap(),
-        owner
-    ));
-    choose(&mut app, Representation::Saved { diagram: b });
-    assert_eq!(
-        app.selected, owner,
-        "Scenario owner is now independent semantic selection"
-    );
-    assert_eq!(app.draft.as_ref().unwrap().original, owner);
-    assert_eq!(app.active_diagram, Some(b));
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    assert_eq!(app.document.bundle(), &snapshot.bundle);
-    assert_eq!(model_state(&app), before);
-}
-
-#[test]
-fn arrangement_applies_only_the_old_view_draft_then_follows_b_with_one_undo() {
-    let (mut app, a, b, _) = setup();
-    let snapshot = app.document.snapshot();
-    let mut expected = app.project().clone();
-    expected.diagrams.get_mut(&a).unwrap().name = "Reviewed A".into();
-    let revision = app.document.revision();
-    let _ = app.update(Message::Field("/name".into(), "Reviewed A".into()));
-    choose(&mut app, Representation::Saved { diagram: b });
-    assert_eq!(app.project(), &expected);
-    assert_eq!(app.selected, b);
-    assert_eq!(app.draft.as_ref().unwrap().original, b);
-    assert!(!app.draft_dirty());
-    assert_eq!(app.document.revision(), revision + 1);
-    let accepted = app.document.snapshot();
-    let _ = app.update(Message::Undo);
-    assert_eq!(app.project(), &snapshot.decoded.project);
-    assert_eq!(app.document.bundle(), &snapshot.bundle);
-    assert!(!app.document.can_undo() && app.document.can_redo());
-    let _ = app.update(Message::Redo);
-    assert_eq!(app.project(), &expected);
-    assert_eq!(app.document.bundle(), &accepted.bundle);
-    assert!(app.document.can_undo() && !app.document.can_redo());
-}
-
-#[test]
-fn same_arrangement_uuid_edit_follows_the_reidentified_record_and_round_trips_source() {
-    let (mut app, a, _, _) = setup();
-    let snapshot = app.document.snapshot();
-    let replacement = Id::parse_str("70200000-0000-4000-8000-000000000099").unwrap();
-    let mut expected = app.project().clone();
-    let mut diagram = expected.diagrams.remove(&a).unwrap();
-    diagram.id = replacement;
-    expected.diagrams.insert(replacement, diagram);
-    let _ = app.update(Message::Field("/id".into(), replacement.to_string()));
-    choose(&mut app, Representation::Saved { diagram: a });
-    assert_eq!(app.project(), &expected);
-    assert_eq!(app.selected, replacement);
-    assert_eq!(app.draft.as_ref().unwrap().original, replacement);
-    assert_eq!(app.active_diagram, Some(replacement));
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        Representation::Saved {
-            diagram: replacement
-        }
-    );
-    let accepted = app.document.snapshot();
-    let _ = app.update(Message::Undo);
-    assert_eq!(app.project(), &snapshot.decoded.project);
-    assert_eq!(app.document.bundle(), &snapshot.bundle);
-    assert!(!app.document.can_undo() && app.document.can_redo());
-    let _ = app.update(Message::Redo);
-    assert_eq!(app.project(), &expected);
-    assert_eq!(app.document.bundle(), &accepted.bundle);
-    assert!(!app.document.can_redo());
-}
-
-#[test]
-fn invalid_draft_and_stale_arrangement_preserve_selection_inputs_and_accepted_state() {
-    let (mut app, a, b, _) = setup();
-    let old = app.scenario_context().unwrap();
-    let snapshot = app.document.snapshot();
-    let before = model_state(&app);
-    let _ = app.update(Message::Field("/id".into(), "not-a-uuid".into()));
-    let draft_value = app.draft.as_ref().unwrap().value.clone();
-    choose(&mut app, Representation::Saved { diagram: b });
-    assert_eq!(app.selected, a);
-    assert_eq!(app.active_diagram, Some(a));
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        old.representation
-    );
-    assert_eq!(app.draft.as_ref().unwrap().value, draft_value);
-    assert_eq!(app.draft.as_ref().unwrap().inputs["/id"].raw, "not-a-uuid");
-    assert!(app.draft_dirty());
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    assert_eq!(model_state(&app), before);
-    let _ = app.update(Message::RevertProperties);
-    choose(&mut app, Representation::Saved { diagram: b });
-    let current = app.scenario_context().unwrap();
-    let _ = app.update(Message::Field("/name".into(), "Retained B input".into()));
-    let selected = app.selected;
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Representation(
-        old,
-        Representation::Saved { diagram: a },
-    )));
-    assert_eq!(app.selected, selected);
-    assert_eq!(app.active_diagram, Some(b));
-    assert_eq!(app.scenario_context().unwrap().visit, current.visit);
-    assert_eq!(
-        app.draft.as_ref().unwrap().inputs["/name"].raw,
-        "Retained B input"
-    );
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    assert_eq!(app.document.bundle(), &snapshot.bundle);
-    assert_eq!(model_state(&app), before);
-}

crates/oa-desktop/src/app/scenario_diagram.rs

@@ -1,96 +0,0 @@
-//! Saved Scenario navigation is presentation state, never a document edit.
-use super::*;
-use crate::behavior::scenario_layout::{Representation, presentation::checked_owner};
-
-impl App {
-    pub(super) fn enter_scenario_representation(&mut self, representation: Representation) -> bool {
-        let Some(owner) = checked_owner(self.project(), representation) else {
-            self.status =
-                "This Scenario view is no longer available or has an incompatible owner.".into();
-            return false;
-        };
-        self.layer = self.project().elements[&owner].layer();
-        self.page = Page::Behavior;
-        self.behavior.active_owner = Some(owner);
-        match representation {
-            Representation::Saved { diagram } => self.active_diagram = Some(diagram),
-            Representation::Derived { .. } => {
-                if self
-                    .active_diagram
-                    .is_some_and(|id| self.saved_scenario_diagram(id))
-                {
-                    self.active_diagram = None;
-                }
-            }
-        }
-        self.selected_node = None;
-        if self
-            .behavior
-            .scenario
-            .enter_representation(self.canvas_document, owner, representation)
-        {
-            self.canvas_epoch = self.canvas_epoch.wrapping_add(1);
-        }
-        true
-    }
-
-    /// Reconcile after navigation/adoption without selecting or applying a draft.
-    /// A retained invalid Saved identity remains unavailable; it must not silently
-    /// turn into a different automatic Scenario or another saved arrangement.
-    pub(super) fn reconcile_scenario_workspace(&mut self) {
-        if self.page == Page::Diagram
-            && !self.behavior.has_pending()
-            && let Some(diagram) = self
-                .active_diagram
-                .filter(|id| self.saved_scenario_diagram(*id))
-        {
-            self.enter_scenario_representation(Representation::Saved { diagram });
-        }
-        if self.page != Page::Behavior {
-            self.behavior.scenario.leave();
-            return;
-        }
-        if let Some(rep @ Representation::Saved { diagram }) =
-            self.behavior.scenario.representation()
-        {
-            // The requested view is authoritative until explicit navigation
-            // retires it. This also recovers the same view when Undo restores it.
-            if let Some(owner) = checked_owner(self.project(), rep) {
-                self.active_diagram = Some(diagram);
-                self.layer = self.project().elements[&owner].layer();
-                self.behavior.active_owner = Some(owner);
-                self.behavior
-                    .scenario
-                    .enter_representation(self.canvas_document, owner, rep);
-            } else if let Some(owner) = self.behavior.scenario.owner() {
-                self.behavior
-                    .scenario
-                    .enter_representation(self.canvas_document, owner, rep);
-            }
-            return;
-        }
-        let Some(owner) = behavior::selected_owner(self) else {
-            self.behavior.scenario.leave();
-            return;
-        };
-        if self
-            .project()
-            .elements
-            .get(&owner)
-            .is_some_and(|e| e.kind() == Kind::Scenario)
-        {
-            self.behavior.scenario.enter(self.canvas_document, owner);
-        } else {
-            self.behavior.scenario.leave();
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests;
-
-#[cfg(test)]
-mod adoption_tests;
-
-#[cfg(test)]
-mod owner_navigation_tests;

crates/oa-desktop/src/app/scenario_diagram/adoption_tests.rs

@@ -1,264 +0,0 @@
-//! Independent adoption oracles: expected Projects are edited directly in the
-//! fixture, then admitted through the actual source editor/Document transaction.
-//! Navigation is checked separately from the expected authored mutation.
-use super::*;
-use crate::behavior::canvas_workspace::tests::Mounted;
-use iced::advanced::widget;
-use iced::widget::text_editor;
-use oa_core::language;
-use std::sync::Arc;
-
-struct Fixture {
-    app: App,
-    owner: Id,
-    same_layer: Id,
-    other_layer: Id,
-    view: Id,
-    spare_view: Id,
-}
-
-fn fixture() -> Fixture {
-    let mut project = Project::empty();
-    let owner = project
-        .add_element(Kind::Scenario, Layer::Oa, "Original owner", None)
-        .unwrap();
-    let same_layer = project
-        .add_element(Kind::Scenario, Layer::Oa, "Other OA owner", None)
-        .unwrap();
-    let other_layer = project
-        .add_element(Kind::Scenario, Layer::Sa, "SA owner", None)
-        .unwrap();
-    // A remaining topology makes silent fallback observably different from the
-    // required unavailable Saved view after its owner is deleted.
-    project
-        .add_element(Kind::Process, Layer::Oa, "Remaining process", None)
-        .unwrap();
-    let mut make_view = |alias: &str, name: &str, owner| {
-        let id = Id::new_v4();
-        project.diagrams.insert(
-            id,
-            Diagram {
-                id,
-                alias: alias.into(),
-                name: name.into(),
-                description: String::new(),
-                layer: Layer::Oa,
-                projection: ProjectionKind::Scenario { scenario: owner },
-                layout: None,
-                nodes: Default::default(),
-                routes: vec![],
-                view_options: Default::default(),
-            },
-        );
-        id
-    };
-    let view = make_view("retained_view", "Retained arrangement", owner);
-    let spare_view = make_view("spare_view", "Spare arrangement", same_layer);
-    let mut app = App::with_project(project);
-    let _ = app.update(Message::Select(owner));
-    choose(&mut app, view);
-    assert_saved(&app, view, owner, Layer::Oa);
-    assert!(!app.document.can_undo());
-    Fixture {
-        app,
-        owner,
-        same_layer,
-        other_layer,
-        view,
-        spare_view,
-    }
-}
-
-fn choose(app: &mut App, id: Id) {
-    let _ = app.update(Message::Diagram(Choice {
-        id,
-        label: "Previously captured picker item".into(),
-    }));
-}
-
-fn assert_saved(app: &App, view: Id, owner: Id, layer: Layer) {
-    assert_eq!(app.page, Page::Behavior);
-    assert_eq!(app.layer, layer);
-    assert_eq!(app.active_diagram, Some(view));
-    let context = app
-        .scenario_context()
-        .expect("saved owner remains the visible context");
-    assert_eq!(context.scenario, owner);
-    assert_eq!(
-        context.representation,
-        Representation::Saved { diagram: view }
-    );
-    assert!(!context.visit.is_nil());
-}
-
-fn adopt_from_source(app: &mut App, expected: &Project) {
-    let text = language::format(expected);
-    // Parser equality is a fixture precondition, not the navigation oracle.
-    assert_eq!(language::parse(&text).unwrap(), *expected);
-    let _ = app.update(Message::Page(Page::Text));
-    let _ = app.update(Message::SourceEdit(text_editor::Action::SelectAll));
-    let _ = app.update(Message::SourceEdit(text_editor::Action::Edit(
-        text_editor::Edit::Paste(Arc::new(text)),
-    )));
-    assert!(app.source_dirty());
-    let _ = app.update(Message::ApplySource);
-    assert!(!app.source_dirty(), "{}", app.status);
-    assert_eq!(
-        app.project(),
-        expected,
-        "actual source transaction must adopt exactly the fixture change"
-    );
-    let _ = app.update(Message::Page(Page::Behavior));
-}
-
-fn retarget(cross_layer: bool) {
-    let mut f = fixture();
-    let before = f.app.document.snapshot();
-    let old_context = f.app.scenario_context().unwrap();
-    let revision = f.app.document.revision();
-    let target = if cross_layer {
-        f.other_layer
-    } else {
-        f.same_layer
-    };
-    let layer = if cross_layer { Layer::Sa } else { Layer::Oa };
-    let mut expected = before.decoded.project.clone();
-    let view = expected.diagrams.get_mut(&f.view).unwrap();
-    view.projection = ProjectionKind::Scenario { scenario: target };
-    view.layer = layer;
-
-    adopt_from_source(&mut f.app, &expected);
-    assert_saved(&f.app, f.view, target, layer);
-    assert_ne!(f.app.scenario_context().unwrap().visit, old_context.visit);
-    assert_eq!(
-        f.app.document.revision(),
-        revision + 1,
-        "routing must not create a second transaction"
-    );
-    assert_eq!(
-        f.app.project().diagrams[&f.spare_view],
-        before.decoded.project.diagrams[&f.spare_view]
-    );
-    let adopted_bundle = f.app.document.bundle().clone();
-
-    let _ = f.app.update(Message::Undo);
-    assert_saved(&f.app, f.view, f.owner, Layer::Oa);
-    assert_eq!(f.app.project(), &before.decoded.project);
-    assert_eq!(f.app.document.bundle(), &before.bundle);
-    assert!(
-        !f.app.document.can_undo(),
-        "exactly one authored adoption must be undone"
-    );
-    let _ = f.app.update(Message::Redo);
-    assert_saved(&f.app, f.view, target, layer);
-    assert_eq!(f.app.project(), &expected);
-    assert_eq!(f.app.document.bundle(), &adopted_bundle);
-    assert!(!f.app.document.can_redo());
-}
-
-#[test]
-fn source_same_layer_owner_retarget_undo_redo_keeps_requested_saved_uuid() {
-    retarget(false);
-}
-
-#[test]
-fn source_cross_layer_owner_retarget_undo_redo_keeps_requested_saved_uuid() {
-    retarget(true);
-}
-
-#[tokio::test]
-async fn source_deleted_owner_and_saved_view_mount_unavailable_instead_of_another_behavior() {
-    let mut f = fixture();
-    let before = f.app.document.snapshot();
-    let mut expected = before.decoded.project.clone();
-    assert!(expected.elements.remove(&f.owner).is_some());
-    assert!(expected.diagrams.remove(&f.view).is_some());
-    assert!(expected.elements.contains_key(&f.same_layer));
-    assert!(
-        expected
-            .elements
-            .values()
-            .any(|e| e.kind() == Kind::Process)
-    );
-    adopt_from_source(&mut f.app, &expected);
-    assert_eq!(
-        f.app.behavior.scenario.representation(),
-        Some(Representation::Saved { diagram: f.view })
-    );
-    let adopted = f.app.document.snapshot();
-    let revision = f.app.document.revision();
-    let mut mounted = Mounted::new(&mut f.app).await;
-    let geometry = mounted.geometry(&f.app);
-    assert!(
-        geometry
-            .containers
-            .contains_key(&widget::Id::from("scenario-viewport-unavailable"))
-    );
-    assert!(
-        !geometry
-            .containers
-            .contains_key(&widget::Id::from("scenario-viewport"))
-    );
-    assert_eq!(f.app.project(), &expected);
-    assert_eq!(f.app.document.bundle(), &adopted.bundle);
-    assert_eq!(
-        f.app.document.revision(),
-        revision,
-        "mounting unavailable must remain passive"
-    );
-
-    let _ = f.app.update(Message::Undo);
-    assert_saved(&f.app, f.view, f.owner, Layer::Oa);
-    assert_eq!(f.app.document.bundle(), &before.bundle);
-    let _ = f.app.update(Message::Redo);
-    assert_eq!(
-        f.app.behavior.scenario.representation(),
-        Some(Representation::Saved { diagram: f.view })
-    );
-    mounted.settle(&mut f.app).await;
-    assert!(
-        mounted
-            .geometry(&f.app)
-            .containers
-            .contains_key(&widget::Id::from("scenario-viewport-unavailable"))
-    );
-    assert_eq!(f.app.project(), &expected);
-    assert_eq!(f.app.document.bundle(), &adopted.bundle);
-}
-
-#[test]
-fn missing_and_deleted_picker_ids_cannot_apply_an_unrelated_valid_property_draft() {
-    let mut f = fixture();
-    let mut expected = f.app.project().clone();
-    expected.diagrams.remove(&f.spare_view).unwrap();
-    adopt_from_source(&mut f.app, &expected);
-    let _ = f.app.update(Message::Select(f.owner));
-    let _ = f.app.update(Message::Field(
-        "/name".into(),
-        "Pending valid owner rename".into(),
-    ));
-    assert!(f.app.draft_dirty());
-    let before = f.app.document.snapshot();
-    let revision = f.app.document.revision();
-    let selected = f.app.selected;
-    for invalid in [Id::nil(), f.spare_view] {
-        choose(&mut f.app, invalid);
-        assert_saved(&f.app, f.view, f.owner, Layer::Oa);
-        assert_eq!(f.app.selected, selected);
-        assert!(f.app.draft_dirty());
-        assert_eq!(f.app.project(), &before.decoded.project);
-        assert_eq!(f.app.document.bundle(), &before.bundle);
-        assert_eq!(f.app.document.revision(), revision);
-    }
-    // Establish that the retained draft really was valid, not merely refused by
-    // the property validator: explicit Apply commits it in exactly one step.
-    assert!(f.app.apply(), "{}", f.app.status);
-    assert_eq!(
-        f.app.project().elements[&f.owner].name,
-        "Pending valid owner rename"
-    );
-    assert_eq!(f.app.document.revision(), revision + 1);
-    let _ = f.app.update(Message::Undo);
-    assert_eq!(f.app.project(), &before.decoded.project);
-    assert_eq!(f.app.document.bundle(), &before.bundle);
-}

crates/oa-desktop/src/app/scenario_diagram/owner_navigation_tests.rs

@@ -1,113 +0,0 @@
-//! Explicit owner navigation must retire a retained Saved Scenario, including
-//! when selection was made on a different page. These are real App events.
-use super::*;
-use crate::behavior::scenario::CanvasEvent;
-
-fn setup(kind: Kind) -> (App, Id, Id) {
-    let mut project = Project::empty();
-    let scenario = project
-        .add_element(Kind::Scenario, Layer::Oa, "Incident review", None)
-        .unwrap();
-    let target = project
-        .add_element(kind, Layer::Oa, "Explicit destination", None)
-        .unwrap();
-    let view = Id::new_v4();
-    project.diagrams.insert(
-        view,
-        Diagram {
-            id: view,
-            alias: "incident_saved".into(),
-            name: "Incident saved arrangement".into(),
-            description: String::new(),
-            layer: Layer::Oa,
-            projection: ProjectionKind::Scenario { scenario },
-            layout: None,
-            nodes: Default::default(),
-            routes: vec![],
-            view_options: Default::default(),
-        },
-    );
-    let errors: Vec<_> = oa_core::validation::validate(&project)
-        .into_iter()
-        .filter(|issue| issue.severity == oa_core::validation::Severity::Error)
-        .collect();
-    assert!(errors.is_empty(), "{errors:?}");
-    let mut app = App::with_project(project);
-    let _ = app.update(Message::Select(scenario));
-    let _ = app.update(Message::Diagram(Choice {
-        id: view,
-        label: "Incident saved arrangement".into(),
-    }));
-    assert_eq!(app.page, Page::Behavior);
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        Representation::Saved { diagram: view }
-    );
-    assert_eq!(app.selected, scenario);
-    (app, scenario, target)
-}
-
-fn assert_destination(app: &App, target: Id) {
-    assert_eq!(app.page, Page::Behavior);
-    assert_eq!(app.selected, target);
-    assert_eq!(app.behavior.active_owner, Some(target));
-    assert_eq!(behavior::selected_owner(app), Some(target));
-    assert_eq!(
-        app.behavior.scenario.representation(),
-        None,
-        "explicit non-Scenario destination must not retain an overriding Saved request"
-    );
-    assert!(app.scenario_context().is_none());
-}
-
-fn exercise(via_guide: bool) {
-    for kind in [Kind::Process, Kind::StateMachine] {
-        let (mut app, scenario, target) = setup(kind);
-        assert_ne!(scenario, target);
-        let held = app.scenario_context().unwrap();
-        let accepted = app.document.snapshot();
-        let drafts = app.source_workspace.bundle();
-        let revision = app.document.revision();
-        let dirty = (app.document.dirty(), app.dirty(), app.source_dirty());
-        assert!(!app.document.can_undo() && !app.document.can_redo());
-        if via_guide {
-            let _ = app.update(Message::Page(Page::Guide));
-            assert_eq!(app.page, Page::Guide);
-            assert!(app.scenario_context().is_none());
-        }
-        let _ = app.update(Message::Select(target));
-        if via_guide {
-            assert_eq!(
-                app.page,
-                Page::Guide,
-                "explorer selection must not itself switch the page"
-            );
-            let _ = app.update(Message::Page(Page::Behavior));
-        }
-        assert_destination(&app, target);
-        let camera = app.camera_boundary();
-        // The prior saved canvas cannot regain focus after either owner route.
-        let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Focus(held)));
-        assert_destination(&app, target);
-        assert!(app.camera_boundary() == camera);
-        assert_eq!(app.project(), &accepted.decoded.project);
-        assert_eq!(app.document.bundle(), &accepted.bundle);
-        assert_eq!(app.source_workspace.bundle(), drafts);
-        assert_eq!(app.document.revision(), revision);
-        assert_eq!(
-            (app.document.dirty(), app.dirty(), app.source_dirty()),
-            dirty
-        );
-        assert!(!app.document.can_undo() && !app.document.can_redo());
-    }
-}
-
-#[test]
-fn saved_scenario_guide_selection_returns_to_explicit_process_or_state_owner() {
-    exercise(true);
-}
-
-#[test]
-fn saved_scenario_direct_behavior_selection_enters_explicit_process_or_state_owner() {
-    exercise(false);
-}

crates/oa-desktop/src/app/scenario_diagram/tests.rs

@@ -1,205 +0,0 @@
-use super::*;
-use crate::behavior::scenario::{CanvasEvent, ScrollArea};
-
-fn saved(p: &mut Project, owner: Id, name: &str) -> Id {
-    let id = Id::new_v4();
-    p.diagrams.insert(
-        id,
-        Diagram {
-            id,
-            alias: format!("view_{}", p.diagrams.len()),
-            name: name.into(),
-            description: String::new(),
-            layer: Layer::Oa,
-            projection: ProjectionKind::Scenario { scenario: owner },
-            layout: None,
-            routes: vec![],
-            nodes: Default::default(),
-            view_options: Default::default(),
-        },
-    );
-    id
-}
-fn setup() -> (App, Id, Id, Id, Id) {
-    let (mut p, [owner, callee, _], [reference, _, _]) =
-        behavior::scenario::direct_tests::navigation_fixture();
-    let a = saved(&mut p, owner, "Review A");
-    let b = saved(&mut p, owner, "Review B");
-    let mut app = App::with_project(p);
-    app.select(owner);
-    (app, a, b, reference, callee)
-}
-fn choose(app: &mut App, diagram: Id) {
-    let _ = app.update(Message::Diagram(Choice {
-        id: diagram,
-        label: "Captured view".into(),
-    }));
-}
-fn event(app: &mut App, f: impl FnOnce(behavior::scenario::Context) -> CanvasEvent) {
-    let context = app.scenario_context().unwrap();
-    let _ = app.update(Message::ScenarioCanvas(f(context)));
-}
-#[test]
-fn saved_view_switches_are_distinct_passive_visits_and_preserve_actual_history() {
-    let (mut app, a, b, _, _) = setup();
-    let original = app.document.snapshot();
-    let owner = app.selected;
-    assert!(app.execute(Command::Rename(owner, "Previously edited caller".into())));
-    let edited = app.document.snapshot();
-    let edited_revision = app.document.revision();
-    choose(&mut app, a);
-    let first = app.scenario_context().unwrap();
-    choose(&mut app, b);
-    let second = app.scenario_context().unwrap();
-    choose(&mut app, a);
-    let third = app.scenario_context().unwrap();
-    assert_eq!(first.scenario, owner);
-    assert_eq!(first.representation, Representation::Saved { diagram: a });
-    assert_eq!(second.representation, Representation::Saved { diagram: b });
-    assert_ne!(first.visit, second.visit);
-    assert_ne!(first.visit, third.visit);
-    assert_eq!(app.page, Page::Behavior);
-    assert_eq!(app.selected, owner);
-    assert_eq!(app.document.bundle(), &edited.bundle);
-    assert_eq!(app.project(), &edited.decoded.project);
-    assert_eq!(app.document.revision(), edited_revision);
-    let _ = app.update(Message::Undo);
-    assert_eq!(app.document.bundle(), &original.bundle);
-    assert_eq!(app.project(), &original.decoded.project);
-    let _ = app.update(Message::Redo);
-    assert_eq!(app.document.bundle(), &edited.bundle);
-    assert_eq!(app.project(), &edited.decoded.project);
-}
-#[test]
-fn saved_view_return_rejects_old_passive_events_without_an_intermediate_frame() {
-    let (mut app, a, b, _, _) = setup();
-    choose(&mut app, a);
-    let old = app.scenario_context().unwrap();
-    choose(&mut app, b);
-    choose(&mut app, a);
-    let current = app.scenario_context().unwrap();
-    let camera = app.behavior.scenario.camera_boundary();
-    let before = app.document.snapshot();
-    for stale in [
-        CanvasEvent::Viewport(old, iced::Size::new(432., 321.)),
-        CanvasEvent::Scrolled(old, ScrollArea::Page, iced::Vector::new(0., 800.)),
-        CanvasEvent::FormShown(old, Id::new_v4()),
-        CanvasEvent::Restored(
-            old,
-            Id::new_v4(),
-            ScrollArea::Page,
-            iced::Vector::new(0., 800.),
-        ),
-        CanvasEvent::Camera(
-            old,
-            app.camera_epoch,
-            behavior::canvas_workspace::Event::Pan(iced::Vector::new(90., 80.)),
-        ),
-    ] {
-        let _ = app.update(Message::ScenarioCanvas(stale));
-        assert_eq!(app.scenario_context(), Some(current));
-        assert!(app.behavior.scenario.camera_boundary() == camera);
-        assert_eq!(app.document.bundle(), &before.bundle);
-    }
-}
-#[test]
-fn saved_reference_back_restores_exact_view_with_a_fresh_visit() {
-    let (mut app, a, _, reference, callee) = setup();
-    choose(&mut app, a);
-    let caller = app.scenario_context().unwrap();
-    let before = app.document.snapshot();
-    event(&mut app, |ctx| CanvasEvent::OpenUse(ctx, reference));
-    let target = app.scenario_context().unwrap();
-    assert_eq!(target.scenario, callee);
-    assert_eq!(
-        target.representation,
-        Representation::Derived { owner: callee }
-    );
-    assert_eq!(app.active_diagram, None);
-    event(&mut app, CanvasEvent::Back);
-    let returned = app.scenario_context().unwrap();
-    assert_eq!(returned.representation, caller.representation);
-    assert_eq!(app.active_diagram, Some(a));
-    assert_eq!(app.selected, reference);
-    assert_ne!(returned.visit, caller.visit);
-    assert_eq!(app.document.bundle(), &before.bundle);
-    assert_eq!(app.project(), &before.decoded.project);
-    assert!(!app.document.can_undo());
-}
-#[test]
-fn saved_picker_applies_valid_old_draft_and_uuid_edit_follows_that_same_view() {
-    let (mut app, a, b, _, _) = setup();
-    choose(&mut app, a);
-    let _ = app.update(Message::Select(a));
-    let before = app.document.snapshot();
-    let _ = app.update(Message::Field("/name".into(), "Renamed A".into()));
-    choose(&mut app, b);
-    assert_eq!(app.project().diagrams[&a].name, "Renamed A");
-    assert_eq!(app.selected, b);
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        Representation::Saved { diagram: b }
-    );
-    let _ = app.update(Message::Undo);
-    assert_eq!(app.document.bundle(), &before.bundle);
-    choose(&mut app, a);
-    let replacement = Id::new_v4();
-    let _ = app.update(Message::Field("/id".into(), replacement.to_string()));
-    choose(&mut app, a);
-    assert!(!app.project().diagrams.contains_key(&a));
-    assert_eq!(app.active_diagram, Some(replacement));
-    assert_eq!(app.selected, replacement);
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        Representation::Saved {
-            diagram: replacement
-        }
-    );
-}
-#[test]
-fn leaving_and_reentering_saved_view_preserves_source_and_retires_passive_visit() {
-    let (mut app, a, _, _, _) = setup();
-    choose(&mut app, a);
-    let old = app.scenario_context().unwrap();
-    let before = app.document.snapshot();
-    let _ = app.update(Message::Page(Page::Guide));
-    assert!(app.scenario_context().is_none());
-    let _ = app.update(Message::Page(Page::Behavior));
-    let fresh = app.scenario_context().unwrap();
-    assert_eq!(fresh.representation, old.representation);
-    assert_ne!(fresh.visit, old.visit);
-    assert_eq!(app.document.bundle(), &before.bundle);
-}
-
-#[test]
-fn arrangement_picker_rejects_previous_visit_and_switches_automatic_without_model_changes() {
-    let (mut app, a, b, _, _) = setup();
-    choose(&mut app, a);
-    let stale = app.scenario_context().unwrap();
-    choose(&mut app, b);
-    let current = app.scenario_context().unwrap();
-    let before = app.document.snapshot();
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Representation(
-        stale,
-        Representation::Saved { diagram: a },
-    )));
-    assert_eq!(app.scenario_context(), Some(current));
-    event(&mut app, |context| {
-        CanvasEvent::Representation(
-            context,
-            Representation::Derived {
-                owner: context.scenario,
-            },
-        )
-    });
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        Representation::Derived {
-            owner: current.scenario
-        }
-    );
-    assert_eq!(app.active_diagram, None);
-    assert_eq!(app.document.bundle(), &before.bundle);
-    assert_eq!(app.project(), &before.decoded.project);
-    assert!(!app.document.can_undo());
-}

crates/oa-desktop/src/app/scenario_spacing.rs

@@ -1,88 +0,0 @@
-//! Admit spacing packets before ordinary navigation can retire a newer reveal.
-use super::*;
-use behavior::scenario::spacing::{Event, controller::Finish};
-
-#[cfg(test)]
-mod tests;
-
-impl App {
-    pub(super) fn spacing_enabled(&self) -> bool {
-        self.pending_diagram_reveal.is_none()
-            && !self.behavior.has_pending()
-            && !self.draft_dirty()
-            && !self.source_dirty()
-            && !self.source_rename.open()
-            && behavior::canvas_workspace::keyboard_enabled(self)
-    }
-
-    pub(super) fn scenario_spacing(&mut self, event: Event) -> Task<Message> {
-        let stamp = event.stamp();
-        if self.scenario_context() != Some(stamp.context) || self.camera_epoch != stamp.camera_epoch
-        {
-            return Task::none();
-        }
-        let state = &self.behavior.scenario;
-        let matches =
-            state.spacing_token() == Some(event.token()) && state.spacing_stamp() == Some(stamp);
-        if match event {
-            Event::Begin { token, .. } => token.is_nil() || state.spacing_token().is_some(),
-            _ => !matches,
-        } {
-            return Task::none();
-        }
-        if matches!(event, Event::Cancel { .. }) || !self.spacing_enabled() {
-            if self.behavior.scenario.cancel_spacing() {
-                self.canvas_epoch = self.canvas_epoch.wrapping_add(1);
-            }
-            return Task::none();
-        }
-        match event {
-            Event::Begin { .. } => {
-                let mut state = std::mem::take(&mut self.behavior.scenario);
-                let result = state.begin_spacing(self.project(), event);
-                self.behavior.scenario = state;
-                if result.is_err() {
-                    self.status = "The drag could not start in this view. Try again.".into();
-                }
-            }
-            Event::Move { screen, .. } => self.behavior.scenario.move_spacing(screen),
-            Event::Finish { screen, .. } => {
-                let finished = self.behavior.scenario.finish_spacing(screen);
-                // Retire queued packets even for zero motion or a refused finish.
-                self.canvas_epoch = self.canvas_epoch.wrapping_add(1);
-                match finished {
-                    Ok(Finish::Click(target)) => self.select(target),
-                    Ok(Finish::Noop) => {}
-                    Ok(Finish::Commit {
-                        command,
-                        selected,
-                        scale,
-                        pan,
-                    }) => {
-                        // Document prepares and writes the source candidate before
-                        // committing its snapshot. Failure leaves camera/selection
-                        // and source/history at their accepted values.
-                        match self.document.execute(*command) {
-                            Ok(_) => {
-                                self.selected = selected;
-                                self.selected_node = None;
-                                self.diagram_navigation_focus = None;
-                                self.behavior.scenario.accept_spacing_camera(scale, pan);
-                                self.sync();
-                                self.status = "Scenario spacing updated.".into();
-                            }
-                            Err(error) => self.status = format!("Spacing was not applied: {error}"),
-                        }
-                    }
-                    Err(_) => {
-                        self.status =
-                            "That position cannot be applied. The saved arrangement is unchanged."
-                                .into()
-                    }
-                }
-            }
-            Event::Cancel { .. } => unreachable!(),
-        }
-        Task::none()
-    }
-}

crates/oa-desktop/src/app/scenario_spacing/tests.rs

@@ -1,272 +0,0 @@
-use super::*;
-use behavior::scenario::{
-    CanvasEvent,
-    spacing::{
-        Target,
-        controller::tests::{fixture, packet},
-    },
-};
-use iced::{Point, Size, Vector};
-
-fn setup() -> (App, Id, Id) {
-    let (document, owner, diagram, lane, message) = fixture();
-    let mut app = App::with_project(document.project().clone());
-    let _ = app.update(Message::Select(owner));
-    let _ = app.update(Message::Diagram(Choice {
-        id: diagram,
-        label: "Saved".into(),
-    }));
-    let c = app.scenario_context().unwrap();
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Viewport(
-        c,
-        Size::new(900., 600.),
-    )));
-    assert!(app.spacing_enabled());
-    (app, lane, message)
-}
-fn begin(app: &mut App, target: Target) -> (Event, Point, f32) {
-    let event = packet(
-        app.project(),
-        &app.behavior.scenario,
-        app.scenario_context().unwrap(),
-        app.camera_epoch,
-        target,
-    );
-    let Event::Begin {
-        press_screen,
-        scale,
-        ..
-    } = event
-    else {
-        unreachable!()
-    };
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Spacing(event)));
-    assert_eq!(app.behavior.scenario.spacing_token(), Some(event.token()));
-    (event, press_screen, scale)
-}
-fn send(app: &mut App, event: Event) {
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Spacing(event)));
-}
-fn move_to(app: &mut App, begin: Event, screen: Point) {
-    send(
-        app,
-        Event::Move {
-            stamp: begin.stamp(),
-            token: begin.token(),
-            screen,
-        },
-    );
-}
-fn finish(app: &mut App, begin: Event, screen: Point) {
-    send(
-        app,
-        Event::Finish {
-            stamp: begin.stamp(),
-            token: begin.token(),
-            screen,
-        },
-    );
-}
-
-#[test]
-fn same_batch_preview_is_immutable_and_one_commit_undo_redo_has_exact_source_parity() {
-    let (mut app, lane, _) = setup();
-    let original = app.document.snapshot();
-    let source = app.source_workspace.bundle();
-    let selected = app.selected;
-    let epoch = app.canvas_epoch;
-    let (event, start, scale) = begin(&mut app, Target::Lane(lane));
-    move_to(&mut app, event, start + Vector::new(40., 300.));
-    assert_eq!(app.selected, selected);
-    assert_eq!(app.canvas_epoch, epoch);
-    assert_eq!(app.project(), &original.decoded.project);
-    assert_eq!(app.source_workspace.bundle(), source);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-    finish(&mut app, event, start + Vector::new(40., 300.));
-    assert_eq!(app.selected, lane);
-    assert!(app.document.can_undo() && !app.document.can_redo());
-    let accepted = app.document.snapshot();
-    assert_ne!(accepted.bundle, original.bundle);
-    let expected = behavior::scenario::spacing::controller::tests::expected(
-        &original.decoded.project,
-        match event.stamp().context.representation {
-            behavior::scenario_layout::Representation::Saved { diagram } => diagram,
-            _ => unreachable!(),
-        },
-        Target::Lane(lane),
-        40. / scale,
-    );
-    assert_eq!(app.project(), &expected);
-    let _ = app.update(Message::ShortcutUndo(false));
-    assert_eq!(app.project(), &original.decoded.project);
-    assert_eq!(app.document.bundle(), &original.bundle);
-    assert!(!app.document.can_undo() && app.document.can_redo());
-    let _ = app.update(Message::ShortcutUndo(true));
-    assert_eq!(app.project(), &accepted.decoded.project);
-    assert_eq!(app.document.bundle(), &accepted.bundle);
-}
-
-#[test]
-fn click_selects_but_crossed_return_and_cancel_preserve_selection_camera_and_history() {
-    let (mut app, lane, message) = setup();
-    let original = app.document.snapshot();
-    let camera = app.behavior.scenario.camera_boundary();
-    let (event, start, _) = begin(&mut app, Target::Message(message));
-    finish(&mut app, event, start + Vector::new(30., 2.));
-    assert_eq!(app.selected, message);
-    assert!(camera == app.behavior.scenario.camera_boundary());
-    for cancel in [false, true] {
-        let (event, start, _) = begin(&mut app, Target::Lane(lane));
-        move_to(&mut app, event, start + Vector::new(30., 0.));
-        if cancel {
-            send(
-                &mut app,
-                Event::Cancel {
-                    stamp: event.stamp(),
-                    token: event.token(),
-                },
-            );
-        } else {
-            finish(&mut app, event, start);
-        }
-        assert_eq!(app.selected, message);
-        assert!(camera == app.behavior.scenario.camera_boundary());
-        assert_eq!(app.document.bundle(), &original.bundle);
-        assert_eq!(app.project(), &original.decoded.project);
-        assert!(!app.document.can_undo() && !app.document.can_redo());
-    }
-}
-
-#[test]
-fn stale_finish_after_new_view_and_forged_token_are_inert_before_reveal_reconciliation() {
-    let (mut app, lane, _) = setup();
-    let (event, start, _) = begin(&mut app, Target::Lane(lane));
-    let held_epoch = app.canvas_epoch;
-    send(
-        &mut app,
-        Event::Finish {
-            stamp: event.stamp(),
-            token: Id::new_v4(),
-            screen: start + Vector::new(30., 0.),
-        },
-    );
-    assert_eq!(app.canvas_epoch, held_epoch);
-    assert_eq!(app.behavior.scenario.spacing_token(), Some(event.token()));
-    let owner = event.stamp().context.scenario;
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Representation(
-        event.stamp().context,
-        behavior::scenario_layout::Representation::Derived { owner },
-    )));
-    let current = app.scenario_context();
-    let epoch = app.canvas_epoch;
-    let original = app.document.snapshot();
-    finish(&mut app, event, start + Vector::new(50., 0.));
-    assert_eq!(app.scenario_context(), current);
-    assert_eq!(app.canvas_epoch, epoch);
-    assert!(app.behavior.scenario.spacing_token().is_none());
-    assert_eq!(app.document.bundle(), &original.bundle);
-}
-
-#[test]
-fn source_write_failure_cannot_commit_candidate_or_materialize_camera() {
-    let (mut app, lane, _) = setup();
-    let bundle = app.document.bundle().clone();
-    let mut limits = oa_core::source_project::ProjectLimits::default();
-    limits.model.max_source_bytes = bundle.files.values().map(String::len).sum();
-    app.document = Document::from_bundle(bundle, limits).unwrap();
-    app.sync();
-    let original = app.document.snapshot();
-    let selected = app.selected;
-    let camera = app.behavior.scenario.camera_boundary();
-    let (event, start, _) = begin(&mut app, Target::Lane(lane));
-    move_to(&mut app, event, start + Vector::new(40., 0.));
-    finish(&mut app, event, start + Vector::new(40., 0.));
-    assert!(
-        app.status.starts_with("Spacing was not applied:"),
-        "{}",
-        app.status
-    );
-    assert_eq!(app.selected, selected);
-    assert!(camera == app.behavior.scenario.camera_boundary());
-    assert_eq!(app.project(), &original.decoded.project);
-    assert_eq!(app.document.bundle(), &original.bundle);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-    assert!(app.behavior.scenario.spacing_token().is_none());
-}
-
-#[test]
-fn pending_semantic_draft_and_source_edit_cancel_and_reject_held_finish() {
-    for source in [false, true] {
-        let (mut app, lane, _) = setup();
-        let original = app.document.snapshot();
-        let selected = app.selected;
-        let (event, start, _) = begin(&mut app, Target::Lane(lane));
-        move_to(&mut app, event, start + Vector::new(30., 0.));
-        if source {
-            let _ = app.update(Message::SourceEdit(text_editor::Action::Edit(
-                text_editor::Edit::Insert(' '),
-            )));
-            assert!(app.source_dirty());
-        } else {
-            let _ = app.update(Message::Behavior(behavior::Event::Scenario(
-                behavior::scenario::Event::Start(
-                    event.stamp().context.scenario,
-                    behavior::scenario::Tool::Lifeline,
-                ),
-            )));
-            assert!(app.behavior.has_pending());
-        }
-        let draft = app.source_workspace.bundle();
-        assert!(app.behavior.scenario.spacing_token().is_none());
-        finish(&mut app, event, start + Vector::new(30., 0.));
-        assert_eq!(app.project(), &original.decoded.project);
-        assert_eq!(app.document.bundle(), &original.bundle);
-        assert_eq!(app.source_workspace.bundle(), draft);
-        assert_eq!(app.selected, selected);
-        assert!(!app.document.can_undo());
-    }
-}
-
-#[test]
-fn stale_finish_cannot_remove_new_same_view_deferred_reveal() {
-    let (mut app, lane, message) = setup();
-    let (event, start, _) = begin(&mut app, Target::Lane(lane));
-    let behavior::scenario_layout::Representation::Saved { diagram } =
-        event.stamp().context.representation
-    else {
-        unreachable!()
-    };
-    let _ = app.update(Message::RevealInDiagram(diagram, message));
-    assert!(app.pending_diagram_reveal.is_some());
-    let epoch = app.canvas_epoch;
-    let selected = app.selected;
-    let visit = app.pending_scenario_reveal_visit;
-    let original = app.document.snapshot();
-    finish(&mut app, event, start + Vector::new(50., 0.));
-    assert_eq!(app.canvas_epoch, epoch);
-    assert_eq!(app.pending_scenario_reveal_visit, visit);
-    assert!(app.pending_diagram_reveal.is_some());
-    assert_eq!(app.selected, selected);
-    assert_eq!(app.document.bundle(), &original.bundle);
-    assert!(!app.document.can_undo());
-}
-
-#[test]
-fn modal_open_cancels_preview_and_captured_begin_stays_retired_after_close() {
-    let (mut app, lane, _) = setup();
-    let original = app.document.snapshot();
-    let camera = app.behavior.scenario.camera_boundary();
-    let (event, start, _) = begin(&mut app, Target::Lane(lane));
-    move_to(&mut app, event, start + Vector::new(30., 0.));
-    let _ = app.update(Message::Delete);
-    assert!(app.delete_pending);
-    assert!(app.behavior.scenario.spacing_token().is_none());
-    finish(&mut app, event, start + Vector::new(30., 0.));
-    let _ = app.update(Message::CancelDelete);
-    send(&mut app, event);
-    assert!(app.behavior.scenario.spacing_token().is_none());
-    assert_eq!(app.project(), &original.decoded.project);
-    assert_eq!(app.document.bundle(), &original.bundle);
-    assert!(camera == app.behavior.scenario.camera_boundary());
-    assert!(!app.document.can_undo());
-}

crates/oa-desktop/src/app/source_rename/alias_input.rs

@@ -1,219 +0,0 @@
-//! Keep Iced's single-line input from silently filtering pasted control bytes.
-//! Only the alias field uses this adapter. The child retains editing and focus.
-use iced::advanced::{
-    Clipboard, Layout, Shell, Widget, clipboard, layout, overlay, renderer, text, widget,
-};
-use iced::{Element, Event, Length, Rectangle, Size, Vector, keyboard, mouse};
-
-pub(super) fn guard<'a, Message: Clone + 'a, Theme: 'a, R: text::Renderer + 'a>(
-    input: Element<'a, Message, Theme, R>,
-    rejected: Option<Message>,
-) -> Element<'a, Message, Theme, R> {
-    Element::new(AliasInput { input, rejected })
-}
-
-struct AliasInput<'a, Message, Theme, R> {
-    input: Element<'a, Message, Theme, R>,
-    rejected: Option<Message>,
-}
-
-#[derive(Default)]
-struct State {
-    modifiers: keyboard::Modifiers,
-}
-
-// Each fresh child clipboard read uses the checked snapshot. Iced may reuse its
-// previously admitted paste while V is held, until KeyReleased clears that cache.
-struct CapturedClipboard<'a> {
-    content: Option<String>,
-    original: &'a mut dyn Clipboard,
-}
-impl Clipboard for CapturedClipboard<'_> {
-    fn read(&self, kind: clipboard::Kind) -> Option<String> {
-        if kind == clipboard::Kind::Standard {
-            self.content.clone()
-        } else {
-            self.original.read(kind)
-        }
-    }
-    fn write(&mut self, kind: clipboard::Kind, contents: String) {
-        self.original.write(kind, contents);
-    }
-}
-
-impl<Message: Clone, Theme, R: text::Renderer> Widget<Message, Theme, R>
-    for AliasInput<'_, Message, Theme, R>
-{
-    fn size(&self) -> Size<Length> {
-        self.input.as_widget().size()
-    }
-    fn size_hint(&self) -> Size<Length> {
-        self.input.as_widget().size_hint()
-    }
-    fn tag(&self) -> widget::tree::Tag {
-        widget::tree::Tag::of::<State>()
-    }
-    fn state(&self) -> widget::tree::State {
-        widget::tree::State::new(State::default())
-    }
-    fn children(&self) -> Vec<widget::Tree> {
-        vec![widget::Tree::new(self.input.as_widget())]
-    }
-    fn diff(&self, tree: &mut widget::Tree) {
-        tree.diff_children(std::slice::from_ref(&self.input));
-    }
-    fn layout(
-        &mut self,
-        tree: &mut widget::Tree,
-        renderer: &R,
-        limits: &layout::Limits,
-    ) -> layout::Node {
-        self.input
-            .as_widget_mut()
-            .layout(&mut tree.children[0], renderer, limits)
-    }
-    fn draw(
-        &self,
-        tree: &widget::Tree,
-        renderer: &mut R,
-        theme: &Theme,
-        style: &renderer::Style,
-        layout: Layout<'_>,
-        cursor: mouse::Cursor,
-        viewport: &Rectangle,
-    ) {
-        self.input.as_widget().draw(
-            &tree.children[0],
-            renderer,
-            theme,
-            style,
-            layout,
-            cursor,
-            viewport,
-        );
-    }
-    fn operate(
-        &mut self,
-        tree: &mut widget::Tree,
-        layout: Layout<'_>,
-        renderer: &R,
-        operation: &mut dyn widget::Operation,
-    ) {
-        self.input
-            .as_widget_mut()
-            .operate(&mut tree.children[0], layout, renderer, operation);
-    }
-    fn update(
-        &mut self,
-        tree: &mut widget::Tree,
-        event: &Event,
-        layout: Layout<'_>,
-        cursor: mouse::Cursor,
-        renderer: &R,
-        clipboard: &mut dyn Clipboard,
-        shell: &mut Shell<'_, Message>,
-        viewport: &Rectangle,
-    ) {
-        let focused = tree.children[0]
-            .state
-            .downcast_ref::<iced::widget::text_input::State<R::Paragraph>>()
-            .is_focused();
-        let state = tree.state.downcast_mut::<State>();
-        // Iced 0.14.2 uses stored ModifiersChanged state, not KeyPressed.modifiers.
-        // Mirror its Escape reset and its Latin/physical-key paste shortcut.
-        if let Event::Keyboard(keyboard::Event::ModifiersChanged(modifiers)) = event {
-            state.modifiers = *modifiers;
-        }
-        let paste = matches!(event,
-            Event::Keyboard(keyboard::Event::KeyPressed { key, physical_key, .. })
-                if key.to_latin(*physical_key) == Some('v')
-                    && state.modifiers.command() && !state.modifiers.alt());
-        if focused
-            && paste
-            && let Some(rejected) = &self.rejected
-        {
-            let content = clipboard.read(clipboard::Kind::Standard);
-            if content
-                .as_ref()
-                .is_some_and(|value| value.chars().any(char::is_control))
-            {
-                // Do not invoke the child: even an empty replacement would erase
-                // its selection. Approval invalidation is an explicit App event.
-                shell.publish(rejected.clone());
-                shell.capture_event();
-                return;
-            }
-            self.input.as_widget_mut().update(
-                &mut tree.children[0],
-                event,
-                layout,
-                cursor,
-                renderer,
-                &mut CapturedClipboard {
-                    content,
-                    original: clipboard,
-                },
-                shell,
-                viewport,
-            );
-            return;
-        }
-        self.input.as_widget_mut().update(
-            &mut tree.children[0],
-            event,
-            layout,
-            cursor,
-            renderer,
-            clipboard,
-            shell,
-            viewport,
-        );
-        // In Iced 0.14.2 the only KeyPressed branch that removes focus is its
-        // Escape branch, which also resets stored modifiers. Observe that branch
-        // after its text/shortcut early returns and effective-key conversion.
-        if focused
-            && matches!(event, Event::Keyboard(keyboard::Event::KeyPressed { .. }))
-            && !tree.children[0]
-                .state
-                .downcast_ref::<iced::widget::text_input::State<R::Paragraph>>()
-                .is_focused()
-        {
-            tree.state.downcast_mut::<State>().modifiers = keyboard::Modifiers::default();
-        }
-    }
-    fn mouse_interaction(
-        &self,
-        tree: &widget::Tree,
-        layout: Layout<'_>,
-        cursor: mouse::Cursor,
-        viewport: &Rectangle,
-        renderer: &R,
-    ) -> mouse::Interaction {
-        self.input.as_widget().mouse_interaction(
-            &tree.children[0],
-            layout,
-            cursor,
-            viewport,
-            renderer,
-        )
-    }
-    fn overlay<'a>(
-        &'a mut self,
-        tree: &'a mut widget::Tree,
-        layout: Layout<'a>,
-        renderer: &R,
-        viewport: &Rectangle,
-        translation: Vector,
-    ) -> Option<overlay::Element<'a, Message, Theme, R>> {
-        self.input.as_widget_mut().overlay(
-            &mut tree.children[0],
-            layout,
-            renderer,
-            viewport,
-            translation,
-        )
-    }
-}
-
-#[cfg(all(test, debug_assertions))]
-mod tests;

crates/oa-desktop/src/app/source_rename/alias_input/tests.rs

@@ -1,220 +0,0 @@
-use super::*;
-use crate::views::source_tests::FontLayout;
-use iced::keyboard::{
-    Key, Modifiers,
-    key::{Code, Named, Physical},
-};
-use std::cell::Cell;
-
-#[derive(Debug, Clone, PartialEq)]
-enum Signal {
-    Input(String),
-    Rejected,
-}
-
-struct ClipboardText {
-    text: String,
-    reads: Cell<usize>,
-}
-impl Clipboard for ClipboardText {
-    fn read(&self, _: clipboard::Kind) -> Option<String> {
-        self.reads.set(self.reads.get() + 1);
-        Some(self.text.clone())
-    }
-    fn write(&mut self, _: clipboard::Kind, _: String) {}
-}
-type InputState = iced::widget::text_input::State<<FontLayout as text::Renderer>::Paragraph>;
-
-struct Mounted {
-    input: Element<'static, Signal, iced::Theme, FontLayout>,
-    tree: widget::Tree,
-    node: layout::Node,
-    clipboard: ClipboardText,
-    messages: Vec<Signal>,
-}
-impl Mounted {
-    fn new(focused: bool, enabled: bool, modifiers: Modifiers) -> Self {
-        let mut child = iced::widget::text_input("Alias", "send_water");
-        if enabled {
-            child = child.on_input(Signal::Input);
-        }
-        let mut input = guard(child.into(), enabled.then_some(Signal::Rejected));
-        let mut tree = widget::Tree::new(input.as_widget());
-        let node = input.as_widget_mut().layout(
-            &mut tree,
-            &FontLayout,
-            &layout::Limits::new(Size::ZERO, Size::new(500., 40.)),
-        );
-        if focused {
-            let state = tree.children[0].state.downcast_mut::<InputState>();
-            state.focus();
-            state.select_range(0, 10);
-        }
-        let mut mounted = Self {
-            input,
-            tree,
-            node,
-            clipboard: ClipboardText {
-                text: "foo\nbar".into(),
-                reads: Cell::new(0),
-            },
-            messages: vec![],
-        };
-        mounted.event(Event::Keyboard(keyboard::Event::ModifiersChanged(
-            modifiers,
-        )));
-        mounted
-    }
-    fn state(&self) -> &InputState {
-        self.tree.children[0].state.downcast_ref::<InputState>()
-    }
-    fn event(&mut self, event: Event) -> bool {
-        let mut shell = Shell::new(&mut self.messages);
-        self.input.as_widget_mut().update(
-            &mut self.tree,
-            &event,
-            Layout::new(&self.node),
-            mouse::Cursor::Unavailable,
-            &FontLayout,
-            &mut self.clipboard,
-            &mut shell,
-            &Rectangle::new(iced::Point::ORIGIN, Size::new(500., 40.)),
-        );
-        shell.is_event_captured()
-    }
-}
-fn key(key: Key, modified_key: Key, code: Code) -> Event {
-    Event::Keyboard(keyboard::Event::KeyPressed {
-        key,
-        modified_key,
-        physical_key: Physical::Code(code),
-        location: keyboard::Location::Standard,
-        modifiers: Modifiers::empty(),
-        text: None,
-        repeat: false,
-    })
-}
-fn paste() -> Event {
-    key(
-        Key::Character("v".into()),
-        Key::Character("v".into()),
-        Code::KeyV,
-    )
-}
-
-#[test]
-fn paste_refusal_matches_child_focus_enabled_and_stored_modifier_protocol() {
-    for focused in [false, true] {
-        for enabled in [false, true] {
-            for modifiers in [
-                Modifiers::empty(),
-                Modifiers::SHIFT,
-                Modifiers::COMMAND,
-                Modifiers::COMMAND | Modifiers::ALT,
-                Modifiers::COMMAND | Modifiers::SHIFT,
-            ] {
-                let mut mounted = Mounted::new(focused, enabled, modifiers);
-                let before = mounted.state().cursor();
-                let expected = focused && enabled && modifiers.command() && !modifiers.alt();
-                let captured = mounted.event(paste());
-                assert_eq!(
-                    mounted.messages,
-                    if expected {
-                        vec![Signal::Rejected]
-                    } else {
-                        vec![]
-                    }
-                );
-                assert_eq!(mounted.clipboard.reads.get(), usize::from(expected));
-                assert_eq!(mounted.state().cursor(), before);
-                if expected {
-                    assert!(captured);
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn effective_escape_reset_follows_child_after_early_returns() {
-    // Raw Escape mapped to Home must not clear only the guard's Command state.
-    let mut mounted = Mounted::new(true, true, Modifiers::COMMAND);
-    mounted.event(key(
-        Key::Named(Named::Escape),
-        Key::Named(Named::Home),
-        Code::Escape,
-    ));
-    assert!(mounted.state().is_focused());
-    assert!(mounted.event(paste()));
-    assert_eq!(mounted.messages, vec![Signal::Rejected]);
-
-    // Effective Escape clears both states; a later focus operation does not
-    // invent a new ModifiersChanged event or revive the previous Command state.
-    let mut mounted = Mounted::new(true, true, Modifiers::COMMAND);
-    mounted.event(key(
-        Key::Named(Named::Home),
-        Key::Named(Named::Escape),
-        Code::Home,
-    ));
-    assert!(!mounted.state().is_focused());
-    mounted.tree.children[0]
-        .state
-        .downcast_mut::<InputState>()
-        .focus();
-    mounted.event(paste());
-    assert!(mounted.messages.is_empty());
-    assert_eq!(mounted.clipboard.reads.get(), 0);
-
-    // Printable text returns before effective Escape and leaves modifiers live.
-    let mut mounted = Mounted::new(true, true, Modifiers::COMMAND);
-    let mut event = key(
-        Key::Named(Named::Home),
-        Key::Named(Named::Escape),
-        Code::Home,
-    );
-    if let Event::Keyboard(keyboard::Event::KeyPressed { text, .. }) = &mut event {
-        *text = Some("x".into());
-    }
-    mounted.event(event);
-    assert!(mounted.state().is_focused());
-    assert_eq!(mounted.messages, vec![Signal::Input("x".into())]);
-    mounted.messages.clear();
-    mounted.event(paste());
-    assert_eq!(mounted.messages, vec![Signal::Rejected]);
-}
-
-#[test]
-fn held_paste_cache_contains_only_previously_admitted_text() {
-    let mut mounted = Mounted::new(true, true, Modifiers::COMMAND);
-    mounted.clipboard.text = "water".into();
-    mounted.event(paste());
-    assert_eq!(mounted.messages, vec![Signal::Input("water".into())]);
-    mounted.messages.clear();
-    mounted.clipboard.text = "other".into();
-    mounted.event(paste());
-    assert_eq!(
-        mounted.messages,
-        vec![Signal::Input("waterwater".into())],
-        "Iced reuses its first admitted paste while the key is held"
-    );
-    mounted.messages.clear();
-    let before = mounted.state().cursor();
-    mounted.clipboard.text = "bad\tvalue".into();
-    mounted.event(paste());
-    assert_eq!(mounted.messages, vec![Signal::Rejected]);
-    assert_eq!(mounted.state().cursor(), before);
-    mounted.messages.clear();
-    mounted.event(Event::Keyboard(keyboard::Event::KeyReleased {
-        key: Key::Character("v".into()),
-        modified_key: Key::Character("v".into()),
-        physical_key: Physical::Code(Code::KeyV),
-        location: keyboard::Location::Standard,
-        modifiers: Modifiers::empty(),
-    }));
-    mounted.clipboard.text = "later".into();
-    mounted.event(paste());
-    assert_eq!(
-        mounted.messages,
-        vec![Signal::Input("waterwaterlater".into())]
-    );
-}

crates/oa-desktop/src/app/source_rename/editor_patch.rs

@@ -1,303 +0,0 @@
-//! Display-only reuse after a guarded alias rename. This is not model authority.
-use iced::{advanced::text::Renderer, widget::text_editor};
-use std::sync::Arc;
-
-/// Replace exact, unchanged-line-count source in an existing editor.
-///
-/// The caller must first authorize/commit the model change and must reconstruct
-/// from accepted source on false. Preflight failures do not mutate the editor;
-/// a failed final readback can leave it changed. On changing success the cursor
-/// is at 0:0 without selection; the caller restores its approved origin/reveal.
-/// Direct Content actions deliberately bypass App draft edits and Undo history.
-pub(super) fn replace<R: Renderer>(
-    editor: &mut text_editor::Content<R>,
-    before: &str,
-    after: &str,
-) -> bool {
-    if editor.text() != before {
-        return false;
-    }
-    let Some(old_lines) = lines(before) else {
-        return false;
-    };
-    let Some(new_lines) = lines(after) else {
-        return false;
-    };
-    if old_lines.len() != new_lines.len() || old_lines.len() != editor.line_count() {
-        return false;
-    }
-    let mut patches = Vec::new();
-    for (line, ((old, old_ending), (new, new_ending))) in
-        old_lines.into_iter().zip(new_lines).enumerate()
-    {
-        let Some(actual) = editor.line(line) else {
-            return false;
-        };
-        // Cosmic also recognizes bare CR and LFCR. Comparing the actual lines
-        // catches its greedy LFCR interpretation of e.g. "x\n\r\ny" too.
-        if old_ending != new_ending || actual.text != old || actual.ending != old_ending {
-            return false;
-        }
-        if old == new {
-            continue;
-        }
-        let mut start = old
-            .bytes()
-            .zip(new.bytes())
-            .take_while(|(a, b)| a == b)
-            .count();
-        while !old.is_char_boundary(start) || !new.is_char_boundary(start) {
-            start -= 1;
-        }
-        let mut suffix = old[start..]
-            .bytes()
-            .rev()
-            .zip(new[start..].bytes().rev())
-            .take_while(|(a, b)| a == b)
-            .count();
-        while !old.is_char_boundary(old.len() - suffix) || !new.is_char_boundary(new.len() - suffix)
-        {
-            suffix -= 1;
-        }
-        // All positions and owned payloads are prepared before the first edit.
-        patches.push((
-            line,
-            start,
-            old.len() - suffix,
-            Arc::new(new[start..new.len() - suffix].to_owned()),
-        ));
-    }
-    if patches.is_empty() {
-        return true;
-    }
-    let empty = Arc::new(String::new());
-    for (line, start, end, replacement) in patches.into_iter().rev() {
-        select(editor, line, start, end);
-        editor.perform(text_editor::Action::Edit(text_editor::Edit::Paste(
-            replacement,
-        )));
-    }
-    // Iced overwrites its earliest-change marker on each Edit. An explicit
-    // zero-width selection + empty Paste changes no bytes, but marks line zero.
-    // This also refreshes previously unhighlighted lines before the first patch.
-    // It resets only line zero's text cache; other unchanged lines retain theirs.
-    select(editor, 0, 0, 0);
-    editor.perform(text_editor::Action::Edit(text_editor::Edit::Paste(empty)));
-    editor.text() == after
-}
-
-fn select<R: Renderer>(
-    editor: &mut text_editor::Content<R>,
-    line: usize,
-    start: usize,
-    end: usize,
-) {
-    editor.move_to(text_editor::Cursor {
-        position: text_editor::Position {
-            line,
-            column: start,
-        },
-        // move_to(None) does not clear a previous selection in this Iced version.
-        selection: Some(text_editor::Position { line, column: end }),
-    });
-}
-
-fn lines(source: &str) -> Option<Vec<(&str, text_editor::LineEnding)>> {
-    use text_editor::LineEnding;
-    let mut result = Vec::new();
-    let mut parts = source.split('\n').peekable();
-    while let Some(part) = parts.next() {
-        let (text, ending) = if parts.peek().is_none() {
-            (part, LineEnding::None)
-        } else if let Some(text) = part.strip_suffix('\r') {
-            (text, LineEnding::CrLf)
-        } else {
-            (part, LineEnding::Lf)
-        };
-        if text.contains('\r')
-            || (text.is_empty()
-                && ending == LineEnding::CrLf
-                && result
-                    .last()
-                    .is_some_and(|(_, previous)| *previous == LineEnding::Lf))
-        {
-            return None;
-        }
-        result.push((text, ending));
-    }
-    Some(result)
-}
-
-#[cfg(all(test, debug_assertions))]
-mod tests {
-    use super::*;
-    use crate::views::source_tests::FontLayout;
-    use iced::advanced::{layout, text::Highlighter, widget::Tree};
-    use iced::{Element, Font, Length, Size};
-    use std::{cell::RefCell, ops::Range};
-
-    #[test]
-    fn exact_text_matrix_and_reverse_preserve_endings() {
-        for (before, after) in [
-            ("", ""),
-            ("", "alias"),
-            ("alias", ""),
-            ("same", "same"),
-            ("a\n", "alias\n"),
-            ("a\r\n", "alias\r\n"),
-            ("\r\na\r\n\r\n", "\r\nlong_alias\r\n\r\n"),
-            ("\na\n\n", "\nlong_alias\n\n"),
-            ("a\r\nb\nc", "long_a\r\nlong_b\nlong_c"),
-            (
-                "雨🙂 e\u{301} @a @a // a",
-                "雨🙂 e\u{301} @a_long @a_long // a",
-            ),
-            ("@abc", "@abcdef"),
-            ("@abcdef", "@abc"),
-            ("@abc_suffix", "@def_suffix"),
-            ("@none", "@identifier"),
-            // Shared prefix/suffix bytes inside distinct UTF-8 codepoints must
-            // not be used as String split positions, even outside alias scope.
-            ("雨xé", "雪xê"),
-            ("é", "©"),
-            (
-                "unchanged\n@a\nunchanged\n@a\n",
-                "unchanged\n@long\nunchanged\n@long\n",
-            ),
-        ] {
-            let mut editor = text_editor::Content::<FontLayout>::with_text(before);
-            assert!(
-                replace(&mut editor, before, after),
-                "{before:?} -> {after:?}"
-            );
-            assert_eq!(editor.text(), after);
-            let expected = text_editor::Content::<FontLayout>::with_text(after);
-            assert_eq!(editor.line_count(), expected.line_count());
-            for (actual, expected) in editor.lines().zip(expected.lines()) {
-                assert_eq!(actual.text, expected.text);
-                assert_eq!(actual.ending, expected.ending);
-            }
-            if before != after {
-                assert_eq!(
-                    editor.cursor().position,
-                    text_editor::Position { line: 0, column: 0 }
-                );
-                assert_eq!(editor.cursor().selection, None);
-            }
-            assert!(replace(&mut editor, after, before));
-            assert_eq!(editor.text(), before);
-        }
-    }
-
-    #[test]
-    fn all_preflight_refusals_leave_text_cursor_and_selection_unchanged() {
-        for (actual, before, after) in [
-            ("live", "stale", "changed"),
-            ("a\nb", "a\nb", "long\nb\nc"),
-            ("a\nb", "a\nb", "long\r\nb"),
-            // Refusal on a later line must not apply the earlier planned edit.
-            ("a\nb\r\n", "a\nb\r\n", "long\nb\n"),
-            ("a\rb", "a\rb", "long\rb"),
-            ("a\n\rb", "a\n\rb", "long\n\rb"),
-            ("a\n\r\nb", "a\n\r\nb", "long\n\r\nb"),
-            // The replacement must not introduce a greedy LFCR boundary either.
-            ("a\nx\r\n", "a\nx\r\n", "a\n\r\n"),
-            ("a", "a", "long\r"),
-        ] {
-            let mut editor = text_editor::Content::<FontLayout>::with_text(actual);
-            select(&mut editor, 0, 0, 1);
-            let cursor = editor.cursor();
-            let selection = editor.selection();
-            assert!(
-                !replace(&mut editor, before, after),
-                "{before:?} -> {after:?}"
-            );
-            assert_eq!(editor.text(), actual);
-            assert_eq!(editor.cursor(), cursor);
-            assert_eq!(editor.selection(), selection);
-        }
-    }
-
-    #[test]
-    fn unchanged_content_preserves_selection_and_next_direct_edit_works() {
-        let mut editor = text_editor::Content::<FontLayout>::with_text("@a");
-        select(&mut editor, 0, 1, 2);
-        let cursor = editor.cursor();
-        assert!(replace(&mut editor, "@a", "@a"));
-        assert_eq!(editor.cursor(), cursor);
-        assert!(replace(&mut editor, "@a", "@long"));
-        editor.move_to(text_editor::Cursor {
-            position: text_editor::Position { line: 0, column: 5 },
-            selection: None,
-        });
-        editor.perform(text_editor::Action::Edit(text_editor::Edit::Insert('!')));
-        assert_eq!(editor.text(), "@long!");
-    }
-
-    thread_local! {
-        static CHANGES: RefCell<Vec<usize>> = const { RefCell::new(Vec::new()) };
-    }
-
-    struct Tracked(crate::highlight::ArcadiaHighlighter);
-    impl Highlighter for Tracked {
-        type Settings = Arc<str>;
-        type Highlight = oa_core::language::TokenClass;
-        type Iterator<'a> = std::vec::IntoIter<(Range<usize>, Self::Highlight)>;
-        fn new(settings: &Self::Settings) -> Self {
-            Self(crate::highlight::ArcadiaHighlighter::new(settings))
-        }
-        fn update(&mut self, settings: &Self::Settings) {
-            self.0.update(settings);
-        }
-        fn change_line(&mut self, line: usize) {
-            CHANGES.with(|changes| changes.borrow_mut().push(line));
-            self.0.change_line(line);
-        }
-        fn highlight_line(&mut self, line: &str) -> Self::Iterator<'_> {
-            self.0.highlight_line(line)
-        }
-        fn current_line(&self) -> usize {
-            self.0.current_line()
-        }
-    }
-
-    fn view(
-        editor: &text_editor::Content<FontLayout>,
-        source: Arc<str>,
-    ) -> Element<'_, (), iced::Theme, FontLayout> {
-        text_editor(editor)
-            .font(Font::MONOSPACE)
-            .size(14)
-            .height(Length::Fill)
-            .highlight_with::<Tracked>(source, crate::highlight::format)
-            .into()
-    }
-
-    #[test]
-    fn already_laid_out_editor_notifies_highlighter_from_zero_after_later_line_patch() {
-        let before = "// earlier\n// unmodified\n@a";
-        let after = "// earlier\n// unmodified\n@none";
-        let mut editor = text_editor::Content::<FontLayout>::with_text(before);
-        let limits = layout::Limits::new(Size::ZERO, Size::new(400., 60.));
-        let mut tree = {
-            let mut widget = view(&editor, Arc::from(before));
-            let mut tree = Tree::new(widget.as_widget());
-            let _ = widget
-                .as_widget_mut()
-                .layout(&mut tree, &FontLayout, &limits);
-            tree
-        };
-        CHANGES.with(|changes| changes.borrow_mut().clear());
-        assert!(replace(&mut editor, before, after));
-        {
-            let mut widget = view(&editor, Arc::from(after));
-            let _ = widget
-                .as_widget_mut()
-                .layout(&mut tree, &FontLayout, &limits);
-        }
-        // Font/metrics/bounds are already stable. This notification must come
-        // from the helper's empty edit, not a fresh renderer initialization.
-        CHANGES.with(|changes| assert_eq!(*changes.borrow(), [0]));
-        assert_eq!(editor.text(), after);
-    }
-}

crates/oa-desktop/src/app/source_rename/navigation_union_tests.rs

@@ -1,448 +0,0 @@
-//! Combined App-boundary oracles: the workers are completed independently and
-//! no returned Task is polled. Rendering measurements use the real reveal path.
-use super::*;
-use crate::diagram_usage::{self as usage, Surface, Target as UsageTarget, Usage};
-use iced::{Size, Vector};
-
-fn model_id(number: u8) -> Id {
-    Id::parse_str(&format!("00000000-0000-0000-0000-{number:012}")).unwrap()
-}
-
-fn navigation_fixture() -> App {
-    let mut source = bundle();
-    let entry = source.files.get_mut("project.arcadia").unwrap();
-    *entry = entry.replace(
-        "include \"uses.arcadia\";",
-        "include \"uses.arcadia\"; include \"views.arcadia\";",
-    );
-    source.files.insert(
-        "views.arcadia".into(),
-        concat!(
-            "// Keep @pump and the exact distant placement.\r\n",
-            "diagram overview \"Pump overview\" id \"00000000-0000-0000-0000-000000000008\" { layer Oa; }\r\n",
-            "node placed_pump id \"00000000-0000-0000-0000-000000000009\" { diagram @overview; element @pump; position { x 12000; y 9000; }; size { width 260; height 94; }; }\r\n",
-        ).into(),
-    );
-    let mut app = fixture();
-    app.document = Document::from_bundle(source.clone(), LIMITS).unwrap();
-    assert_eq!(app.document.bundle(), &source);
-    assert!(
-        !validate(app.project())
-            .iter()
-            .any(|issue| issue.severity == validation::Severity::Error)
-    );
-    app.source_workspace = Workspace::new(app.document.bundle(), true);
-    app.selected = app.project().id;
-    app.refresh_draft();
-    app.source_workspace.active = "uses.arcadia".into();
-    app.show_source_file(false);
-    seek_pump(&mut app);
-    app.canvas_size = Some(Size::new(1200., 700.));
-    app.zoom = 0.8;
-    app.pan = Vector::new(31., 47.);
-    app
-}
-
-fn seek_pump(app: &mut App) {
-    let source = app.source_workspace.text();
-    let offset = source.rfind("pump;").unwrap();
-    app.source_editor
-        .move_to(cursor(source, offset, offset + 4));
-}
-
-fn source_completion(app: &App, request: nav::Request) -> nav::Completion {
-    let snapshot = Arc::new(
-        app.with_source_input(|input| query::capture(input, query::Limits::default()).unwrap()),
-    );
-    let results = snapshot
-        .query(query::Query {
-            stamp: request.stamp,
-            path: &request.path,
-            byte_offset: request.offset,
-            action: request.action,
-        })
-        .unwrap();
-    nav::Completion {
-        request,
-        result: Ok((snapshot, Arc::new(results))),
-    }
-}
-
-fn diagram_completion(app: &App) -> usage::Completion {
-    let panel = app.diagram_usages.as_ref().unwrap();
-    let process = app.behavior.topology.usage_snapshot().into_query_state();
-    usage::Completion {
-        token: panel.token,
-        context: panel.context,
-        result: Ok(usage::collect(
-            app.project(),
-            panel.context.subject,
-            &process,
-            &behavior::scenario::State::default(),
-        )),
-    }
-}
-
-fn finish_lookup(app: &mut App) -> (Id, Usage) {
-    let completion = diagram_completion(app);
-    send(app, Message::DiagramUsagesReady(completion));
-    let panel = app.diagram_usages.as_ref().unwrap();
-    assert!(!panel.loading);
-    assert!(app.diagram_lookup_in_flight.is_none());
-    let found = panel
-        .usages
-        .iter()
-        .find(|u| {
-            u.surface == Surface::Saved(model_id(8))
-                && u.target == UsageTarget::Placement(model_id(9))
-        })
-        .expect("the exact placed pump is represented")
-        .clone();
-    assert_eq!(found.subject, model_id(2));
-    assert_eq!((found.bounds.x, found.bounds.y), (12000., 9000.));
-    (panel.token, found)
-}
-
-fn navigate(app: &mut App) -> Usage {
-    let message = app.diagram_usage_message(model_id(2));
-    send(app, message);
-    let (token, found) = finish_lookup(app);
-    send(
-        app,
-        Message::DiagramUsage(usage::Event::Choose(token, found.clone())),
-    );
-    assert_eq!(app.page, Page::Diagram);
-    assert_eq!(app.active_diagram, Some(model_id(8)));
-    assert_eq!(app.selected, model_id(2));
-    assert_eq!(app.selected_node, Some(model_id(9)));
-    assert!(app.diagram_usages.is_none());
-    assert!(app.pending_diagram_reveal.is_some());
-    assert!(app.diagram_focus(found.surface).is_some());
-    found
-}
-
-#[derive(Debug, PartialEq)]
-struct Navigation {
-    page: Page,
-    selected: Id,
-    placement: Option<Id>,
-    diagram: Option<Id>,
-    zoom: f32,
-    pan: Vector,
-    pending: Option<(usage::Context, Usage, u64)>,
-    focus: Option<(usage::Context, Usage, Id)>,
-    canvas_epoch: u64,
-    camera_epoch: u64,
-    source_interaction: Id,
-    source_reveal: Option<Id>,
-}
-
-fn navigation(app: &App) -> Navigation {
-    Navigation {
-        page: app.page,
-        selected: app.selected,
-        placement: app.selected_node,
-        diagram: app.active_diagram,
-        zoom: app.zoom,
-        pan: app.pan,
-        pending: app.pending_diagram_reveal.clone(),
-        focus: app
-            .diagram_navigation_focus
-            .as_ref()
-            .map(|f| (f.context, f.usage.clone(), f.selected)),
-        canvas_epoch: app.canvas_epoch,
-        camera_epoch: app.camera_epoch,
-        source_interaction: app.source_symbols.interaction,
-        source_reveal: app.source_reveal_ticket(),
-    }
-}
-
-fn first_measurement(app: &mut App, found: &Usage) {
-    let (context, _, epoch) = app.pending_diagram_reveal.as_ref().unwrap();
-    let (context, epoch) = (*context, *epoch);
-    let actual = Size::new(500., 300.);
-    send(app, Message::DiagramRevealViewport(context, epoch, actual));
-    assert!(app.pending_diagram_reveal.is_none());
-    assert_eq!(app.canvas_size, Some(actual));
-    assert!((found.bounds.center_x() * app.zoom + app.pan.x - 250.).abs() < 0.05);
-    assert!((found.bounds.center_y() * app.zoom + app.pan.y - 150.).abs() < 0.05);
-    assert_eq!(app.selected, model_id(2));
-    assert_eq!(app.selected_node, Some(model_id(9)));
-    assert!(app.diagram_focus(found.surface).is_some());
-}
-
-#[test]
-fn rename_modal_rejects_queued_diagram_and_source_navigation_without_losing_approval() {
-    let mut app = navigation_fixture();
-    let original = evidence(&app);
-    let snapshot = app.document.snapshot();
-    let queued = app.diagram_usage_message(model_id(2));
-    begin(&mut app);
-    input(&mut app, "send_water");
-    let confirm = preview(&mut app);
-    let form = app.source_rename.form.as_ref().unwrap();
-    let approved = (
-        form.invocation,
-        form.generation,
-        form.approval.as_ref().unwrap().id,
-    );
-    send(&mut app, queued);
-    let source = app.source_symbol_message(nav::SymbolEvent::DiagramUsages);
-    send(&mut app, source);
-    let definition = app.source_symbol_message(nav::SymbolEvent::Query(query::Action::Definition));
-    send(&mut app, definition);
-    assert!(app.diagram_usages.is_none());
-    assert!(app.diagram_lookup_in_flight.is_none());
-    assert!(app.source_symbols.in_flight.is_none());
-    assert!(!app.source_navigation_available());
-    let form = app.source_rename.form.as_ref().unwrap();
-    assert_eq!(
-        (
-            form.invocation,
-            form.generation,
-            form.approval.as_ref().unwrap().id
-        ),
-        approved
-    );
-    assert_eq!(form.replacement, "send_water");
-    assert_eq!(evidence(&app), original);
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    send(&mut app, Message::Escape);
-    send(&mut app, confirm);
-    assert!(!app.source_rename.open());
-    assert_eq!(evidence(&app), original);
-}
-
-#[test]
-fn loading_and_ready_diagram_choosers_reject_a_previously_captured_rename_begin() {
-    for finish in [false, true] {
-        let mut app = navigation_fixture();
-        let before = evidence(&app);
-        let queued_rename = app.source_rename_message();
-        let open = app.diagram_usage_message(model_id(2));
-        send(&mut app, open);
-        if finish {
-            finish_lookup(&mut app);
-        }
-        let panel = app.diagram_usages.as_ref().unwrap();
-        let token = panel.token;
-        let loading = panel.loading;
-        assert!(app.rename_admission().is_err());
-        assert!(!app.source_navigation_available());
-        send(&mut app, queued_rename);
-        assert!(!app.source_rename.open());
-        assert!(app.source_rename.in_flight.is_none());
-        let panel = app.diagram_usages.as_ref().unwrap();
-        assert_eq!((panel.token, panel.loading), (token, loading));
-        assert_eq!(evidence(&app), before);
-        send(&mut app, Message::DiagramUsage(usage::Event::Close(token)));
-        let rename = app.source_rename_message();
-        send(&mut app, rename);
-        assert!(
-            app.source_rename.open(),
-            "the dismissed chooser no longer owns input"
-        );
-    }
-}
-
-#[test]
-fn late_target_and_preview_results_release_only_their_slot_and_preserve_first_camera_measurement() {
-    for preview_pending in [false, true] {
-        let mut app = navigation_fixture();
-        let before = evidence(&app);
-        let completion = if preview_pending {
-            begin(&mut app);
-            input(&mut app, "send_water");
-            let job = start_preview(&mut app);
-            preview_completion(&app, job)
-        } else {
-            let rename = app.source_rename_message();
-            send(&mut app, rename);
-            target_completion(&app, current_job(&app))
-        };
-        let occupied = completion.job.id;
-        event(&mut app, Event::Close(completion.job.invocation));
-        assert_eq!(app.source_rename.in_flight, Some(occupied));
-        let found = navigate(&mut app);
-        let location = navigation(&app);
-        assert_eq!(evidence(&app), before);
-        let mut forged = completion.clone();
-        forged.job.id = Id::new_v4();
-        send(&mut app, Message::SourceRenameReady(forged));
-        assert_eq!(app.source_rename.in_flight, Some(occupied));
-        assert_eq!(navigation(&app), location);
-        send(&mut app, Message::SourceRenameReady(completion.clone()));
-        assert!(app.source_rename.in_flight.is_none());
-        assert!(!app.source_rename.open());
-        assert_eq!(navigation(&app), location);
-        assert_eq!(evidence(&app), before);
-        send(&mut app, Message::SourceRenameReady(completion));
-        assert_eq!(
-            navigation(&app),
-            location,
-            "duplicate completion is passive too"
-        );
-        first_measurement(&mut app, &found);
-        assert_eq!(evidence(&app), before);
-    }
-}
-
-#[test]
-fn stale_begin_close_and_actual_confirm_leave_new_diagram_focus_and_pending_measurement_unchanged()
-{
-    let mut app = navigation_fixture();
-    let before = evidence(&app);
-    let snapshot = app.document.snapshot();
-    let queued_begin = app.source_rename_message();
-    begin(&mut app);
-    input(&mut app, "send_water");
-    let confirm = preview(&mut app);
-    let invocation = app.source_rename.form.as_ref().unwrap().invocation;
-    event(&mut app, Event::Close(invocation));
-    let found = navigate(&mut app);
-    let location = navigation(&app);
-    for stale in [
-        queued_begin,
-        Message::SourceRename(Event::Close(invocation)),
-        confirm,
-    ] {
-        send(&mut app, stale);
-        assert_eq!(navigation(&app), location);
-        assert_eq!(evidence(&app), before);
-        assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    }
-    first_measurement(&mut app, &found);
-}
-
-#[test]
-fn document_reset_retains_all_three_worker_slots_until_their_exact_results_arrive() {
-    let mut app = navigation_fixture();
-    let source = app.source_symbol_message(nav::SymbolEvent::Query(query::Action::Definition));
-    send(&mut app, source);
-    let request = app.source_symbols.request.clone().unwrap();
-    let source_ready = source_completion(&app, request.clone());
-    let rename = app.source_rename_message();
-    send(&mut app, rename);
-    let rename_ready = target_completion(&app, current_job(&app));
-    let rename_job = rename_ready.job.id;
-    event(&mut app, Event::Close(rename_ready.job.invocation));
-    let open = app.diagram_usage_message(model_id(2));
-    send(&mut app, open);
-    let old_diagram = diagram_completion(&app);
-    let diagram_job = old_diagram.token;
-    let old_document = app.canvas_document;
-    let project = app.project().clone();
-    app.reset(project, None);
-    assert_ne!(app.canvas_document, old_document);
-    assert_eq!(app.source_symbols.in_flight, Some(request.job));
-    assert_eq!(app.source_rename.in_flight, Some(rename_job));
-    assert_eq!(app.diagram_lookup_in_flight, Some(diagram_job));
-    assert!(!app.source_rename.open());
-    assert!(app.diagram_usages.is_none());
-    let before = evidence(&app);
-    let snapshot = app.document.snapshot();
-    let new_open = app.diagram_usage_message(model_id(2));
-    send(&mut app, new_open);
-    let new_token = app.diagram_usages.as_ref().unwrap().token;
-    assert_ne!(new_token, diagram_job);
-    assert_eq!(
-        app.diagram_lookup_in_flight,
-        Some(diagram_job),
-        "replacement waits for old worker"
-    );
-    send(&mut app, Message::SourceRenameReady(rename_ready));
-    assert!(app.source_rename.in_flight.is_none());
-    assert_eq!(app.source_symbols.in_flight, Some(request.job));
-    assert_eq!(app.diagram_lookup_in_flight, Some(diagram_job));
-    send(&mut app, Message::SourceSymbolsReady(source_ready));
-    assert!(app.source_symbols.in_flight.is_none());
-    assert!(!app.source_symbols.open);
-    send(&mut app, Message::DiagramUsagesReady(old_diagram));
-    assert_eq!(app.diagram_lookup_in_flight, Some(new_token));
-    assert!(app.diagram_usages.as_ref().unwrap().loading);
-    finish_lookup(&mut app);
-    assert_eq!(evidence(&app), before);
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    assert!(!app.source_rename.open());
-}
-
-#[test]
-fn rename_then_exact_caret_diagram_navigation_preserves_complete_model_undo_redo_history() {
-    let mut app = navigation_fixture();
-    let baseline = app.document.snapshot();
-    let project = app.project().id;
-    app.document
-        .execute(Command::Rename(project, "Previously accepted name".into()))
-        .unwrap();
-    app.sync_source();
-    app.refresh_draft();
-    seek_pump(&mut app);
-    let before = app.document.snapshot();
-    let mut expected_project = app.project().clone();
-    expected_project
-        .elements
-        .get_mut(&model_id(2))
-        .unwrap()
-        .alias = "send_water".into();
-    let mut expected_source = app.document.bundle().clone();
-    let defs = expected_source.files.get_mut("defs.arcadia").unwrap();
-    *defs = defs.replace("oa_activity pump ", "oa_activity send_water ");
-    let uses = expected_source.files.get_mut("uses.arcadia").unwrap();
-    *uses = uses
-        .replace("source @pump;", "source @send_water;")
-        .replace("// keep @pump\r\n pump;", "// keep @pump\r\n send_water;");
-    let views = expected_source.files.get_mut("views.arcadia").unwrap();
-    *views = views.replace("element @pump;", "element @send_water;");
-    begin(&mut app);
-    input(&mut app, "send_water");
-    let confirm = preview(&mut app);
-    send(&mut app, confirm);
-    assert_eq!(app.project(), &expected_project);
-    assert_eq!(app.document.bundle(), &expected_source);
-    let renamed = app.document.snapshot();
-    let accepted = evidence(&app);
-    let queued_undo_rename = app
-        .source_rename_undo_message()
-        .expect("fresh rename offers its guarded undo");
-    let message = app.source_symbol_message(nav::SymbolEvent::DiagramUsages);
-    send(&mut app, message);
-    let request = app
-        .source_symbols
-        .request
-        .clone()
-        .expect("renamed exact caret remains queryable");
-    let ready = source_completion(&app, request);
-    send(&mut app, Message::SourceSymbolsReady(ready));
-    let (token, found) = finish_lookup(&mut app);
-    send(
-        &mut app,
-        Message::DiagramUsage(usage::Event::Choose(token, found.clone())),
-    );
-    assert_eq!(app.selected, model_id(2));
-    assert_eq!(app.selected_node, Some(model_id(9)));
-    let destination = navigation(&app);
-    send(&mut app, queued_undo_rename);
-    assert_eq!(navigation(&app), destination);
-    assert_eq!(evidence(&app), accepted);
-    first_measurement(&mut app, &found);
-    assert_eq!(evidence(&app), accepted);
-    assert!(Arc::ptr_eq(&renamed, &app.document.snapshot()));
-    for (message, expected) in [
-        (Message::Undo, before.clone()),
-        (Message::Redo, renamed.clone()),
-        (Message::Undo, before.clone()),
-        (Message::Undo, baseline.clone()),
-        (Message::Redo, before),
-        (Message::Redo, renamed),
-    ] {
-        send(&mut app, message);
-        assert!(
-            Arc::ptr_eq(&expected, &app.document.snapshot()),
-            "exact history entry restored"
-        );
-        assert_eq!(app.project(), &expected.decoded.project);
-        assert_eq!(app.document.bundle(), &expected.bundle);
-        assert_eq!(app.source_workspace.bundle(), expected.bundle);
-        assert!(!app.source_dirty());
-    }
-}

crates/oa-desktop/src/app/source_rename/preview_glyph_tests.rs

@@ -1,449 +0,0 @@
-//! Real paragraph advances and clipping through the actual preview dialog.
-//! Native screenshots additionally check raster ink and the platform renderer.
-use super::*;
-use crate::views::source_tests::FontLayout;
-use iced::advanced::{Layout, layout, renderer, text as shaped, widget};
-use iced::{Background, Color, Font, Pixels, Point, Rectangle, Size, Transformation, Vector};
-use std::collections::{BTreeMap, BTreeSet};
-
-struct Glyph {
-    text: String,
-    paragraph_y: u32,
-    line: usize,
-    bytes: std::ops::Range<usize>,
-    bounds: Rectangle,
-    clip: Rectangle,
-}
-
-struct GlyphRecorder {
-    wanted: BTreeSet<String>,
-    transforms: Vec<Transformation>,
-    clips: Vec<Rectangle>,
-    glyphs: Vec<Glyph>,
-    quads: Vec<Rectangle>,
-}
-impl GlyphRecorder {
-    fn new(wanted: BTreeSet<String>, viewport: Rectangle) -> Self {
-        Self {
-            wanted,
-            transforms: vec![Transformation::IDENTITY],
-            clips: vec![viewport],
-            glyphs: vec![],
-            quads: vec![],
-        }
-    }
-    fn transform(&self) -> Transformation {
-        *self.transforms.last().unwrap()
-    }
-    fn clip(&self, bounds: Rectangle) -> Rectangle {
-        self.clips
-            .last()
-            .unwrap()
-            .intersection(&(bounds * self.transform()))
-            .unwrap_or(Rectangle::with_size(Size::ZERO))
-    }
-}
-impl renderer::Renderer for GlyphRecorder {
-    fn start_layer(&mut self, bounds: Rectangle) {
-        self.clips.push(self.clip(bounds));
-    }
-    fn end_layer(&mut self) {
-        self.clips.pop().unwrap();
-    }
-    fn start_transformation(&mut self, transform: Transformation) {
-        self.transforms.push(self.transform() * transform);
-    }
-    fn end_transformation(&mut self) {
-        self.transforms.pop().unwrap();
-    }
-    fn reset(&mut self, bounds: Rectangle) {
-        self.transforms = vec![Transformation::IDENTITY];
-        self.clips = vec![bounds];
-        self.glyphs.clear();
-        self.quads.clear();
-    }
-    fn fill_quad(&mut self, quad: renderer::Quad, _: impl Into<Background>) {
-        self.quads.push(quad.bounds * self.transform());
-    }
-    fn allocate_image(
-        &mut self,
-        handle: &iced::advanced::image::Handle,
-        callback: impl FnOnce(Result<iced::advanced::image::Allocation, iced::advanced::image::Error>)
-        + Send
-        + 'static,
-    ) {
-        renderer::Renderer::allocate_image(&mut FontLayout, handle, callback);
-    }
-}
-impl shaped::Renderer for GlyphRecorder {
-    type Font = Font;
-    type Paragraph = <FontLayout as shaped::Renderer>::Paragraph;
-    type Editor = <FontLayout as shaped::Renderer>::Editor;
-    const ICON_FONT: Font = <FontLayout as shaped::Renderer>::ICON_FONT;
-    const CHECKMARK_ICON: char = <FontLayout as shaped::Renderer>::CHECKMARK_ICON;
-    const ARROW_DOWN_ICON: char = <FontLayout as shaped::Renderer>::ARROW_DOWN_ICON;
-    const SCROLL_UP_ICON: char = <FontLayout as shaped::Renderer>::SCROLL_UP_ICON;
-    const SCROLL_DOWN_ICON: char = <FontLayout as shaped::Renderer>::SCROLL_DOWN_ICON;
-    const SCROLL_LEFT_ICON: char = <FontLayout as shaped::Renderer>::SCROLL_LEFT_ICON;
-    const SCROLL_RIGHT_ICON: char = <FontLayout as shaped::Renderer>::SCROLL_RIGHT_ICON;
-    const ICED_LOGO: char = <FontLayout as shaped::Renderer>::ICED_LOGO;
-    fn default_font(&self) -> Font {
-        shaped::Renderer::default_font(&FontLayout)
-    }
-    fn default_size(&self) -> Pixels {
-        shaped::Renderer::default_size(&FontLayout)
-    }
-    fn fill_paragraph(
-        &mut self,
-        paragraph: &Self::Paragraph,
-        position: Point,
-        _: Color,
-        clip: Rectangle,
-    ) {
-        let buffer = paragraph.buffer();
-        let text = buffer
-            .lines
-            .iter()
-            .map(|line| line.text())
-            .collect::<Vec<_>>()
-            .join("\n");
-        if !self.wanted.contains(&text) {
-            return;
-        }
-        let clip = self.clip(clip);
-        for run in buffer.layout_runs() {
-            for glyph in run.glyphs {
-                if run.text[glyph.start..glyph.end]
-                    .chars()
-                    .all(char::is_whitespace)
-                {
-                    continue;
-                }
-                let bounds = Rectangle {
-                    x: position.x + glyph.x + glyph.x_offset * glyph.font_size,
-                    y: position.y + run.line_top,
-                    width: glyph.w,
-                    height: run.line_height,
-                } * self.transform();
-                self.glyphs.push(Glyph {
-                    text: text.clone(),
-                    paragraph_y: position.y.to_bits(),
-                    line: run.line_i,
-                    bytes: glyph.start..glyph.end,
-                    bounds,
-                    clip,
-                });
-            }
-        }
-    }
-    fn fill_editor(
-        &mut self,
-        editor: &Self::Editor,
-        position: Point,
-        color: Color,
-        clip: Rectangle,
-    ) {
-        shaped::Renderer::fill_editor(&mut FontLayout, editor, position, color, clip);
-    }
-    fn fill_text(&mut self, text: shaped::Text, position: Point, color: Color, clip: Rectangle) {
-        shaped::Renderer::fill_text(&mut FontLayout, text, position, color, clip);
-    }
-}
-
-#[derive(Default)]
-struct ScrollGeometry {
-    id: Option<widget::Id>,
-    bounds: Option<Rectangle>,
-    content: Option<Rectangle>,
-    offset: Vector,
-}
-impl widget::Operation for ScrollGeometry {
-    fn traverse(&mut self, visit: &mut dyn FnMut(&mut dyn widget::Operation)) {
-        visit(self);
-    }
-    fn scrollable(
-        &mut self,
-        id: Option<&widget::Id>,
-        bounds: Rectangle,
-        content: Rectangle,
-        offset: Vector,
-        _: &mut dyn widget::operation::Scrollable,
-    ) {
-        if id == self.id.as_ref() {
-            self.bounds = Some(bounds);
-            self.content = Some(content);
-            self.offset = offset;
-        }
-    }
-}
-fn normalized(text: &str) -> String {
-    text.replace("\r\n", "\n").replace('\r', "\n")
-}
-fn required_chars(text: &str) -> BTreeSet<(usize, usize)> {
-    text.split('\n')
-        .enumerate()
-        .flat_map(|(line, text)| {
-            text.char_indices()
-                .filter(|(_, ch)| !ch.is_whitespace())
-                .map(move |(byte, _)| (line, byte))
-        })
-        .collect()
-}
-
-fn declarations(long: bool) -> App {
-    let name = if long {
-        format!("Assess {} request", "界🚀".repeat(90))
-    } else {
-        "Assess 救援 request".into()
-    };
-    let source = SourceBundle { entry: "project.arcadia".into(), files: BTreeMap::from([
-        ("project.arcadia".into(), "arcadia 7;\r\nproject navigation_trial \"Navigation — 救援\" id \"9e8f0000-0000-4000-8000-000000000001\" {\r\n include \"救援/assess.arcadia\";\r\n}\r\n".into()),
-        ("救援/assess.arcadia".into(), format!("// Comment @assess must not be a lexical use.\r\noa_activity assess \"{name}\" id \"9e8f0000-0000-4000-8000-000000000002\" {{\r\n    description \"Keep @assess as prose, not a use.\";\r\n}}\r\n")),
-    ]) };
-    let mut app = fixture();
-    app.document = Document::from_bundle(source, LIMITS).unwrap();
-    app.source_workspace = Workspace::new(app.document.bundle(), true);
-    app.source_workspace.active = "救援/assess.arcadia".into();
-    app.selected = app.project().id;
-    app.refresh_draft();
-    app.show_source_file(false);
-    let start = app
-        .source_workspace
-        .text()
-        .find("oa_activity assess")
-        .unwrap()
-        + "oa_activity ".len();
-    app.source_editor.move_to(cursor(
-        app.source_workspace.text(),
-        start,
-        start + "assess".len(),
-    ));
-    begin(&mut app);
-    let replacement = if long {
-        "a".repeat(255)
-    } else {
-        "assess_damage".into()
-    };
-    input(&mut app, &replacement);
-    let _ = preview(&mut app);
-    app
-}
-
-fn assert_page_glyphs_visible(app: &App, host: Size) {
-    let form = app.source_rename.form.as_ref().unwrap();
-    let ready = form.approval.as_ref().unwrap();
-    let file = &ready.preview.files()[form.file];
-    let mut expected = BTreeMap::<String, usize>::new();
-    for line in file.hunks()[form.hunk]
-        .lines()
-        .iter()
-        .skip(form.line)
-        .take(LINES_PER_PAGE)
-    {
-        for source in [
-            line.before_text(&ready.prepared.before().bundle.files[file.path()])
-                .unwrap(),
-            line.after_text(&ready.prepared.after().bundle.files[file.path()])
-                .unwrap(),
-        ] {
-            if let Some(fragment) = preview::text_segment(source, form.segment) {
-                let text = normalized(fragment);
-                if !required_chars(&text).is_empty() {
-                    *expected.entry(text).or_default() += 1;
-                }
-            }
-        }
-    }
-    assert!(!expected.is_empty());
-    let viewport = Rectangle::new(Point::ORIGIN, host);
-    let mut renderer = GlyphRecorder::new(expected.keys().cloned().collect(), viewport);
-    let editor = text_editor::Content::<GlyphRecorder>::new();
-    let mut view = dialog_content(app, &editor);
-    let mut tree = widget::Tree::new(view.as_widget());
-    let node =
-        view.as_widget_mut()
-            .layout(&mut tree, &renderer, &layout::Limits::new(Size::ZERO, host));
-    let mut geometry = ScrollGeometry {
-        id: Some(preview_scroll_id(form, ready.id)),
-        ..ScrollGeometry::default()
-    };
-    view.as_widget_mut()
-        .operate(&mut tree, Layout::new(&node), &renderer, &mut geometry);
-    let bounds = geometry.bounds.unwrap();
-    let content = geometry.content.unwrap();
-    assert!(bounds.height >= 40.);
-    let maximum = (content.height - bounds.height).max(0.);
-    let steps = (maximum / (bounds.height * 0.5)).ceil() as usize;
-    let mut visible = BTreeMap::<(String, u32), BTreeSet<(usize, usize)>>::new();
-    let mut reserved_bar_gap = true;
-    for step in 0..=steps {
-        let offset = (step as f32 * bounds.height * 0.5).min(maximum);
-        view.as_widget_mut().operate(
-            &mut tree,
-            Layout::new(&node),
-            &renderer,
-            &mut widget::operation::scrollable::scroll_to(
-                preview_scroll_id(form, ready.id),
-                widget::operation::scrollable::AbsoluteOffset {
-                    x: None,
-                    y: Some(offset),
-                },
-            ),
-        );
-        view.as_widget_mut()
-            .operate(&mut tree, Layout::new(&node), &renderer, &mut geometry);
-        assert!(
-            (geometry.offset.y - offset).abs() <= 0.5,
-            "actual scroll operation reaches the requested source offset"
-        );
-        renderer::Renderer::reset(&mut renderer, viewport);
-        view.as_widget().draw(
-            &tree,
-            &mut renderer,
-            &iced::Theme::Light,
-            &renderer::Style::default(),
-            Layout::new(&node),
-            iced::mouse::Cursor::Unavailable,
-            &viewport,
-        );
-        // The vertical scrollbar's actual painted thumb fixes its excluded x
-        // region; the outer scroll clip alone cannot detect overpainting.
-        let scrollbar_left = renderer
-            .quads
-            .iter()
-            .filter(|quad| {
-                quad.width > 0.
-                    && quad.width <= 16.
-                    && quad.height > 0.
-                    && quad.x >= bounds.x + bounds.width - 18.
-                    && quad.x + quad.width <= bounds.x + bounds.width + 0.5
-                    && quad.y >= bounds.y - 0.5
-                    && quad.y + quad.height <= bounds.y + bounds.height + 0.5
-            })
-            .map(|quad| quad.x)
-            .min_by(f32::total_cmp);
-        if maximum > 0. {
-            let left = scrollbar_left.expect("overflowing actual preview must paint its scrollbar");
-            reserved_bar_gap &= content.x + content.width <= left - 7.5;
-        }
-        for glyph in &renderer.glyphs {
-            let right = glyph.bounds.x + glyph.bounds.width;
-            if let Some(left) = scrollbar_left {
-                assert!(
-                    right <= left - 0.5,
-                    "source glyph under scrollbar: text={:?} cluster={:?} glyph={:?} bar x={left}",
-                    glyph.text,
-                    glyph.bytes,
-                    glyph.bounds
-                );
-            }
-            assert!(
-                glyph.bounds.x >= content.x - 0.5 && right <= content.x + content.width + 0.5,
-                "source glyph escaped reserved width: {:?} {:?}",
-                glyph.text,
-                glyph.bounds
-            );
-            assert!(
-                glyph.bounds.x >= glyph.clip.x - 0.5
-                    && right <= glyph.clip.x + glyph.clip.width + 0.5,
-                "source glyph horizontally clipped: {:?} {:?} {:?}",
-                glyph.text,
-                glyph.bounds,
-                glyph.clip
-            );
-            if glyph.bounds.y >= glyph.clip.y - 0.5
-                && glyph.bounds.y + glyph.bounds.height <= glyph.clip.y + glyph.clip.height + 0.5
-            {
-                let logical_line = glyph.text.split('\n').nth(glyph.line).unwrap();
-                let chars = logical_line
-                    .char_indices()
-                    .filter(|(byte, ch)| glyph.bytes.contains(byte) && !ch.is_whitespace())
-                    .map(|(byte, _)| (glyph.line, byte));
-                visible
-                    .entry((glyph.text.clone(), glyph.paragraph_y))
-                    .or_default()
-                    .extend(chars);
-            }
-        }
-    }
-    assert!(
-        reserved_bar_gap,
-        "source content must reserve actual scrollbar width plus gap"
-    );
-    assert!(
-        bounds.width >= host.width - 30.,
-        "preview must use available dialog width: {bounds:?} / {host:?}"
-    );
-    for (text, count) in expected {
-        let required = required_chars(&text);
-        let instances: Vec<_> = visible
-            .iter()
-            .filter(|((value, _), _)| value == &text)
-            .collect();
-        assert_eq!(
-            instances.len(),
-            count,
-            "all before/after occurrences must be seen: {text:?}"
-        );
-        for (_, seen) in instances {
-            assert_eq!(
-                seen, &required,
-                "every non-whitespace source cluster must be fully visible at some vertical offset: {text:?}"
-            );
-        }
-    }
-}
-
-#[test]
-fn actual_preview_source_glyphs_clear_scrollbar_and_all_long_fragments_are_reachable() {
-    for long in [false, true] {
-        let mut app = declarations(long);
-        let ready = app
-            .source_rename
-            .form
-            .as_ref()
-            .unwrap()
-            .approval
-            .as_ref()
-            .unwrap()
-            .clone();
-        let invocation = app.source_rename.form.as_ref().unwrap().invocation;
-        let before = evidence(&app);
-        for (width, height) in [(1100., 700.), (580., 700.)] {
-            app.window_size = Size::new(width, height);
-            let host = Size::new((width - 84.).min(708.), height - 120.);
-            let total = segment_total(app.source_rename.form.as_ref().unwrap());
-            if long {
-                assert!(
-                    total >= 3,
-                    "include unbroken ASCII and wide Unicode across segments"
-                );
-            }
-            for segment in 0..total {
-                assert_page_glyphs_visible(&app, host);
-                if segment + 1 < total {
-                    event(&mut app, Event::Segment(invocation, ready.id, true));
-                }
-            }
-            for _ in 1..total {
-                event(&mut app, Event::Segment(invocation, ready.id, false));
-            }
-        }
-        assert_eq!(
-            evidence(&app),
-            before,
-            "preview geometry/paging cannot alter transaction inputs"
-        );
-        assert_eq!(
-            app.source_rename
-                .form
-                .as_ref()
-                .unwrap()
-                .approval
-                .as_ref()
-                .unwrap()
-                .id,
-            ready.id
-        );
-    }
-}

crates/oa-desktop/src/app/source_rename/preview_scroll_tests.rs

@@ -1,385 +0,0 @@
-//! Execute the controller's scroll operations on a retained, scrolled dialog.
-use super::*;
-use crate::views::source_tests::FontLayout;
-use iced::advanced::{Layout, layout, widget};
-use iced::futures::StreamExt;
-use iced::{Rectangle, Size, Vector};
-
-const HOST: Size = Size::new(720., 660.);
-
-fn paged_fixture() -> App {
-    let mut source = bundle();
-    let name = "Long engineering name 雨 ".repeat(18);
-    source.files.get_mut("defs.arcadia").unwrap().replace_range(
-        ..,
-        &format!(
-            "oa_activity pump \"{name}\" id \"00000000-0000-0000-0000-000000000002\" {{}}\r\n\
-            oa_activity backup \"Backup\" id \"00000000-0000-0000-0000-000000000004\" {{}}\r\n"
-        ),
-    );
-    let mut uses = String::new();
-    for index in 0..16 {
-        if index == 12 {
-            uses.push_str(&"// unchanged gap\r\n".repeat(10));
-        }
-        uses.push_str(&format!(
-            "interaction use_{index} \"{name}\" id \"00000000-0000-0000-0001-{index:012}\" {{ source @pump; target @backup; }}\r\n"
-        ));
-    }
-    source.files.insert("uses.arcadia".into(), uses);
-    let mut app = fixture();
-    app.window_size = HOST;
-    app.document = Document::from_bundle(source, LIMITS).unwrap();
-    app.source_workspace = Workspace::new(app.document.bundle(), true);
-    app.source_workspace.active = "uses.arcadia".into();
-    app.show_source_file(false);
-    let start = app.source_workspace.text().find("source @pump").unwrap() + "source @".len();
-    app.source_editor
-        .move_to(cursor(app.source_workspace.text(), start, start + 4));
-    begin(&mut app);
-    input(&mut app, "pump_long");
-    let _ = preview(&mut app);
-    app
-}
-
-fn scroll_id(app: &App) -> widget::Id {
-    let form = app.source_rename.form.as_ref().unwrap();
-    preview_scroll_id(form, form.approval.as_ref().unwrap().id)
-}
-
-struct Geometry {
-    id: widget::Id,
-    offset: Option<Vector>,
-}
-impl widget::Operation for Geometry {
-    fn traverse(&mut self, visit: &mut dyn FnMut(&mut dyn widget::Operation)) {
-        visit(self);
-    }
-    fn scrollable(
-        &mut self,
-        id: Option<&widget::Id>,
-        _: Rectangle,
-        _: Rectangle,
-        offset: Vector,
-        _: &mut dyn widget::operation::Scrollable,
-    ) {
-        if id == Some(&self.id) {
-            self.offset = Some(offset);
-        }
-    }
-}
-
-struct Mounted {
-    editor: text_editor::Content<FontLayout>,
-    tree: widget::Tree,
-}
-impl Mounted {
-    fn new(app: &App) -> Self {
-        let editor = text_editor::Content::<FontLayout>::new();
-        let tree = widget::Tree::new(dialog_content(app, &editor).as_widget());
-        Self { editor, tree }
-    }
-    fn operate(&mut self, app: &App, operation: &mut dyn widget::Operation) {
-        let mut view = dialog_content(app, &self.editor);
-        // Preserve the actual scroll state across the new page's view diff.
-        self.tree.diff(view.as_widget());
-        let node = view.as_widget_mut().layout(
-            &mut self.tree,
-            &FontLayout,
-            &layout::Limits::new(Size::ZERO, HOST),
-        );
-        view.as_widget_mut()
-            .operate(&mut self.tree, Layout::new(&node), &FontLayout, operation);
-    }
-    fn offset(&mut self, app: &App) -> f32 {
-        let mut geometry = Geometry {
-            id: scroll_id(app),
-            offset: None,
-        };
-        self.operate(app, &mut geometry);
-        geometry.offset.expect("mounted preview scrollable").y
-    }
-    fn scroll_down(&mut self, app: &App) -> f32 {
-        self.operate(
-            app,
-            &mut widget::operation::scrollable::scroll_to(
-                scroll_id(app),
-                widget::operation::scrollable::AbsoluteOffset {
-                    x: None,
-                    y: Some(10_000.),
-                },
-            ),
-        );
-        let offset = self.offset(app);
-        assert!(offset > 10., "fixture must really be scrolled");
-        offset
-    }
-    async fn execute(&mut self, app: &App, task: Task<Message>) -> usize {
-        let mut count = 0;
-        if let Some(mut actions) = iced_runtime::task::into_stream(task) {
-            while let Some(action) = actions.next().await {
-                let iced_runtime::Action::Widget(mut operation) = action else {
-                    panic!("preview paging must only schedule a widget operation");
-                };
-                self.operate(app, operation.as_mut());
-                count += 1;
-            }
-        }
-        count
-    }
-}
-
-#[tokio::test]
-async fn explicit_navigation_resets_retained_scroll_but_id_change_alone_does_not() {
-    let mut app = paged_fixture();
-    let before = evidence(&app);
-    let form = app.source_rename.form.as_ref().unwrap();
-    let invocation = form.invocation;
-    let approval = form.approval.as_ref().unwrap().id;
-    let mut mounted = Mounted::new(&app);
-    mounted.scroll_down(&app);
-    let old_id = scroll_id(&app);
-    let task = app.update(Message::SourceRename(Event::File(
-        invocation, approval, true,
-    )));
-    assert_ne!(old_id, scroll_id(&app));
-    // Negative control: even after diff/layout with the new id and new file,
-    // Iced retains the previous offset until the returned operation executes.
-    assert!(mounted.offset(&app) > 10.);
-    assert_eq!(mounted.execute(&app, task).await, 1);
-    assert_eq!(mounted.offset(&app), 0.);
-
-    for navigation in [
-        Event::Line(invocation, approval, true),
-        Event::Segment(invocation, approval, true),
-        Event::Hunk(invocation, approval, true),
-        Event::File(invocation, approval, false),
-        Event::Search(invocation, "uses".into()),
-        Event::Search(invocation, "no-path-match".into()),
-        Event::Search(invocation, String::new()),
-    ] {
-        mounted.scroll_down(&app);
-        let task = app.update(Message::SourceRename(navigation));
-        assert_eq!(mounted.execute(&app, task).await, 1);
-        assert_eq!(mounted.offset(&app), 0.);
-        assert_eq!(evidence(&app), before);
-    }
-    // Passive redraw and unchanged filter input preserve deliberate scrolling.
-    let offset = mounted.scroll_down(&app);
-    assert_eq!(mounted.offset(&app), offset);
-    let task = app.update(Message::SourceRename(Event::Search(
-        invocation,
-        String::new(),
-    )));
-    assert_eq!(mounted.execute(&app, task).await, 0);
-    assert_eq!(mounted.offset(&app), offset);
-    let task = app.update(Message::SourceRename(Event::Input(
-        invocation,
-        "pump_long".into(),
-    )));
-    assert_eq!(mounted.execute(&app, task).await, 0);
-    assert_eq!(mounted.offset(&app), offset);
-    let task = app.update(Message::SourceRename(Event::File(
-        invocation, approval, false,
-    )));
-    assert_eq!(
-        mounted.execute(&app, task).await,
-        0,
-        "clamped first-page request is a no-op"
-    );
-    assert_eq!(mounted.offset(&app), offset);
-    assert_eq!(evidence(&app), before);
-}
-
-#[tokio::test]
-async fn delayed_page_and_approval_operations_cannot_reset_a_new_destination() {
-    let mut app = paged_fixture();
-    let before = evidence(&app);
-    let form = app.source_rename.form.as_ref().unwrap();
-    let invocation = form.invocation;
-    let old_approval = form.approval.as_ref().unwrap().id;
-    let mut mounted = Mounted::new(&app);
-    let old_page_task = app.update(Message::SourceRename(Event::File(
-        invocation,
-        old_approval,
-        true,
-    )));
-    let next_page_task = app.update(Message::SourceRename(Event::Line(
-        invocation,
-        old_approval,
-        true,
-    )));
-    assert_eq!(mounted.execute(&app, next_page_task).await, 1);
-    let offset = mounted.scroll_down(&app);
-    assert_eq!(mounted.execute(&app, old_page_task).await, 1);
-    assert_eq!(mounted.offset(&app), offset, "old page target is absent");
-
-    let old_approval_task = app.update(Message::SourceRename(Event::Search(
-        invocation,
-        "defs".into(),
-    )));
-    input(&mut app, "pump_new");
-    let _ = preview(&mut app); // Real new approval in the same invocation/page.
-    assert_ne!(
-        app.source_rename
-            .form
-            .as_ref()
-            .unwrap()
-            .approval
-            .as_ref()
-            .unwrap()
-            .id,
-        old_approval
-    );
-    let offset = mounted.scroll_down(&app);
-    assert_eq!(mounted.execute(&app, old_approval_task).await, 1);
-    assert_eq!(
-        mounted.offset(&app),
-        offset,
-        "old approval target is absent"
-    );
-    let task = app.update(Message::SourceRename(Event::File(
-        invocation,
-        old_approval,
-        true,
-    )));
-    assert_eq!(
-        mounted.execute(&app, task).await,
-        0,
-        "stale envelope is rejected before scheduling"
-    );
-    assert_eq!(mounted.offset(&app), offset);
-    assert_eq!(evidence(&app), before);
-}
-
-#[tokio::test]
-async fn repeated_page_visits_filters_and_fast_preview_completion_have_distinct_destinations() {
-    let mut app = paged_fixture();
-    let before = evidence(&app);
-    let form = app.source_rename.form.as_ref().unwrap();
-    let invocation = form.invocation;
-    let approval = form.approval.as_ref().unwrap().id;
-    let mut mounted = Mounted::new(&app);
-
-    let first_visit = app.update(Message::SourceRename(Event::File(
-        invocation, approval, true,
-    )));
-    let next_page = app.update(Message::SourceRename(Event::Line(
-        invocation, approval, true,
-    )));
-    assert_eq!(mounted.execute(&app, next_page).await, 1);
-    let return_visit = app.update(Message::SourceRename(Event::Line(
-        invocation, approval, false,
-    )));
-    assert_eq!(mounted.execute(&app, return_visit).await, 1);
-    let offset = mounted.scroll_down(&app);
-    assert_eq!(mounted.execute(&app, first_visit).await, 1);
-    assert_eq!(
-        mounted.offset(&app),
-        offset,
-        "old visit to the identical page is stale"
-    );
-
-    let old_filter = app.update(Message::SourceRename(Event::Search(
-        invocation,
-        "uses".into(),
-    )));
-    let new_filter = app.update(Message::SourceRename(Event::Search(
-        invocation,
-        "us".into(),
-    )));
-    assert_eq!(mounted.execute(&app, new_filter).await, 1);
-    let offset = mounted.scroll_down(&app);
-    assert_eq!(mounted.execute(&app, old_filter).await, 1);
-    assert_eq!(
-        mounted.offset(&app),
-        offset,
-        "old filter on the same page is stale"
-    );
-
-    input(&mut app, "pump_new");
-    let job = start_preview(&mut app);
-    let completion = preview_completion(&app, job);
-    // No intermediate frame mounts the temporary no-approval view. The old
-    // Scrollable survives even though the new approval has a different id.
-    let ready = app.update(Message::SourceRenameReady(completion));
-    assert!(mounted.offset(&app) > 10.);
-    assert_eq!(mounted.execute(&app, ready).await, 1);
-    assert_eq!(mounted.offset(&app), 0.);
-    assert_eq!(evidence(&app), before);
-}
-
-#[tokio::test]
-async fn details_round_trip_retires_held_reset_without_changing_page_or_repeated_visibility_scroll()
-{
-    // Exercise both an actually mounted Details view and a fast round trip
-    // between frames, where Iced retains the same preview Scrollable state.
-    for mount_details in [true, false] {
-        let mut app = paged_fixture();
-        let before = evidence(&app);
-        let form = app.source_rename.form.as_ref().unwrap();
-        let invocation = form.invocation;
-        let approval = form.approval.as_ref().unwrap().id;
-        let mut mounted = Mounted::new(&app);
-        mounted.scroll_down(&app);
-        let held_reset = app.update(Message::SourceRename(Event::File(
-            invocation, approval, true,
-        )));
-        let old_preview = scroll_id(&app);
-        let form = app.source_rename.form.as_ref().unwrap();
-        let page = (form.file, form.hunk, form.line, form.segment);
-
-        let show_details = app.update(Message::SourceRename(Event::Details(invocation, true)));
-        assert_eq!(mounted.execute(&app, show_details).await, 0);
-        let details_visit = scroll_id(&app);
-        assert_ne!(details_visit, old_preview);
-        if mount_details {
-            let mut hidden = Geometry {
-                id: old_preview.clone(),
-                offset: None,
-            };
-            mounted.operate(&app, &mut hidden);
-            assert!(
-                hidden.offset.is_none(),
-                "Details actually replaced the preview"
-            );
-        }
-        let repeat_details = app.update(Message::SourceRename(Event::Details(invocation, true)));
-        assert_eq!(mounted.execute(&app, repeat_details).await, 0);
-        assert_eq!(
-            scroll_id(&app),
-            details_visit,
-            "unchanged visibility keeps its visit"
-        );
-
-        let show_preview = app.update(Message::SourceRename(Event::Details(invocation, false)));
-        assert_eq!(
-            mounted.execute(&app, show_preview).await,
-            0,
-            "returning does not force a scroll reset"
-        );
-        let returned_visit = scroll_id(&app);
-        assert_ne!(returned_visit, old_preview);
-        assert_ne!(returned_visit, details_visit);
-        let form = app.source_rename.form.as_ref().unwrap();
-        assert_eq!((form.file, form.hunk, form.line, form.segment), page);
-        assert_eq!(form.approval.as_ref().unwrap().id, approval);
-
-        let offset = mounted.scroll_down(&app);
-        let repeat_preview = app.update(Message::SourceRename(Event::Details(invocation, false)));
-        assert_eq!(mounted.execute(&app, repeat_preview).await, 0);
-        assert_eq!(scroll_id(&app), returned_visit);
-        assert_eq!(
-            mounted.offset(&app),
-            offset,
-            "repeated Preview preserves deliberate scroll"
-        );
-        assert_eq!(mounted.execute(&app, held_reset).await, 1);
-        assert_eq!(
-            mounted.offset(&app),
-            offset,
-            "the previous visit cannot reset the returned preview"
-        );
-        assert_eq!(evidence(&app), before);
-    }
-}

crates/oa-desktop/src/app/source_rename_layout_timing_tests.rs

@@ -1,313 +0,0 @@
-//! Manual replacement + next-layout/highlight evaluator; no GPU or native paint.
-//! Child of source_rename_timing_tests, preserving the separate real App test.
-use super::*;
-use crate::{highlight, views::source_tests::FontLayout};
-use iced::advanced::widget::operation::Focusable;
-use iced::advanced::{Layout, graphics, layout, renderer, text as shaped, widget::Tree};
-use iced::{
-    Background, Color, Element, Font, Length, Pixels, Point, Rectangle, Size, Transformation,
-};
-
-// The same real Paragraph and Editor as FontLayout. During draw, retain only a
-// Weak and fixed geometry; inspect glyphs after timing, never in fill_editor.
-#[derive(Default)]
-struct ObservedFontLayout {
-    drawn: Option<(graphics::text::editor::Weak, Point, Rectangle)>,
-}
-impl renderer::Renderer for ObservedFontLayout {
-    fn start_layer(&mut self, _: Rectangle) {}
-    fn end_layer(&mut self) {}
-    fn start_transformation(&mut self, _: Transformation) {}
-    fn end_transformation(&mut self) {}
-    fn reset(&mut self, _: Rectangle) {
-        self.drawn = None;
-    }
-    fn fill_quad(&mut self, _: renderer::Quad, _: impl Into<Background>) {}
-    fn allocate_image(
-        &mut self,
-        handle: &iced::advanced::image::Handle,
-        callback: impl FnOnce(Result<iced::advanced::image::Allocation, iced::advanced::image::Error>)
-        + Send
-        + 'static,
-    ) {
-        renderer::Renderer::allocate_image(&mut FontLayout, handle, callback);
-    }
-}
-impl shaped::Renderer for ObservedFontLayout {
-    type Font = Font;
-    type Paragraph = <FontLayout as shaped::Renderer>::Paragraph;
-    type Editor = <FontLayout as shaped::Renderer>::Editor;
-    const ICON_FONT: Font = <FontLayout as shaped::Renderer>::ICON_FONT;
-    const CHECKMARK_ICON: char = <FontLayout as shaped::Renderer>::CHECKMARK_ICON;
-    const ARROW_DOWN_ICON: char = <FontLayout as shaped::Renderer>::ARROW_DOWN_ICON;
-    const SCROLL_UP_ICON: char = <FontLayout as shaped::Renderer>::SCROLL_UP_ICON;
-    const SCROLL_DOWN_ICON: char = <FontLayout as shaped::Renderer>::SCROLL_DOWN_ICON;
-    const SCROLL_LEFT_ICON: char = <FontLayout as shaped::Renderer>::SCROLL_LEFT_ICON;
-    const SCROLL_RIGHT_ICON: char = <FontLayout as shaped::Renderer>::SCROLL_RIGHT_ICON;
-    const ICED_LOGO: char = <FontLayout as shaped::Renderer>::ICED_LOGO;
-    fn default_font(&self) -> Font {
-        shaped::Renderer::default_font(&FontLayout)
-    }
-    fn default_size(&self) -> Pixels {
-        shaped::Renderer::default_size(&FontLayout)
-    }
-    fn fill_paragraph(&mut self, _: &Self::Paragraph, _: Point, _: Color, _: Rectangle) {}
-    fn fill_editor(&mut self, editor: &Self::Editor, position: Point, _: Color, clip: Rectangle) {
-        self.drawn = Some((editor.downgrade(), position, clip));
-    }
-    fn fill_text(&mut self, _: shaped::Text, _: Point, _: Color, _: Rectangle) {}
-}
-
-type Content = text_editor::Content<ObservedFontLayout>;
-const HOST: Size = Size::new(640., 350.);
-
-fn view(editor: &Content, source: Arc<str>) -> Element<'_, (), iced::Theme, ObservedFontLayout> {
-    text_editor(editor)
-        .on_action(|_| ())
-        .font(Font::MONOSPACE)
-        .size(14)
-        .padding(16)
-        .height(Length::Fill)
-        .highlight_with::<highlight::ArcadiaHighlighter>(source, highlight::format)
-        .into()
-}
-
-fn check_text(editor: &Content, expected: &str, cursor: text_editor::Cursor) {
-    assert_eq!(editor.text(), expected);
-    assert_eq!(editor.cursor(), cursor);
-    let lines: Vec<_> = expected.split('\n').collect();
-    assert_eq!(editor.line_count(), lines.len());
-    for (index, part) in lines.iter().enumerate() {
-        let (text, ending) = if index + 1 == lines.len() {
-            (*part, text_editor::LineEnding::None)
-        } else if let Some(text) = part.strip_suffix('\r') {
-            (text, text_editor::LineEnding::CrLf)
-        } else {
-            (*part, text_editor::LineEnding::Lf)
-        };
-        let actual = editor.line(index).unwrap();
-        assert_eq!(actual.text, text);
-        assert_eq!(actual.ending, ending);
-    }
-}
-
-fn check_draw(renderer: &ObservedFontLayout, cursor: text_editor::Cursor, alias: &str) {
-    let (weak, position, clip) = renderer.drawn.as_ref().expect("real editor draw");
-    let editor = weak.upgrade().expect("drawn editor is still live");
-    let buffer = editor.buffer();
-    assert_eq!(weak.bounds, Size::new(608., 318.));
-    assert_eq!(buffer.size(), (Some(608.), Some(318.)));
-    assert_eq!(buffer.metrics().font_size, 14.);
-    assert_eq!(
-        buffer.scroll().horizontal,
-        0.,
-        "fixture origin fits the viewport"
-    );
-    let start = cursor.position;
-    let end = cursor.selection.expect("approved alias selection");
-    assert_eq!(start.line, end.line);
-    assert_eq!(end.column - start.column, alias.len());
-    let line = &buffer.lines[start.line];
-    assert_eq!(&line.text()[start.column..end.column], alias);
-    let color = graphics::text::to_color(Color::from_rgb8(20, 93, 139));
-    let font = graphics::text::to_attributes(Font::MONOSPACE);
-    for byte in start.column..end.column {
-        let attrs = line.attrs_list().get_span(byte);
-        assert_eq!(
-            attrs.color_opt,
-            Some(color),
-            "accepted alias syntax attributes"
-        );
-        assert_eq!(attrs.family, font.family);
-    }
-    let mut covered = vec![false; alias.len()];
-    for run in buffer.layout_runs().filter(|run| run.line_i == start.line) {
-        for glyph in run.glyphs {
-            let from = glyph.start.max(start.column);
-            let to = glyph.end.min(end.column);
-            if from >= to {
-                continue;
-            }
-            assert_eq!(glyph.color_opt, Some(color), "drawn alias glyph color");
-            let x = position.x + glyph.x + glyph.x_offset * glyph.font_size;
-            let y = position.y + run.line_top;
-            assert!(x >= clip.x - 0.5 && x + glyph.w <= clip.x + clip.width + 0.5);
-            assert!(y + run.line_height > clip.y && y < clip.y + clip.height);
-            covered[from - start.column..to - start.column].fill(true);
-        }
-    }
-    assert!(
-        covered.into_iter().all(|seen| seen),
-        "entire alias has visible shaped glyphs"
-    );
-    // This temporary strong upgrade is dropped before the next editor mutation.
-}
-
-#[derive(Clone, Copy)]
-enum Arm {
-    Constructor,
-    Reuse,
-}
-impl Arm {
-    fn name(self) -> &'static str {
-        match self {
-            Self::Constructor => "with_text",
-            Self::Reuse => "same_line_reuse",
-        }
-    }
-    fn phases(self) -> [&'static str; 4] {
-        match self {
-            Self::Constructor => [
-                "constructor_replace_origin",
-                "constructor_next_layout",
-                "constructor_highlight_draw",
-                "constructor_combined",
-            ],
-            Self::Reuse => [
-                "reuse_replace_origin",
-                "reuse_next_layout",
-                "reuse_highlight_draw",
-                "reuse_combined",
-            ],
-        }
-    }
-}
-
-fn trial(
-    fixture: &Fixture,
-    cursor: text_editor::Cursor,
-    arm: Arm,
-    trial: usize,
-    samples: &mut Samples,
-) {
-    let before = &fixture.bundle.files[ORIGIN];
-    let after = &fixture.expected_bundle.files[ORIGIN];
-    let mut editor = Content::with_text(before);
-    editor.move_to(fixture.cursor);
-    let mut renderer = ObservedFontLayout::default();
-    let theme = iced::Theme::Light;
-    let defaults = renderer::Style::default();
-    let viewport = Rectangle::with_size(HOST);
-    let limits = layout::Limits::new(Size::ZERO, HOST);
-    let mut tree = {
-        let mut widget = view(&editor, Arc::from(before.as_str()));
-        let mut tree = Tree::new(widget.as_widget());
-        let node = widget.as_widget_mut().layout(&mut tree, &renderer, &limits);
-        tree.state
-            .downcast_mut::<text_editor::State<highlight::ArcadiaHighlighter>>()
-            .focus();
-        widget.as_widget().draw(
-            &tree,
-            &mut renderer,
-            &theme,
-            &defaults,
-            Layout::new(&node),
-            iced::mouse::Cursor::Unavailable,
-            &viewport,
-        );
-        tree
-    };
-    check_text(&editor, before, fixture.cursor);
-    check_draw(&renderer, fixture.cursor, OLD);
-    // No recorder Weak/Strong from setup may perturb replacement ownership.
-    renderer.drawn = None;
-    let next_source: Arc<str> = Arc::from(after.as_str());
-
-    // Only normal operations and four timestamps occur between start and end.
-    // Source/model oracles, logging and recorder glyph inspection are outside.
-    let started = Instant::now();
-    let replaced = match arm {
-        Arm::Constructor => {
-            editor = Content::with_text(after);
-            true
-        }
-        Arm::Reuse => super::super::editor_patch::replace(&mut editor, before, after),
-    };
-    editor.move_to(cursor);
-    let replaced_at = Instant::now();
-    let mut widget = view(&editor, next_source);
-    let node = widget.as_widget_mut().layout(&mut tree, &renderer, &limits);
-    let laid_out_at = Instant::now();
-    widget.as_widget().draw(
-        &tree,
-        &mut renderer,
-        &theme,
-        &defaults,
-        Layout::new(&node),
-        iced::mouse::Cursor::Unavailable,
-        &viewport,
-    );
-    let drawn_at = Instant::now();
-    drop(widget);
-
-    assert!(replaced, "reuse must not silently time a fallback/refusal");
-    check_text(&editor, after, cursor);
-    check_draw(&renderer, cursor, NEW);
-    renderer.drawn = None;
-    for (phase, duration) in arm.phases().into_iter().zip([
-        replaced_at.duration_since(started),
-        laid_out_at.duration_since(replaced_at),
-        drawn_at.duration_since(laid_out_at),
-        drawn_at.duration_since(started),
-    ]) {
-        println!(
-            "{}",
-            serde_json::json!({
-                "record": "editor_layout_timing", "arm": arm.name(), "phase": phase,
-                "trial": trial, "warmup": trial == 0,
-                "elapsed_ns": duration.as_nanos().to_string(),
-                "elapsed_ms": duration.as_secs_f64() * 1000.0,
-            })
-        );
-        if trial != 0 {
-            samples.0.entry(phase).or_default().push(duration);
-        }
-    }
-}
-
-#[test]
-#[ignore = "manual Windows dev/debug editor replacement + layout/highlight trial; run alone with --ignored --nocapture --test-threads=1"]
-fn accepted_release1_constructor_vs_reuse_through_next_highlight() {
-    let fixture = Fixture::load();
-    // Resolve the exact production approval and verify full Project/source once,
-    // outside all intervals. The actual App Confirm evaluator remains separate.
-    let cursor = {
-        let app = fixture.app();
-        let target = resolve(&app, &app.rename_context());
-        let prepared = app
-            .document
-            .alias_rename_request(target.id, NEW.into())
-            .unwrap()
-            .prepare()
-            .unwrap();
-        fixture.check_candidate(&prepared);
-        prepare_approval(prepared, &target, ORIGIN).unwrap().cursor
-    };
-    println!(
-        "{}",
-        serde_json::json!({
-            "record": "editor_layout_fixture", "host_width": HOST.width, "host_height": HOST.height,
-            "font": "MONOSPACE", "font_size": 14, "padding": 16, "height": "Fill",
-            "active_file": ORIGIN, "before_bytes": fixture.bundle.files[ORIGIN].len(),
-            "after_bytes": fixture.expected_bundle.files[ORIGIN].len(), "warmups_per_arm": 1,
-            "measured_trials_per_arm": 5, "debug_assertions": cfg!(debug_assertions),
-            "scope": "real editor replacement, retained Tree layout and Widget draw/highlight; no GPU, native paint or App Confirm",
-        })
-    );
-    let mut samples = Samples::default();
-    for index in 0..=5 {
-        let arms = if index % 2 == 0 {
-            [Arm::Constructor, Arm::Reuse]
-        } else {
-            [Arm::Reuse, Arm::Constructor]
-        };
-        println!(
-            "{}",
-            serde_json::json!({"record": "editor_layout_order", "trial": index, "first": arms[0].name()})
-        );
-        for arm in arms {
-            trial(&fixture, cursor, arm, index, &mut samples);
-        }
-    }
-    samples.report();
-}

crates/oa-desktop/src/app/source_rename_timing_tests.rs

@@ -1,347 +0,0 @@
-//! Manual timing through the real Document and App paths. No disk writes,
-//! executor polling, layout, GPU work or first-paint measurement occurs here.
-//! Register as a test child of app::source_rename to use its actual worker helpers.
-use super::*;
-use crate::source_workspace::Workspace;
-use oa_core::source_project::SourceBundle;
-use std::{
-    collections::BTreeMap,
-    path::PathBuf,
-    time::{Duration, Instant},
-};
-
-#[cfg(debug_assertions)]
-#[path = "source_rename_layout_timing_tests.rs"]
-mod layout_timing_tests;
-
-const OLD: &str = "oa_restore_work";
-const NEW: &str = "oa_restore_pressure";
-const DECLARATIONS: &str = "oa/activities/activity_oa_restore_work.arcadia";
-const ORIGIN: &str = "traceability.arcadia";
-
-struct Fixture {
-    bundle: SourceBundle,
-    project: Project,
-    expected_bundle: SourceBundle,
-    expected_project: Project,
-    target: Id,
-    cursor: text_editor::Cursor,
-}
-
-impl Fixture {
-    fn load() -> Self {
-        // The optional entry selects a parent-pinned copy of this exact fixture,
-        // not an arbitrary performance generator or a mutable GUI destination.
-        let entry = std::env::var_os("ARCADIA_RENAME_TIMING_ENTRY")
-            .map(PathBuf::from)
-            .unwrap_or_else(|| {
-                PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-                    .join("../../examples/release1/project.arcadia")
-            });
-        let loaded = oa_core::source_files::load_project(&entry, LIMITS).unwrap();
-        let bundle = loaded.reachable_bundle();
-        assert_eq!(
-            bundle.files.len(),
-            30,
-            "use the preserved release1 walkthrough"
-        );
-        let document = Document::from_bundle(bundle.clone(), LIMITS).unwrap();
-        assert_eq!(
-            document.bundle(),
-            &bundle,
-            "fixture must need no stabilization/migration"
-        );
-        assert!(!document.dirty());
-        let project = document.project().clone();
-        let target = Id::parse_str("1b91f8a7-0bdb-514e-b1cd-955658e09927").unwrap();
-        assert_eq!(project.elements[&target].alias, OLD);
-        assert!(!project.identities().iter().any(|(_, alias)| *alias == NEW));
-        let mut expected_project = project.clone();
-        expected_project.elements.get_mut(&target).unwrap().alias = NEW.into();
-
-        // Independent literal source oracle, authored before running the rename.
-        // Do not replace the alias substring in filenames or the trace's alias.
-        let mut expected_bundle = bundle.clone();
-        let declarations = expected_bundle.files.get_mut(DECLARATIONS).unwrap();
-        assert_eq!(
-            declarations.matches("oa_activity oa_restore_work ").count(),
-            1
-        );
-        assert_eq!(declarations.matches("parent @oa_restore_work;").count(), 4);
-        *declarations = declarations
-            .replace(
-                "oa_activity oa_restore_work ",
-                "oa_activity oa_restore_pressure ",
-            )
-            .replace("parent @oa_restore_work;", "parent @oa_restore_pressure;");
-        let traces = expected_bundle.files.get_mut(ORIGIN).unwrap();
-        assert_eq!(traces.matches("oa @oa_restore_work;").count(), 1);
-        *traces = traces.replace("oa @oa_restore_work;", "oa @oa_restore_pressure;");
-        let source = &bundle.files[ORIGIN];
-        let start = source.rfind("@oa_restore_work;").unwrap() + 1;
-        let position = |offset| {
-            let prefix = &source[..offset];
-            text_editor::Position {
-                line: prefix.bytes().filter(|byte| *byte == b'\n').count(),
-                column: prefix
-                    .rsplit_once('\n')
-                    .map_or(prefix.len(), |(_, tail)| tail.len()),
-            }
-        };
-        let cursor = text_editor::Cursor {
-            position: position(start),
-            selection: Some(position(start + OLD.len())),
-        };
-        assert!(nav::exact_cursor(source, cursor));
-        println!(
-            "{}",
-            serde_json::json!({
-                "record": "fixture", "entry": entry, "reachable_files": bundle.files.len(),
-                "source_bytes": bundle.files.values().map(String::len).sum::<usize>(),
-                "identities": project.identities().len(), "active_file": ORIGIN,
-                "active_file_bytes": source.len(), "old": OLD, "new": NEW,
-                "warmups": 1, "measured_trials": 5, "debug_assertions": cfg!(debug_assertions),
-                "scope": "real worker helpers, guarded Document commit, App sync and Confirm update; no task polling or rendering"
-            })
-        );
-        Self {
-            bundle,
-            project,
-            expected_bundle,
-            expected_project,
-            target,
-            cursor,
-        }
-    }
-
-    fn app(&self) -> App {
-        let mut app = App::with_project(Project::empty());
-        app.document = Document::from_bundle(self.bundle.clone(), LIMITS).unwrap();
-        app.source_workspace = Workspace::new(app.document.bundle(), true);
-        app.source_workspace.active = ORIGIN.into();
-        app.selected = app.project().id;
-        app.page = Page::Text;
-        app.sync();
-        app.source_editor.move_to(self.cursor);
-        assert_eq!(app.project(), &self.project);
-        assert_eq!(app.document.bundle(), &self.bundle);
-        assert_eq!(app.document.revision(), 0);
-        assert!(!app.document.dirty() && !app.document.can_undo() && !app.document.can_redo());
-        assert!(app.rename_admission().is_ok());
-        app
-    }
-
-    fn check_candidate(&self, prepared: &PreparedAliasRename) {
-        assert!(prepared.changed());
-        assert_eq!(prepared.before().bundle, self.bundle);
-        assert_eq!(prepared.before().decoded.project, self.project);
-        assert_eq!(prepared.after().bundle, self.expected_bundle);
-        assert_eq!(prepared.after().decoded.project, self.expected_project);
-    }
-
-    fn check_adopted(&self, app: &mut App, candidate_address: *const CompiledSourceProject) {
-        assert!(
-            std::ptr::eq(app.document.compiled(), candidate_address),
-            "adopt exact candidate allocation"
-        );
-        assert_eq!(app.project(), &self.expected_project);
-        assert_eq!(app.document.bundle(), &self.expected_bundle);
-        assert_eq!(app.source_workspace.bundle(), self.expected_bundle);
-        assert_eq!(app.source_editor.text(), self.expected_bundle.files[ORIGIN]);
-        assert_eq!(app.document.revision(), 1);
-        assert!(app.document.dirty() && app.document.can_undo() && !app.document.can_redo());
-        assert!(app.document.undo());
-        assert_eq!(app.project(), &self.project);
-        assert_eq!(app.document.bundle(), &self.bundle);
-        assert!(
-            !app.document.dirty(),
-            "live known saved baseline remains authoritative"
-        );
-        assert!(
-            !app.document.can_undo(),
-            "exactly one preceding model transaction"
-        );
-        assert!(app.document.redo());
-        assert_eq!(app.project(), &self.expected_project);
-        assert_eq!(app.document.bundle(), &self.expected_bundle);
-        assert!(std::ptr::eq(app.document.compiled(), candidate_address));
-    }
-}
-
-#[derive(Default)]
-struct Samples(BTreeMap<&'static str, Vec<Duration>>);
-
-impl Samples {
-    fn time<T>(&mut self, phase: &'static str, trial: usize, action: impl FnOnce() -> T) -> T {
-        let started = Instant::now();
-        let result = action();
-        let elapsed = started.elapsed();
-        // Printing, assertions and dropping the returned value are outside this
-        // interval. Full Confirm still includes production's own local drops.
-        println!(
-            "{}",
-            serde_json::json!({
-                "record": "timing", "phase": phase, "trial": trial,
-                "warmup": trial == 0, "elapsed_ns": elapsed.as_nanos().to_string(),
-                "elapsed_ms": elapsed.as_secs_f64() * 1000.0
-            })
-        );
-        if trial != 0 {
-            self.0.entry(phase).or_default().push(elapsed);
-        }
-        result
-    }
-
-    fn report(mut self) {
-        for (phase, values) in &mut self.0 {
-            assert_eq!(values.len(), 5);
-            values.sort();
-            println!(
-                "{}",
-                serde_json::json!({
-                    "record": "summary", "phase": phase, "samples": values.len(),
-                    "min_ms": values[0].as_secs_f64() * 1000.0,
-                    "median_ms": values[2].as_secs_f64() * 1000.0,
-                    "max_ms": values[4].as_secs_f64() * 1000.0
-                })
-            );
-        }
-    }
-}
-
-fn resolve(app: &App, context: &Context) -> Target {
-    let snapshot = app
-        .with_source_input(|input| query::admit_owned(input, query::Limits::default()))
-        .unwrap()
-        .capture()
-        .unwrap();
-    let offset = nav::cursor_offset(app.source_workspace.text(), context.begin.cursor).unwrap();
-    resolve_target(&snapshot, context, offset).unwrap()
-}
-
-fn active_job(app: &App) -> Job {
-    let form = app.source_rename.form.as_ref().unwrap();
-    let id = form.pending.unwrap();
-    assert_eq!(app.source_rename.in_flight, Some(id));
-    Job {
-        id,
-        invocation: form.invocation,
-        generation: form.generation,
-        context: form.context.clone(),
-    }
-}
-
-fn separate_phases(fixture: &Fixture, samples: &mut Samples, trial: usize) {
-    let mut app = fixture.app();
-    let target = resolve(&app, &app.rename_context());
-    assert_eq!(target.id, fixture.target);
-    let request = samples
-        .time("document_request_mint", trial, || {
-            app.document.alias_rename_request(target.id, NEW.into())
-        })
-        .unwrap();
-    let prepared = samples
-        .time("worker_document_prepare", trial, || request.prepare())
-        .unwrap();
-    fixture.check_candidate(&prepared);
-    let approval = samples
-        .time("worker_preview_and_origin", trial, || {
-            prepare_approval(prepared, &target, ORIGIN)
-        })
-        .unwrap();
-    assert_eq!(approval.preview.files().len(), 2);
-    assert_eq!(approval.preview.changed_line_count(), 6);
-    let candidate_address = approval.prepared.after() as *const CompiledSourceProject;
-    // Same-destination save completion is a legitimate live update after Preview.
-    app.document.mark_saved(app.document.snapshot());
-    let changed = samples
-        .time("document_guarded_commit", trial, || {
-            app.document.commit_alias_rename(&approval.prepared)
-        })
-        .unwrap();
-    assert!(changed);
-    samples.time("app_sync", trial, || app.sync());
-    fixture.check_adopted(&mut app, candidate_address);
-}
-
-fn whole_confirm(fixture: &Fixture, samples: &mut Samples, trial: usize) {
-    let mut app = fixture.app();
-    let begin = app.source_rename_message();
-    // These Tasks are deliberately not polled: deterministic worker helpers
-    // supply the same results through the real readiness messages below.
-    drop(app.update(begin));
-    let target_job = active_job(&app);
-    let target = Arc::new(resolve(&app, &target_job.context));
-    assert_eq!(target.id, fixture.target);
-    drop(app.update(Message::SourceRenameReady(Completion {
-        job: target_job,
-        payload: Payload::Target(Ok(target.clone())),
-    })));
-    let invocation = app.source_rename.form.as_ref().unwrap().invocation;
-    drop(app.update(Message::SourceRename(Event::Input(invocation, NEW.into()))));
-    let generation = app.source_rename.form.as_ref().unwrap().generation;
-    drop(app.update(Message::SourceRename(Event::Preview(
-        invocation, generation,
-    ))));
-    let preview_job = active_job(&app);
-    let prepared = app
-        .document
-        .alias_rename_request(target.id, NEW.into())
-        .unwrap()
-        .prepare()
-        .unwrap();
-    fixture.check_candidate(&prepared);
-    let approval = Arc::new(prepare_approval(prepared, &target, ORIGIN).unwrap());
-    drop(target);
-    let candidate_address = approval.prepared.after() as *const CompiledSourceProject;
-    let expected_cursor = approval.cursor;
-    let approval_id = approval.id;
-    drop(app.update(Message::SourceRenameReady(Completion {
-        job: preview_job,
-        payload: Payload::Preview(Ok(approval)),
-    })));
-    assert_eq!(
-        app.source_rename
-            .form
-            .as_ref()
-            .unwrap()
-            .approval
-            .as_ref()
-            .unwrap()
-            .id,
-        approval_id
-    );
-    app.document.mark_saved(app.document.snapshot());
-    let confirm = Message::SourceRename(Event::Confirm(invocation, generation, approval_id));
-    let task = samples.time("app_confirm_update", trial, || app.update(confirm));
-    samples.time("confirm_returned_task_drop_without_polling", trial, || {
-        drop(task)
-    });
-    assert!(!app.source_rename.open());
-    assert!(app.source_rename.in_flight.is_none());
-    assert!(app.source_rename_undo_message().is_some());
-    assert_eq!(app.source_editor.cursor(), expected_cursor);
-    fixture.check_adopted(&mut app, candidate_address);
-}
-
-#[test]
-#[ignore = "manual Windows dev/debug rename latency trial; run alone with --ignored --nocapture --test-threads=1"]
-fn accepted_release1_prepare_commit_sync_and_confirm_timing() {
-    let fixture = Fixture::load();
-    let mut samples = Samples::default();
-    for trial in 0..=5 {
-        println!(
-            "{}",
-            serde_json::json!({ "record": "order", "trial": trial,
-            "warmup": trial == 0, "separate_phases_first": trial % 2 == 0 })
-        );
-        if trial % 2 == 0 {
-            separate_phases(&fixture, &mut samples, trial);
-            whole_confirm(&fixture, &mut samples, trial);
-        } else {
-            whole_confirm(&fixture, &mut samples, trial);
-            separate_phases(&fixture, &mut samples, trial);
-        }
-    }
-    samples.report();
-}

crates/oa-desktop/src/app/source_symbols.rs

@@ -52,7 +52,7 @@ impl App {
         }
     }
 
-    pub(super) fn with_source_input<T>(&self, use_input: impl FnOnce(query::Input<'_>) -> T) -> T {
+    fn with_source_input<T>(&self, use_input: impl FnOnce(query::Input<'_>) -> T) -> T {
         let files: Vec<_> = self
             .source_workspace
             .files
@@ -83,14 +83,13 @@ impl App {
         })
     }
 
-    pub(super) fn source_snapshot_matches(&self, snapshot: &query::Snapshot) -> bool {
+    fn source_snapshot_matches(&self, snapshot: &query::Snapshot) -> bool {
         snapshot.key() == self.source_key()
             && self.with_source_input(|input| snapshot.matches(input))
     }
 
     pub fn source_navigation_available(&self) -> bool {
         self.page == Page::Text
-            && !self.source_rename.open()
             && !self.busy
             && self.pending.is_none()
             && self.file_prompt.is_none()

crates/oa-desktop/src/app/state_diagram.rs

@@ -24,7 +24,6 @@ impl App {
         if self.behavior.has_pending() {
             return;
         }
-        self.behavior.scenario.forget_view();
         self.layer = layer;
         self.page = Page::Behavior;
         self.behavior.active_owner = Some(machine);

crates/oa-desktop/src/app/transition_context_tests.rs

@@ -49,28 +49,11 @@ fn fixture(layer: Layer, kind: Kind) -> (App, Id, Id, Id) {
     p.diagrams.get_mut(&view).unwrap().name = "Unrelated architecture".into();
     p.place(view, reused, Position { x: 873., y: 421. });
     let mut app = App::with_project(p);
-    let accepted = app.document.snapshot();
-    // Enter through the actual navigation path: assigning Page/owner alone does
-    // not create the representation and live visit required by canvas events.
-    send(&mut app, Message::Select(root));
-    send(&mut app, Message::Page(Page::Behavior));
-    assert_eq!(app.layer, layer);
-    assert_eq!(app.page, Page::Behavior);
-    assert_eq!(app.selected, root);
-    assert_eq!(app.behavior.active_owner, Some(root));
-    if kind == Kind::Scenario {
-        let context = app.scenario_context().unwrap();
-        assert_eq!(context.document, app.canvas_document);
-        assert_eq!(context.scenario, root);
-        assert_eq!(
-            context.representation,
-            crate::behavior::scenario_layout::Representation::Derived { owner: root }
-        );
-        assert!(!context.visit.is_nil());
-    }
-    assert!(Arc::ptr_eq(&accepted, &app.document.snapshot()));
-    assert_eq!(app.source_workspace.bundle(), accepted.bundle);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
+    app.layer = layer;
+    app.page = Page::Behavior;
+    app.selected = root;
+    app.behavior.active_owner = Some(root);
+    app.refresh_draft();
     (app, root, work, reused)
 }
 

crates/oa-desktop/src/behavior/canvas_workspace.rs

@@ -50,7 +50,7 @@ pub fn controls<'a>(
             tooltip::Position::Bottom),
         control("Fit", "Fit", Some(zoom(None))),
         control("ZoomOut", "−", Some(zoom(Some(scale / 1.25)))),
-        text(zoom_label(scale)).size(12),
+        text(format!("{:.0}%", scale * 100.)).size(12),
         control("ZoomIn", "+", Some(zoom(Some(scale * 1.25)))),
         control("ActualSize", "100%", Some(zoom(Some(1.)))),
     ].spacing(4).align_y(iced::Center).into()
@@ -58,7 +58,6 @@ pub fn controls<'a>(
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct Scope {
-    pub(crate) scenario_view: Option<(super::scenario_layout::Representation, Id)>,
     pub document: Id,
     pub owner: Id,
     pub revision: u64,
@@ -70,7 +69,6 @@ impl Scope {
             Some(Self {
                 document: context.document,
                 owner: context.scenario,
-                scenario_view: Some((context.representation, context.visit)),
                 revision: context.revision,
                 epoch: app.camera_epoch,
             })
@@ -79,7 +77,6 @@ impl Scope {
             Some(Self {
                 document: context.document,
                 owner: context.owner,
-                scenario_view: None,
                 revision: context.revision,
                 epoch: app.camera_epoch,
             })
@@ -99,8 +96,8 @@ impl Scope {
 
     pub fn control_id(self, name: &str) -> iced::advanced::widget::Id {
         iced::advanced::widget::Id::from(format!(
-            "behavior-control:{}:{}:{}:{:?}:{name}",
-            self.document, self.owner, self.revision, self.scenario_view
+            "behavior-control:{}:{}:{}:{name}",
+            self.document, self.owner, self.revision
         ))
     }
 }
@@ -134,20 +131,6 @@ pub enum Event {
 pub use focus::{focus_task, root as focus_root};
 /// Fold relative input in event order. The base scale is used only on leaving Fit.
 pub fn change(pan: &mut Vector, zoom: &mut Option<f32>, fit: &mut bool, event: Event) -> bool {
-    change_with_minimum(pan, zoom, fit, event, 0.05)
-}
-
-/// Scenario extents can require scales below the topology canvas's 5% floor.
-pub(super) fn change_with_minimum(
-    pan: &mut Vector,
-    zoom: &mut Option<f32>,
-    fit: &mut bool,
-    event: Event,
-    minimum: f32,
-) -> bool {
-    if !minimum.is_finite() || minimum <= 0. || minimum > 3. {
-        return false;
-    }
     match event {
         Event::Pan(delta) if delta.x.is_finite() && delta.y.is_finite() => {
             let next = *pan + delta;
@@ -167,10 +150,7 @@ pub(super) fn change_with_minimum(
                 && at.y.is_finite() =>
         {
             let old = if *fit { base } else { zoom.unwrap_or(base) };
-            if !old.is_finite() || old <= 0. {
-                return false;
-            }
-            let next = (old * factor).clamp(minimum, 3.);
+            let next = (old * factor).clamp(0.05, 3.);
             if old == next {
                 return false;
             }
@@ -188,51 +168,6 @@ pub(super) fn change_with_minimum(
     }
 }
 
-fn zoom_label(scale: f32) -> String {
-    let percent = f64::from(scale) * 100.;
-    if !percent.is_finite() || percent <= 0. {
-        return "—".into();
-    }
-    if percent >= 1. {
-        format!("{percent:.0}%")
-    } else if percent >= 0.01 {
-        format!("{percent:.3}%")
-    } else {
-        format!("{percent:.2e}%")
-    }
-}
-
-#[cfg(test)]
-mod camera_policy_tests {
-    use super::*;
-
-    #[test]
-    fn topology_retains_five_percent_floor() {
-        let (mut pan, mut zoom, mut fit) = (Vector::ZERO, Some(0.06), false);
-        assert!(change(
-            &mut pan,
-            &mut zoom,
-            &mut fit,
-            Event::Zoom {
-                factor: 0.1,
-                at: Point::ORIGIN,
-                base: 0.06,
-            }
-        ));
-        assert_eq!(zoom, Some(0.05));
-    }
-
-    #[test]
-    fn tiny_zoom_label_is_nonzero_and_changes_with_zoom() {
-        assert_eq!(zoom_label(1.), "100%");
-        assert_eq!(zoom_label(0.05), "5%");
-        assert_eq!(zoom_label(0.00034193), "0.034%");
-        assert_eq!(zoom_label(0.00034193 * 1.25), "0.043%");
-        assert_eq!(zoom_label(1e-7), "1.00e-5%");
-        assert_ne!(zoom_label(f32::from_bits(1)), "0%");
-    }
-}
-
 /// Constant-width labelled palette. Arming a tool never reallocates the canvas.
 pub fn palette<'a>(
     scope: Scope,

crates/oa-desktop/src/behavior/canvas_workspace/tests.rs

@@ -368,7 +368,6 @@ fn relative_camera_zoom_keeps_the_cursor_world_point_and_rejects_nonfinite_input
 fn viewport_ordered_batch_uses_each_event_position_and_cancels_before_camera_motion() {
     use iced::widget::Space;
     let scope = Scope {
-        scenario_view: None,
         document: Id::new_v4(),
         owner: Id::new_v4(),
         revision: 2,
@@ -428,7 +427,6 @@ pub(crate) fn scope(app: &App) -> Scope {
         Scope {
             document: context.document,
             owner: context.scenario,
-            scenario_view: Some((context.representation, context.visit)),
             revision: context.revision,
             epoch: app.camera_epoch,
         }
@@ -437,7 +435,6 @@ pub(crate) fn scope(app: &App) -> Scope {
         Scope {
             document: context.document,
             owner: context.owner,
-            scenario_view: None,
             revision: context.revision,
             epoch: app.camera_epoch,
         }

crates/oa-desktop/src/behavior/contextual_source_tests.rs

@@ -893,14 +893,11 @@ fn contextual_source_empty_palette_lifeline_cannot_open_a_previous_owner_or_laye
         .add_element(Kind::Scenario, Layer::Oa, "Second scenario", None)
         .unwrap();
     let mut app = App::with_project(p.clone());
-    // Capture the context created by actual navigation, including its visit.
-    // Merely assigning active_owner/selected does not mount a Scenario anymore.
-    let _ = app.update(Message::Select(a));
-    let _ = app.update(Message::Page(Page::Behavior));
+    app.page = Page::Behavior;
+    app.layer = Layer::Oa;
+    app.behavior.active_owner = Some(a);
+    app.selected = a;
     let context = app.scenario_context().unwrap();
-    assert_eq!(context.scenario, a);
-    assert!(!context.visit.is_nil());
-    let snapshot = app.document.snapshot();
     let source = app.document.bundle().clone();
     let begin = |context| scenario::CanvasEvent::BeginOccurrence {
         context,
@@ -911,40 +908,23 @@ fn contextual_source_empty_palette_lifeline_cannot_open_a_previous_owner_or_laye
         },
         lifeline: None,
     };
-    let _ = app.update(Message::Select(b));
-    let second = app.scenario_context().unwrap();
-    assert_eq!(second.scenario, b);
-    assert_ne!(second.visit, context.visit);
+    app.behavior.active_owner = Some(b);
+    app.selected = b;
     let _ = app.update(Message::ScenarioCanvas(begin(context)));
     assert!(!app.behavior.has_pending());
     assert_eq!(app.project(), &p);
-
-    let _ = app.update(Message::Select(a));
-    let before_layer_change = app.scenario_context().unwrap();
-    assert_eq!(before_layer_change.scenario, a);
-    assert_ne!(before_layer_change.visit, context.visit);
-    let _ = app.update(Message::Layer(Layer::Sa));
-    assert_eq!(app.layer, Layer::Sa);
-    assert!(app.scenario_context().is_none());
-    let _ = app.update(Message::ScenarioCanvas(begin(before_layer_change)));
+    app.behavior.active_owner = Some(a);
+    app.selected = a;
+    app.layer = Layer::Sa;
+    let _ = app.update(Message::ScenarioCanvas(begin(context)));
     assert!(!app.behavior.has_pending());
-
-    let _ = app.update(Message::Layer(Layer::Oa));
-    let _ = app.update(Message::Select(a));
+    app.layer = Layer::Oa;
     let current = app.scenario_context().unwrap();
-    assert_eq!(current.scenario, a);
-    assert_ne!(current.visit, before_layer_change.visit);
-    // Returning to the same owner/layer must not revive either retired packet.
-    for retired in [context, before_layer_change] {
-        let _ = app.update(Message::ScenarioCanvas(begin(retired)));
-        assert!(!app.behavior.has_pending());
-    }
-    assert!(std::sync::Arc::ptr_eq(&snapshot, &app.document.snapshot()));
     let _ = app.update(Message::ScenarioCanvas(begin(current)));
     assert_eq!(app.behavior.pending_owner(), Some(a));
     assert_eq!(app.project(), &p);
     assert_eq!(app.document.bundle(), &source);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
+    assert!(!app.document.can_undo());
 }
 
 #[test]

crates/oa-desktop/src/behavior/scenario.rs

@@ -4,28 +4,12 @@ use super::topology::{occurrence, unique_batch};
 use super::*;
 use iced::widget::{Column, column, text_input};
 use std::{cell::RefCell, collections::BTreeSet};
-mod camera;
 pub(crate) mod focus;
-pub(crate) mod spacing;
-use super::scenario_layout::{
-    Representation,
-    presentation::{self, ScenarioPresentation},
-};
-#[cfg(test)]
-mod presentation_tests;
 mod usage;
 mod workspace;
 pub(crate) use workspace::NAME_INPUT;
 pub use workspace::{Shelf, view};
 
-// A picker may select the Saved diagram record itself. Another view of the
-// same Scenario is not the property target of this displayed representation.
-pub(crate) fn properties_target(p: &Project, context: Context, id: Id) -> bool {
-    super::selected_behavior(p, id) == Some(context.scenario)
-        || matches!(context.representation, Representation::Saved { diagram } if diagram == id)
-            && presentation::checked_owner(p, context.representation) == Some(context.scenario)
-}
-
 #[cfg(test)]
 #[path = "scenario_operation_tests.rs"]
 mod operation_tests;
@@ -87,8 +71,6 @@ impl std::fmt::Display for MessageStyle {
 pub struct Context {
     pub document: Id,
     pub scenario: Id,
-    pub representation: Representation,
-    pub visit: Id,
     pub revision: u64,
     pub epoch: u64,
 }
@@ -115,7 +97,6 @@ impl std::fmt::Display for CanvasTool {
 }
 #[derive(Debug, Clone)]
 pub enum CanvasEvent {
-    Spacing(spacing::Event),
     Scrolled(Context, ScrollArea, iced::Vector),
     Restored(Context, Id, ScrollArea, iced::Vector),
     Viewport(Context, Size),
@@ -124,11 +105,9 @@ pub enum CanvasEvent {
     Camera(Context, u64, super::canvas_workspace::Event),
     Focus(Context),
     Shelf(Context, Shelf),
-    Properties(Context, Id),
     OpenUse(Context, Id),
     Back(Context),
     Choose(Context, CanvasTool),
-    Representation(Context, Representation),
     Select(Context, Id),
     Begin {
         context: Context,
@@ -157,7 +136,6 @@ pub enum ScrollArea {
 impl CanvasEvent {
     pub fn context(&self) -> Context {
         match self {
-            Self::Spacing(event) => event.stamp().context,
             Self::Scrolled(context, _, _)
             | Self::Restored(context, ..)
             | Self::Viewport(context, _)
@@ -166,11 +144,9 @@ impl CanvasEvent {
             | Self::Camera(context, ..)
             | Self::Focus(context)
             | Self::Shelf(context, _)
-            | Self::Properties(context, _)
             | Self::OpenUse(context, _)
             | Self::Back(context)
             | Self::Choose(context, _)
-            | Self::Representation(context, _)
             | Self::Select(context, _)
             | Self::Begin { context, .. }
             | Self::BeginOccurrence { context, .. }
@@ -227,7 +203,6 @@ pub enum ValueSection {
 const VALUE_PAGE_SIZE: usize = 24;
 #[derive(Default)]
 pub struct State {
-    spacing: Option<spacing::controller::Session>,
     draft: Option<Draft>,
     form_session: Id,
     form_mount: Id,
@@ -243,7 +218,6 @@ const CALLER_LIMIT: usize = 32;
 pub(crate) struct Caller {
     document: Id,
     pub owner: Id,
-    pub representation: Representation,
     pub occurrence: Id,
     target: Id,
     tool: CanvasTool,
@@ -253,8 +227,6 @@ pub(crate) struct Caller {
 struct DetailsRestore {
     document: Id,
     owner: Id,
-    representation: Representation,
-    visit: Id,
     token: Id,
     offset: iced::Vector,
 }
@@ -262,8 +234,6 @@ struct DetailsRestore {
 pub(super) struct ScrollRestore {
     pub document: Id,
     pub owner: Id,
-    pub representation: Representation,
-    pub visit: Id,
     pub token: Id,
     pub offset: iced::Vector,
 }
@@ -357,149 +327,42 @@ impl State {
     }
 
     pub(crate) fn enter(&mut self, document: Id, owner: Id) {
-        self.enter_representation(document, owner, Representation::Derived { owner });
-    }
-    /// App validates requested identity with checked_owner before entering.
-    pub(crate) fn enter_representation(
-        &mut self,
-        document: Id,
-        owner: Id,
-        representation: Representation,
-    ) -> bool {
-        if matches!(representation, Representation::Derived { owner: requested } if requested != owner)
-        {
-            return false;
-        }
-        let changed = self.presentation.identity != Some((document, owner))
-            || self.presentation.representation != Some(representation);
-        if changed {
+        if self.presentation.identity != Some((document, owner)) {
             self.presentation = workspace::Presentation {
                 identity: Some((document, owner)),
-                representation: Some(representation),
                 focused: self.presentation.focused,
-                fit: matches!(representation, Representation::Saved { .. }),
                 ..Default::default()
             };
             self.details_offset = iced::Vector::ZERO;
-            self.canvas_tool = Some((owner, CanvasTool::Select));
-        }
-        if changed || self.presentation.visit.is_nil() {
-            self.spacing = None;
-            self.presentation.visit = Id::new_v4();
             self.restore = None;
-            return true;
         }
-        false
-    }
-    /// Suspend captured events while preserving this destination's camera state.
-    pub(crate) fn leave(&mut self) {
-        self.spacing = None;
-        self.presentation.visit = Id::nil();
-        self.restore = None;
-    }
-    pub(crate) fn forget_view(&mut self) {
-        self.spacing = None;
-        self.presentation.identity = None;
-        self.presentation.representation = None;
-        self.presentation.visit = Id::nil();
-        self.restore = None;
-    }
-    pub(crate) fn representation(&self) -> Option<Representation> {
-        self.presentation.representation
-    }
-    pub(crate) fn owner(&self) -> Option<Id> {
-        self.presentation.identity.map(|(_, owner)| owner)
-    }
-    pub(crate) fn context(
-        &self,
-        document: Id,
-        owner: Id,
-        revision: u64,
-        epoch: u64,
-    ) -> Option<Context> {
-        if self.presentation.identity != Some((document, owner)) || self.presentation.visit.is_nil()
-        {
-            return None;
-        }
-        Some(Context {
-            document,
-            scenario: owner,
-            representation: self.representation()?,
-            visit: self.presentation.visit,
-            revision,
-            epoch,
-        })
-    }
-    pub(crate) fn display(
-        &self,
-        p: &Project,
-        owner: Id,
-        selected: Id,
-    ) -> Option<ScenarioPresentation> {
-        let (_, current_owner) = self.presentation.identity?;
-        let representation = self.representation()?;
-        (current_owner == owner).then(|| presentation::present(p, representation, selected))
-    }
-    pub(crate) fn coordinate_input(&self, p: &Project, context: Context) -> bool {
-        self.context(
-            context.document,
-            context.scenario,
-            context.revision,
-            context.epoch,
-        ) == Some(context)
-            && self
-                .display(p, context.scenario, context.scenario)
-                .is_some_and(|shown| shown.capabilities().coordinate_input)
     }
     pub(crate) fn viewport(&mut self, size: Size) -> bool {
         self.presentation.viewport(size)
     }
-    pub(crate) fn camera(
-        &mut self,
-        project: &Project,
-        owner: Id,
-        event: super::canvas_workspace::Event,
-    ) -> bool {
-        let Some(bounds) = self
-            .display(project, owner, owner)
-            .and_then(|shown| shown.bounds())
-        else {
-            return false;
-        };
+    pub(crate) fn camera(&mut self, event: super::canvas_workspace::Event) -> bool {
         let p = &mut self.presentation;
-        camera::change(
-            &mut p.pan,
-            &mut p.zoom,
-            &mut p.fit,
-            p.viewport,
-            bounds,
-            event,
-        )
+        super::canvas_workspace::change(&mut p.pan, &mut p.zoom, &mut p.fit, event)
     }
     pub(crate) fn zoom(&mut self, scale: Option<f32>) -> bool {
         self.presentation.zoom(scale)
     }
     pub(crate) fn camera_zoom(&mut self, p: &Project, owner: Id, zoom: Option<f32>) -> bool {
-        let Some(bounds) = self
-            .display(p, owner, owner)
-            .and_then(|shown| shown.bounds())
-        else {
-            return false;
-        };
+        let size = Scene::sequence(p, owner, owner).size;
+        let old = self.presentation.scale(size);
         if let Some(next) = zoom {
-            let current = self.presentation.camera(bounds);
             let viewport = self.presentation.viewport.unwrap_or(Size::new(500., 300.));
-            self.camera(
-                p,
-                owner,
-                super::canvas_workspace::Event::Zoom {
-                    factor: next / current.scale,
-                    at: Point::new(viewport.width / 2., viewport.height / 2.),
-                    base: current.scale,
-                },
-            )
+            self.camera(super::canvas_workspace::Event::Zoom {
+                factor: next / old,
+                at: Point::new(viewport.width / 2., viewport.height / 2.),
+                base: old,
+            })
         } else {
-            self.zoom(None)
+            self.zoom(None);
+            let fitted = self.presentation.scale(size);
+            self.zoom(Some(fitted));
+            self.presentation.pan = iced::Vector::ZERO;
+            true
         }
     }
     pub(crate) fn focused(&self) -> bool {
@@ -511,12 +374,6 @@ impl State {
     pub(crate) fn toggle_shelf(&mut self, shelf: Shelf) {
         self.presentation.shelf = (self.presentation.shelf != Some(shelf)).then_some(shelf);
     }
-    pub(crate) fn show_properties(&mut self) {
-        // Properties belong to the inspector. Restore that panel and dismiss
-        // the competing outline without replacing this view or its camera.
-        self.presentation.focused = false;
-        self.presentation.shelf = None;
-    }
     pub(crate) fn open_use(
         &mut self,
         p: &Project,
@@ -533,7 +390,6 @@ impl State {
         self.return_to.push(Caller {
             document: context.document,
             owner: context.scenario,
-            representation: context.representation,
             occurrence,
             target,
             tool: self.canvas_tool(context.scenario),
@@ -548,7 +404,6 @@ impl State {
     fn valid_caller(p: &Project, context: Context, frame: &Caller) -> bool {
         frame.document == context.document
             && frame.target == context.scenario
-            && presentation::checked_owner(p, frame.representation) == Some(frame.owner)
             && referenced_scenario(p, frame.owner, frame.occurrence) == Some(frame.target)
     }
     pub(super) fn can_back(&self, p: &Project, context: Context) -> bool {
@@ -565,23 +420,16 @@ impl State {
         None
     }
     pub(crate) fn restore_caller(&mut self, context: Context, frame: Caller) {
-        if context.document != frame.document
-            || context.scenario != frame.owner
-            || context.representation != frame.representation
-        {
+        if context.document != frame.document || context.scenario != frame.owner {
             return;
         }
         self.canvas_tool = Some((frame.owner, frame.tool));
         self.details_offset = frame.details_offset;
         self.presentation = frame.presentation;
         self.presentation.identity = Some((context.document, context.scenario));
-        self.presentation.representation = Some(frame.representation);
-        self.presentation.visit = context.visit;
         self.restore = Some(DetailsRestore {
             document: context.document,
             owner: frame.owner,
-            representation: frame.representation,
-            visit: context.visit,
             token: Id::new_v4(),
             offset: frame.details_offset,
         });
@@ -591,17 +439,13 @@ impl State {
         context: Context,
         ScrollArea::Page: ScrollArea,
     ) -> Option<ScrollRestore> {
-        let restore = self.restore.as_ref().filter(|r| {
-            r.document == context.document
-                && r.owner == context.scenario
-                && r.representation == context.representation
-                && r.visit == context.visit
-        })?;
+        let restore = self
+            .restore
+            .as_ref()
+            .filter(|r| r.document == context.document && r.owner == context.scenario)?;
         Some(ScrollRestore {
             document: restore.document,
             owner: restore.owner,
-            representation: restore.representation,
-            visit: restore.visit,
             token: restore.token,
             offset: restore.offset,
         })
@@ -614,11 +458,7 @@ impl State {
         offset: iced::Vector,
     ) -> bool {
         if !self.restore.as_ref().is_some_and(|r| {
-            r.document == context.document
-                && r.owner == context.scenario
-                && r.representation == context.representation
-                && r.visit == context.visit
-                && r.token == token
+            r.document == context.document && r.owner == context.scenario && r.token == token
         }) {
             return false;
         }
@@ -2091,8 +1931,6 @@ pub(crate) mod direct_tests {
         Context {
             document: Id::new_v4(),
             scenario: owner,
-            representation: Representation::Derived { owner },
-            visit: Id::new_v4(),
             revision: 0,
             epoch: 0,
         }
@@ -3396,24 +3234,12 @@ mod tests {
                 .iter()
                 .any(|l| l.id == steps[1] && l.dashed && l.label.contains("reply"))
         );
-        assert_eq!(
-            scene.activations,
-            vec![super::super::scenario_activation::Segment {
-                call: steps[0],
-                receiver,
-                scope: owner,
-                rect: Rectangle::new(
-                    Point::new(scene.lanes[&receiver] - 6., 148.),
-                    Size::new(12., 92.),
-                ),
-                column: 0,
-                finish: super::super::scenario_activation::Finish::Reply(steps[1]),
-            }]
+        assert!(
+            scene
+                .boxes
+                .iter()
+                .any(|b| b.id == steps[0] && b.rect.width == 8.)
         );
-        let call_line = scene.lines.iter().find(|line| line.id == steps[0]).unwrap();
-        let reply_line = scene.lines.iter().find(|line| line.id == steps[1]).unwrap();
-        assert_eq!(call_line.points.last().unwrap().y, 148.);
-        assert_eq!(reply_line.points.first().unwrap().y, 240.);
         let mut reply = State::default();
         reply
             .update(result, Event::Start(owner, Tool::Message))

crates/oa-desktop/src/behavior/scenario/camera.rs

@@ -1,284 +0,0 @@
-//! Scenario camera policy. Bounds are from the exact displayed presentation,
-//! including its origin and automatic fallback; no model geometry is authored.
-use crate::behavior::canvas_workspace::{self, Event};
-use iced::{Rectangle, Size, Vector};
-
-pub(super) const MIN_SCALE: f32 = f32::from_bits(1);
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub(super) struct Camera {
-    pub(super) scale: f32,
-    pub(super) pan: Vector,
-}
-
-/// Fit never enlarges above 100%. Use f64 intermediates so a valid f32 origin
-/// and size cannot overflow while finding the center. Unrepresentable cameras
-/// are refused rather than silently clamped to an unrelated minimum scale.
-pub(super) fn fit(bounds: Rectangle, viewport: Size) -> Option<Camera> {
-    if [
-        bounds.x,
-        bounds.y,
-        bounds.width,
-        bounds.height,
-        viewport.width,
-        viewport.height,
-    ]
-    .iter()
-    .any(|n| !n.is_finite())
-        || bounds.width < 0.
-        || bounds.height < 0.
-        || viewport.width <= 0.
-        || viewport.height <= 0.
-    {
-        return None;
-    }
-    let width = f64::from(viewport.width);
-    let height = f64::from(viewport.height);
-    let scale = ((width - 2. * (width / 4.).min(8.)) / f64::from(bounds.width).max(1.))
-        .min((height - 2. * (height / 4.).min(8.)) / f64::from(bounds.height).max(1.))
-        .min(1.) as f32;
-    if !scale.is_finite() || scale <= 0. {
-        return None;
-    }
-    let x = width / 2. - (f64::from(bounds.x) + f64::from(bounds.width) / 2.) * f64::from(scale);
-    let y = height / 2. - (f64::from(bounds.y) + f64::from(bounds.height) / 2.) * f64::from(scale);
-    let pan = Vector::new(x as f32, y as f32);
-    (pan.x.is_finite() && pan.y.is_finite()).then_some(Camera { scale, pan })
-}
-
-pub(super) fn effective_camera(
-    pan: Vector,
-    zoom: Option<f32>,
-    fitting: bool,
-    viewport: Option<Size>,
-    bounds: Rectangle,
-) -> Camera {
-    if fitting && let Some(camera) = viewport.and_then(|size| fit(bounds, size)) {
-        return camera;
-    }
-    Camera {
-        scale: zoom.unwrap_or(1.),
-        pan,
-    }
-}
-
-/// None preserves Fit as a mode, including before the first viewport arrives.
-pub(super) fn set_zoom(
-    pan: &mut Vector,
-    zoom: &mut Option<f32>,
-    fitting: &mut bool,
-    scale: Option<f32>,
-) -> bool {
-    if scale.is_some_and(|value| !value.is_finite() || value <= 0.) {
-        return false;
-    }
-    let next = scale.map(|value| value.min(3.));
-    let next_pan = if scale.is_none() { Vector::ZERO } else { *pan };
-    let changed = *zoom != next || *fitting != scale.is_none() || *pan != next_pan;
-    *zoom = next;
-    *fitting = scale.is_none();
-    *pan = next_pan;
-    changed
-}
-
-/// Materialize the visible fitted camera only when a camera gesture succeeds.
-/// A zero-motion or rejected event preserves the original mode and fields.
-pub(super) fn change(
-    pan: &mut Vector,
-    zoom: &mut Option<f32>,
-    fitting: &mut bool,
-    viewport: Option<Size>,
-    bounds: Rectangle,
-    event: Event,
-) -> bool {
-    let camera = effective_camera(*pan, *zoom, *fitting, viewport, bounds);
-    let (mut next_pan, mut next_zoom, mut next_fit) = (camera.pan, Some(camera.scale), false);
-    let event = match event {
-        Event::Zoom { base, .. } if !base.is_finite() || base <= 0. => return false,
-        Event::Zoom { factor, at, .. } => Event::Zoom {
-            factor,
-            at,
-            base: camera.scale,
-        },
-        event => event,
-    };
-    if !canvas_workspace::change_with_minimum(
-        &mut next_pan,
-        &mut next_zoom,
-        &mut next_fit,
-        event,
-        MIN_SCALE,
-    ) {
-        return false;
-    }
-    *pan = next_pan;
-    *zoom = next_zoom;
-    *fitting = next_fit;
-    true
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use iced::Point;
-
-    fn bounds() -> Rectangle {
-        Rectangle {
-            x: -1_000_160.,
-            y: -200.,
-            width: 2_000_400.,
-            height: 1_000.,
-        }
-    }
-    fn near(actual: f32, expected: f32, tolerance: f32) {
-        assert!(
-            (actual - expected).abs() <= tolerance,
-            "{actual} != {expected}"
-        );
-    }
-    fn projected(camera: Camera, point: Point) -> Point {
-        Point::new(
-            point.x * camera.scale + camera.pan.x,
-            point.y * camera.scale + camera.pan.y,
-        )
-    }
-
-    #[test]
-    fn negative_origin_fit_contains_independently_known_extremes() {
-        let camera = fit(bounds(), Size::new(700., 500.)).unwrap();
-        near(camera.scale, 0.0003419316, 1e-10);
-        near(camera.pan.x, 349.98633, 0.0001);
-        near(
-            projected(camera, Point::new(-1_000_160., -200.)).x,
-            8.,
-            0.0001,
-        );
-        near(
-            projected(camera, Point::new(1_000_240., 800.)).x,
-            692.,
-            0.0001,
-        );
-        near(projected(camera, Point::new(40., 300.)).y, 250., 0.0001);
-    }
-
-    #[test]
-    fn fit_remains_active_across_first_and_changed_viewport() {
-        let (mut pan, mut zoom, mut fitting) = (Vector::new(50., 80.), Some(0.8), false);
-        assert!(set_zoom(&mut pan, &mut zoom, &mut fitting, None));
-        let retained = effective_camera(pan, zoom, fitting, Some(Size::new(1200., 500.)), bounds());
-        let actual = effective_camera(pan, zoom, fitting, Some(Size::new(500., 500.)), bounds());
-        assert!(actual.scale < retained.scale);
-        near(
-            projected(actual, Point::new(-1_000_160., -200.)).x,
-            8.,
-            0.0001,
-        );
-        near(
-            projected(actual, Point::new(1_000_240., 800.)).x,
-            492.,
-            0.0001,
-        );
-        assert_eq!((pan, zoom, fitting), (Vector::ZERO, None, true));
-    }
-
-    #[test]
-    fn tiny_fit_zoom_in_out_preserves_pointer_world_anchor_without_floor_jump() {
-        let size = Size::new(700., 500.);
-        let viewport = Some(size);
-        let start = fit(bounds(), size).unwrap();
-        let (mut pan, mut zoom, mut fitting) = (Vector::ZERO, None, true);
-        let at = Point::new(210., 180.);
-        let world = Point::new(
-            (at.x - start.pan.x) / start.scale,
-            (at.y - start.pan.y) / start.scale,
-        );
-        for factor in [1.25, 0.8] {
-            let prior_scale = zoom.unwrap_or(start.scale);
-            assert!(change(
-                &mut pan,
-                &mut zoom,
-                &mut fitting,
-                viewport,
-                bounds(),
-                Event::Zoom {
-                    factor,
-                    at,
-                    base: start.scale,
-                }
-            ));
-            let camera = effective_camera(pan, zoom, fitting, viewport, bounds());
-            near(camera.scale, prior_scale * factor, 1e-10);
-            assert!(camera.scale < 0.001);
-            near(projected(camera, world).x, at.x, 0.0001);
-            near(projected(camera, world).y, at.y, 0.0001);
-        }
-        near(zoom.unwrap(), start.scale, 1e-10);
-        near(pan.x, start.pan.x, 0.0001);
-        assert!(!fitting);
-    }
-
-    #[test]
-    fn pan_leaves_fit_from_displayed_position_and_zero_motion_preserves_fit() {
-        let size = Size::new(700., 500.);
-        let viewport = Some(size);
-        let (mut pan, mut zoom, mut fitting) = (Vector::ZERO, None, true);
-        for event in [
-            Event::Pan(Vector::ZERO),
-            Event::Zoom {
-                factor: 1.,
-                at: Point::ORIGIN,
-                base: 1.,
-            },
-        ] {
-            assert!(!change(
-                &mut pan,
-                &mut zoom,
-                &mut fitting,
-                viewport,
-                bounds(),
-                event
-            ));
-            assert_eq!((pan, zoom, fitting), (Vector::ZERO, None, true));
-        }
-        let start = fit(bounds(), size).unwrap();
-        assert!(change(
-            &mut pan,
-            &mut zoom,
-            &mut fitting,
-            viewport,
-            bounds(),
-            Event::Pan(Vector::new(20., -30.))
-        ));
-        assert_eq!(pan, start.pan + Vector::new(20., -30.));
-        assert_eq!(zoom, Some(start.scale));
-        assert!(!fitting);
-    }
-
-    #[test]
-    fn invalid_inputs_are_passive_and_large_finite_bounds_do_not_overflow_center() {
-        assert!(fit(bounds(), Size::new(f32::NAN, 500.)).is_none());
-        let extreme = Rectangle {
-            x: f32::MAX,
-            y: 0.,
-            width: f32::MAX,
-            height: 100.,
-        };
-        let camera = fit(extreme, Size::new(700., 500.)).unwrap();
-        assert!(camera.scale > 0. && camera.scale < 1e-30 && camera.pan.x.is_finite());
-        let (mut pan, mut zoom, mut fitting) = (Vector::ZERO, None, true);
-        assert!(!set_zoom(&mut pan, &mut zoom, &mut fitting, Some(f32::NAN)));
-        assert!(!change(
-            &mut pan,
-            &mut zoom,
-            &mut fitting,
-            Some(Size::new(700., 500.)),
-            bounds(),
-            Event::Zoom {
-                factor: 1.25,
-                at: Point::ORIGIN,
-                base: f32::NAN
-            }
-        ));
-        assert_eq!((pan, zoom, fitting), (Vector::ZERO, None, true));
-    }
-}

crates/oa-desktop/src/behavior/scenario/focus.rs

@@ -11,8 +11,6 @@ use std::collections::BTreeMap;
 pub(crate) struct Stamp {
     document: ModelId,
     owner: ModelId,
-    representation: super::Representation,
-    visit: ModelId,
     revision: u64,
     session: ModelId,
     mount: ModelId,
@@ -22,8 +20,6 @@ impl Stamp {
         Self {
             document: context.document,
             owner: context.scenario,
-            representation: context.representation,
-            visit: context.visit,
             revision: context.revision,
             session,
             mount,
@@ -32,12 +28,10 @@ impl Stamp {
 }
 pub(crate) fn name_id(stamp: Stamp) -> Id {
     Id::from(format!(
-        "{}:{}:{}:{:?}:{}:{}:{}:{}",
+        "{}:{}:{}:{}:{}:{}",
         super::NAME_INPUT,
         stamp.document,
         stamp.owner,
-        stamp.representation,
-        stamp.visit,
         stamp.revision,
         stamp.session,
         stamp.mount

crates/oa-desktop/src/behavior/scenario/presentation_tests.rs

@@ -1,348 +0,0 @@
-//! Controller identity and actual presentation input, independent of App routing.
-use super::*;
-use oa_core::{Diagram, DiagramLayout, ProjectionKind, ScenarioLanePosition, ScenarioLayout};
-
-fn saved(p: &mut Project, owner: Id, lanes: &[(Id, f32)]) -> Representation {
-    let id = Id::new_v4();
-    p.diagrams.insert(
-        id,
-        Diagram {
-            id,
-            alias: format!("saved_{}", p.diagrams.len()),
-            name: "Saved scenario".into(),
-            description: String::new(),
-            layer: p.elements[&owner].layer(),
-            projection: ProjectionKind::Scenario { scenario: owner },
-            view_options: Default::default(),
-            nodes: Default::default(),
-            routes: vec![],
-            layout: Some(DiagramLayout::Scenario(ScenarioLayout {
-                lanes: lanes
-                    .iter()
-                    .map(|&(lifeline, x)| ScenarioLanePosition { lifeline, x })
-                    .collect(),
-                messages: vec![],
-            })),
-        },
-    );
-    let errors: Vec<_> = oa_core::validation::validate(p)
-        .into_iter()
-        .filter(|issue| issue.severity == oa_core::validation::Severity::Error)
-        .collect();
-    assert!(errors.is_empty(), "{errors:?}");
-    Representation::Saved { diagram: id }
-}
-
-#[test]
-fn saved_visits_distinguish_same_owner_roundtrips_and_suspended_return_without_editing() {
-    let mut f = direct_tests::fixture();
-    let a = saved(&mut f.project, f.owner, &[(f.sender, -500.)]);
-    let b = saved(&mut f.project, f.owner, &[(f.sender, 900.)]);
-    let original = f.project.clone();
-    let document = Id::new_v4();
-    let mut state = State::default();
-    assert!(state.enter_representation(document, f.owner, a));
-    let first = state.context(document, f.owner, 7, 9).unwrap();
-    assert!(!state.enter_representation(document, f.owner, a));
-    assert_eq!(state.context(document, f.owner, 7, 9), Some(first));
-    state.presentation.pan = iced::Vector::new(23., -17.);
-    state.leave();
-    assert_eq!(state.representation(), Some(a));
-    assert_eq!(state.owner(), Some(f.owner));
-    assert!(state.context(document, f.owner, 7, 9).is_none());
-    assert!(state.enter_representation(document, f.owner, a));
-    let returned = state.context(document, f.owner, 7, 9).unwrap();
-    assert_ne!(returned.visit, first.visit);
-    assert_eq!(state.presentation.pan, iced::Vector::new(23., -17.));
-    assert!(state.enter_representation(document, f.owner, b));
-    let middle = state.context(document, f.owner, 7, 9).unwrap();
-    assert!(state.enter_representation(document, f.owner, a));
-    let last = state.context(document, f.owner, 7, 9).unwrap();
-    assert_ne!(last.visit, returned.visit);
-    assert_ne!(last.visit, middle.visit);
-    assert!(!state.coordinate_input(&f.project, first));
-    assert!(state.coordinate_input(&f.project, last));
-    let session = Id::new_v4();
-    let mount = Id::new_v4();
-    assert_ne!(
-        focus::Stamp::new(first, session, mount),
-        focus::Stamp::new(last, session, mount)
-    );
-    assert_eq!(f.project, original);
-    state.forget_view();
-    assert_eq!(state.representation(), None);
-    assert_eq!(state.owner(), None);
-    assert!(state.context(document, f.owner, 7, 9).is_none());
-}
-
-#[test]
-fn saved_caller_restores_exact_representation_with_fresh_visit_and_rejects_deleted_view() {
-    let (mut project, [a, b, _], [reference, _, _]) = direct_tests::navigation_fixture();
-    let view = saved(&mut project, a, &[]);
-    let original = project.clone();
-    let document = Id::new_v4();
-    let mut state = State::default();
-    state.enter_representation(document, a, view);
-    let initial = state.context(document, a, 0, 0).unwrap();
-    state.presentation.pan = iced::Vector::new(11., 29.);
-    state.details_offset = iced::Vector::new(0., 71.);
-    assert_eq!(state.open_use(&project, initial, reference).unwrap(), b);
-    state.enter(document, b);
-    let callee = state.context(document, b, 0, 0).unwrap();
-    let frame = state.back(&project, callee).unwrap();
-    assert_eq!(frame.representation, view);
-    state.enter_representation(document, a, frame.representation);
-    let returned = state.context(document, a, 0, 0).unwrap();
-    state.restore_caller(returned, frame);
-    assert_ne!(returned.visit, initial.visit);
-    assert_eq!(state.representation(), Some(view));
-    assert_eq!(state.presentation.pan, iced::Vector::new(11., 29.));
-    assert!(state.scroll_restore(initial, ScrollArea::Page).is_none());
-    assert_eq!(
-        state
-            .scroll_restore(returned, ScrollArea::Page)
-            .unwrap()
-            .offset,
-        iced::Vector::new(0., 71.)
-    );
-    assert_eq!(project, original);
-    state.open_use(&project, returned, reference).unwrap();
-    state.enter(document, b);
-    let Representation::Saved { diagram } = view else {
-        unreachable!()
-    };
-    project.diagrams.remove(&diagram);
-    let callee = state.context(document, b, 0, 0).unwrap();
-    assert!(state.back(&project, callee).is_none());
-}
-
-#[test]
-fn complete_fallback_scene_selects_but_cannot_capture_or_finish_coordinate_gestures() {
-    let mut f = direct_tests::fixture();
-    // Equal authored lane centers are structurally valid, but cannot render a distinct-endpoint call.
-    let rep = saved(
-        &mut f.project,
-        f.owner,
-        &[(f.sender, 900.), (f.receiver, 900.)],
-    );
-    let original = f.project.clone();
-    let mut state = State::default();
-    state.enter_representation(Id::new_v4(), f.owner, rep);
-    let document = state.presentation.identity.unwrap().0;
-    let context = state.context(document, f.owner, 0, 0).unwrap();
-    let shown = state.display(&f.project, f.owner, f.call).unwrap();
-    assert!(matches!(
-        shown.status(),
-        presentation::PresentationStatus::Fallback { .. }
-    ));
-    assert!(!state.coordinate_input(&f.project, context));
-    let automatic = presentation::present(
-        &f.project,
-        Representation::Derived { owner: f.owner },
-        f.call,
-    );
-    let automatic = automatic.scene().unwrap();
-    assert_eq!(shown.scene().unwrap().render_lanes, automatic.render_lanes);
-    assert_eq!(shown.scene().unwrap().activations, automatic.activations);
-    assert!(!automatic.activations.is_empty());
-    let mut scene = shown.into_scene().unwrap();
-    scene.coordinate_input = false;
-    let line = scene.lines.iter().find(|line| line.id == f.call).unwrap();
-    let point = Point::new(
-        (line.points[0].x + line.points.last().unwrap().x) / 2.,
-        line.points[0].y,
-    );
-    assert_eq!(scene.hit(point), Some(f.call));
-    let bounds = Rectangle::with_size(Size::new(1600., 1000.));
-    for tool in [
-        CanvasTool::Select,
-        CanvasTool::Message(MessageStyle::CallReply),
-        CanvasTool::Add(Tool::Reuse),
-    ] {
-        scene.interaction = Some((context, tool, true));
-        let mut input = SequenceInput::default();
-        let mut messages = vec![];
-        for event in [
-            mouse::Event::CursorMoved { position: point },
-            mouse::Event::ButtonPressed(mouse::Button::Left),
-            mouse::Event::CursorMoved {
-                position: Point::new(point.x, point.y + 100.),
-            },
-            mouse::Event::ButtonReleased(mouse::Button::Left),
-        ] {
-            if let Some(message) = canvas::Program::update(
-                &scene,
-                &mut input,
-                &canvas::Event::Mouse(event),
-                bounds,
-                mouse::Cursor::Available(point),
-            )
-            .and_then(|action| action.into_inner().0)
-            {
-                messages.push(message);
-            }
-        }
-        assert_eq!(messages.len(), 1);
-        assert!(
-            matches!(messages[0], Message::ScenarioCanvas(CanvasEvent::Select(c, id)) if c == context && id == f.call)
-        );
-        assert!(input.press.is_none() && input.source.is_none());
-    }
-    // Capture from an actual Ready presentation, then revoke coordinate input
-    // with the complete fallback frame of the same Saved representation.
-    let Representation::Saved { diagram } = rep else {
-        unreachable!()
-    };
-    let mut ready_project = f.project.clone();
-    ready_project.diagrams.get_mut(&diagram).unwrap().layout =
-        Some(DiagramLayout::Scenario(ScenarioLayout::default()));
-    let ready_original = ready_project.clone();
-    let ready = state.display(&ready_project, f.owner, f.call).unwrap();
-    assert!(matches!(
-        ready.status(),
-        presentation::PresentationStatus::Ready
-    ));
-    let mut ready_scene = ready.into_scene().unwrap();
-    let line = ready_scene
-        .lines
-        .iter()
-        .find(|line| line.id == f.call)
-        .unwrap();
-    let ready_point = Point::new(
-        (line.points[0].x + line.points.last().unwrap().x) / 2.,
-        line.points[0].y,
-    );
-    let hit = ready_scene.hit_item(ready_point).unwrap();
-    assert_eq!(hit.id, f.call);
-    assert_eq!(hit.role, SceneHitRole::MessageBody);
-    let stamp = spacing::Stamp {
-        context,
-        camera_epoch: 17,
-    };
-    ready_scene.coordinate_input = true;
-    ready_scene.interaction = Some((context, CanvasTool::Select, true));
-    ready_scene.spacing_stamp = Some(stamp);
-    let mut input = SequenceInput::default();
-    let begin = canvas::Program::update(
-        &ready_scene,
-        &mut input,
-        &canvas::Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)),
-        bounds,
-        mouse::Cursor::Available(ready_point),
-    )
-    .and_then(|action| action.into_inner().0)
-    .unwrap();
-    let Message::ScenarioCanvas(CanvasEvent::Spacing(spacing::Event::Begin {
-        stamp: captured_stamp,
-        token,
-        target: spacing::Target::Message(target),
-        ..
-    })) = begin
-    else {
-        panic!("Ready Saved message must begin a stamped spacing gesture");
-    };
-    assert_eq!(captured_stamp, stamp);
-    assert_eq!(target, f.call);
-    assert!(matches!(input.press, Some(SequencePress::Spacing {
-        stamp: held_stamp, token: held_token
-    }) if held_stamp == stamp && held_token == token));
-    scene.interaction = Some((context, CanvasTool::Select, true));
-    assert!(!scene.coordinate_input && scene.spacing_stamp.is_none());
-    let release = canvas::Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left));
-    let result = canvas::Program::update(
-        &scene,
-        &mut input,
-        &release,
-        bounds,
-        mouse::Cursor::Available(ready_point),
-    )
-    .and_then(|action| action.into_inner().0);
-    assert!(
-        matches!(result, Some(Message::ScenarioCanvas(CanvasEvent::Spacing(
-        spacing::Event::Cancel { stamp: cancelled_stamp, token: cancelled_token }
-    ))) if cancelled_stamp == stamp && cancelled_token == token)
-    );
-    assert!(input.press.is_none() && input.source.is_none());
-    assert!(
-        canvas::Program::update(
-            &scene,
-            &mut input,
-            &release,
-            bounds,
-            mouse::Cursor::Available(ready_point),
-        )
-        .and_then(|action| action.into_inner().0)
-        .is_none()
-    );
-    assert_eq!(ready_project, ready_original);
-    assert_eq!(f.project, original);
-}
-
-#[test]
-fn saved_camera_fits_actual_negative_origin_and_tiny_scale_without_authored_mutation() {
-    let mut f = direct_tests::fixture();
-    let rep = saved(
-        &mut f.project,
-        f.owner,
-        &[(f.sender, -1_000_000.), (f.receiver, 1_000_000.)],
-    );
-    let original = f.project.clone();
-    let mut state = State::default();
-    state.enter_representation(Id::new_v4(), f.owner, rep);
-    state.viewport(Size::new(700., 500.));
-    assert!(
-        state.presentation.fit,
-        "new saved views await their real viewport in Fit mode"
-    );
-    assert!(
-        !state.camera_zoom(&f.project, f.owner, None),
-        "already-active Fit is idempotent"
-    );
-    let shown = state.display(&f.project, f.owner, f.owner).unwrap();
-    assert!(matches!(
-        shown.status(),
-        presentation::PresentationStatus::Ready
-    ));
-    let bounds = shown.bounds().unwrap();
-    assert!(bounds.x < -1_000_000. && bounds.x + bounds.width > 1_000_000.);
-    let fitted = state.presentation.camera(bounds);
-    assert!(fitted.scale > 0. && fitted.scale < 0.001);
-    let left = bounds.x * fitted.scale + fitted.pan.x;
-    let right = (bounds.x + bounds.width) * fitted.scale + fitted.pan.x;
-    assert!((left - 8.).abs() < 0.001 && (right - 692.).abs() < 0.001);
-    assert!(state.camera(
-        &f.project,
-        f.owner,
-        super::super::canvas_workspace::Event::Pan(iced::Vector::new(13., -7.))
-    ));
-    let moved = state.presentation.camera(bounds);
-    assert_eq!(moved.scale, fitted.scale);
-    assert_eq!(moved.pan, fitted.pan + iced::Vector::new(13., -7.));
-    assert!(!state.presentation.fit);
-    assert_eq!(f.project, original);
-}
-
-#[test]
-fn deleted_saved_identity_remains_unavailable_and_never_falls_into_derived_geometry() {
-    let mut f = direct_tests::fixture();
-    let rep = saved(&mut f.project, f.owner, &[]);
-    let mut state = State::default();
-    let document = Id::new_v4();
-    state.enter_representation(document, f.owner, rep);
-    let Representation::Saved { diagram } = rep else {
-        unreachable!()
-    };
-    f.project.diagrams.remove(&diagram);
-    let original = f.project.clone();
-    let shown = state.display(&f.project, f.owner, f.owner).unwrap();
-    assert_eq!(shown.requested(), rep);
-    assert!(matches!(
-        shown.status(),
-        presentation::PresentationStatus::Unavailable { .. }
-    ));
-    assert!(shown.scene().is_none() && shown.bounds().is_none());
-    assert_eq!(state.owner(), Some(f.owner));
-    assert!(state.context(document, f.owner, 0, 0).is_some());
-    assert!(!state.camera_zoom(&f.project, f.owner, None));
-    assert_eq!(f.project, original);
-}

crates/oa-desktop/src/behavior/scenario/spacing.rs

@@ -1,160 +0,0 @@
-//! Pure Saved-only spacing preparation. Delta is measured from the original
-//! pointer in the captured camera's world coordinates, never from the last
-//! preview. The controller must own document/revision/visit, camera and hit-role
-//! admission; this module neither dispatches commands nor changes selection.
-use crate::behavior::scenario_layout::{
-    GeometryIssue, Representation, ResolvedScenarioPlan, presentation::checked_owner, resolve,
-};
-use oa_core::{
-    Command, Id, Kind, OccurrenceBody, OccurrenceEndpoint, Project, ScenarioLanePosition,
-    ScenarioMessagePosition, SharedBody, execute_batch,
-};
-
-pub(crate) mod controller;
-#[cfg(test)]
-mod tests;
-pub(crate) use controller::{Event, Stamp};
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Target {
-    Lane(Id),
-    Message(Id),
-}
-impl Target {
-    pub(crate) fn id(self) -> Id {
-        match self {
-            Self::Lane(id) | Self::Message(id) => id,
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub(crate) enum Refusal {
-    InvalidSavedView(Id),
-    TargetNotRendered(Target),
-    InvalidDelta,
-    InvalidGesture,
-    CameraChanged,
-    TargetNotHit(Target),
-    Command(String),
-    Geometry(Vec<GeometryIssue>),
-}
-
-pub(super) struct Drag {
-    original: Project,
-    diagram: Id,
-    target: Target,
-    origin: f32,
-    original_geometry: ResolvedScenarioPlan,
-}
-
-pub(super) struct Preview {
-    pub(super) command: Command,
-    #[cfg(test)]
-    pub(super) project: Project,
-    pub(super) geometry: ResolvedScenarioPlan,
-}
-
-/// Capture an accepted, actually drawn target. A Saved view displaying automatic
-/// fallback is not an editable original, even if the target appears in fallback.
-pub(super) fn capture(project: &Project, diagram: Id, target: Target) -> Result<Drag, Refusal> {
-    let representation = Representation::Saved { diagram };
-    let owner = checked_owner(project, representation).ok_or(Refusal::InvalidSavedView(diagram))?;
-    let geometry = resolve(project, representation, target.id()).map_err(Refusal::Geometry)?;
-    let element = project.elements.get(&target.id());
-    let origin = match target {
-        Target::Lane(id)
-            if element.is_some_and(|e| e.kind() == Kind::Lifeline && e.parent == Some(owner)) =>
-        {
-            // Unassigned lifelines still have drawn headers. `scene.lanes`
-            // excludes them only from semantic message-endpoint hit testing.
-            geometry.scene.render_lanes.get(&id).copied()
-        }
-        Target::Message(id)
-            if element.is_some_and(|e| {
-                matches!(
-                    e.shared(),
-                    Some(SharedBody::Occurrence {
-                        body: OccurrenceBody::Exchange { .. },
-                        ..
-                    })
-                )
-            }) =>
-        {
-            // A lifecycle row can denote receive y; the public position means
-            // send y. Read the actual outgoing endpoint, including self calls.
-            geometry
-                .scene
-                .lines
-                .iter()
-                .find(|line| line.id == id)
-                .and_then(|line| line.points.first())
-                .map(|point| point.y)
-        }
-        _ => None,
-    }
-    .ok_or(Refusal::TargetNotRendered(target))?;
-    if !origin.is_finite() {
-        return Err(Refusal::TargetNotRendered(target));
-    }
-    Ok(Drag {
-        original: project.clone(),
-        diagram,
-        target,
-        origin,
-        original_geometry: geometry,
-    })
-}
-
-impl Drag {
-    /// None means there is no command to commit. In particular +0/-0, return to
-    /// start, and sub-precision motion never materialize a missing override or
-    /// normalize an existing explicit value. Document/redo are never touched.
-    pub(super) fn prepare(&self, original_delta: f32) -> Result<Option<Preview>, Refusal> {
-        if !original_delta.is_finite() {
-            return Err(Refusal::InvalidDelta);
-        }
-        if original_delta == 0. {
-            return Ok(None);
-        }
-        let position = (f64::from(self.origin) + f64::from(original_delta)) as f32;
-        if position == self.origin {
-            return Ok(None);
-        }
-        let command = match self.target {
-            Target::Lane(lifeline) => Command::SetScenarioLanePosition {
-                diagram: self.diagram,
-                position: ScenarioLanePosition {
-                    lifeline,
-                    x: position,
-                },
-            },
-            Target::Message(occurrence) => Command::SetScenarioMessagePosition {
-                diagram: self.diagram,
-                position: ScenarioMessagePosition {
-                    address: OccurrenceEndpoint {
-                        references: vec![],
-                        occurrence,
-                    },
-                    send_y: position,
-                },
-            },
-        };
-        let project = execute_batch(&self.original, std::slice::from_ref(&command))
-            .map_err(|error| Refusal::Command(error.to_string()))?;
-        let geometry = resolve(
-            &project,
-            Representation::Saved {
-                diagram: self.diagram,
-            },
-            self.target.id(),
-        )
-        .map_err(Refusal::Geometry)?;
-        Ok(Some(Preview {
-            command,
-            #[cfg(test)]
-            project,
-            geometry,
-        }))
-    }
-}

crates/oa-desktop/src/behavior/scenario/spacing/controller.rs

@@ -1,300 +0,0 @@
-//! One press owns one immutable accepted Project and one frozen display camera.
-use super::*;
-use crate::behavior::{
-    Scene, SceneHitRole,
-    scenario::{CanvasTool, Context, State},
-    scenario_layout::Diagnostic,
-};
-use iced::{Point, Rectangle, Vector};
-
-#[cfg(test)]
-pub(crate) mod tests;
-#[cfg(test)]
-mod timing_tests;
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Stamp {
-    pub(crate) context: Context,
-    pub(crate) camera_epoch: u64,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum Event {
-    Begin {
-        stamp: Stamp,
-        token: Id,
-        target: Target,
-        press_screen: Point,
-        canvas_bounds: Rectangle,
-        scale: f32,
-        pan: Vector,
-    },
-    Move {
-        stamp: Stamp,
-        token: Id,
-        screen: Point,
-    },
-    Finish {
-        stamp: Stamp,
-        token: Id,
-        screen: Point,
-    },
-    Cancel {
-        stamp: Stamp,
-        token: Id,
-    },
-}
-impl Event {
-    pub(crate) fn stamp(self) -> Stamp {
-        match self {
-            Self::Begin { stamp, .. }
-            | Self::Move { stamp, .. }
-            | Self::Finish { stamp, .. }
-            | Self::Cancel { stamp, .. } => stamp,
-        }
-    }
-    pub(crate) fn token(self) -> Id {
-        match self {
-            Self::Begin { token, .. }
-            | Self::Move { token, .. }
-            | Self::Finish { token, .. }
-            | Self::Cancel { token, .. } => token,
-        }
-    }
-}
-
-pub(crate) struct Session {
-    stamp: Stamp,
-    token: Id,
-    press_screen: Point,
-    scale: f32,
-    pan: Vector,
-    drag: Drag,
-    preview: Option<Preview>,
-    refusal: Option<Refusal>,
-    ever_crossed: bool,
-}
-
-pub(in crate::behavior) struct Paint<'a> {
-    pub(in crate::behavior) scene: &'a Scene,
-    #[cfg(test)]
-    pub(in crate::behavior) bounds: Rectangle,
-    pub(in crate::behavior) refusal: Option<&'a Refusal>,
-    pub(in crate::behavior) original_diagnostics: &'a [Diagnostic],
-    pub(in crate::behavior) original_latent: &'a [Id],
-    pub(in crate::behavior) diagnostics: &'a [Diagnostic],
-}
-
-pub(crate) enum Finish {
-    Click(Id),
-    Noop,
-    Commit {
-        command: Box<Command>,
-        selected: Id,
-        scale: f32,
-        pan: Vector,
-    },
-}
-
-impl Session {
-    fn configure(&self, scene: &mut Scene) {
-        scene.selected = self.drag.target.id();
-        scene.scale = self.scale;
-        scene.camera_pan = self.pan;
-        scene.interaction = Some((self.stamp.context, CanvasTool::Select, true));
-        scene.spacing_stamp = Some(self.stamp);
-        scene.coordinate_input = true;
-        scene.pending_placement = None;
-    }
-    fn update(&mut self, screen: Point) {
-        self.preview = None;
-        self.refusal = None;
-        if !screen.x.is_finite() || !screen.y.is_finite() {
-            self.refusal = Some(Refusal::InvalidDelta);
-            return;
-        }
-        let distance = match self.drag.target {
-            Target::Lane(_) => screen.x - self.press_screen.x,
-            Target::Message(_) => screen.y - self.press_screen.y,
-        };
-        self.ever_crossed |= distance.abs() >= 3.;
-        if !self.ever_crossed {
-            return;
-        }
-        match self.drag.prepare(distance / self.scale) {
-            Ok(Some(mut preview)) => {
-                self.configure(&mut preview.geometry.scene);
-                self.preview = Some(preview);
-            }
-            Ok(None) => {}
-            Err(error) => self.refusal = Some(error),
-        }
-    }
-}
-
-impl State {
-    pub(crate) fn spacing_token(&self) -> Option<Id> {
-        self.spacing.as_ref().map(|s| s.token)
-    }
-    pub(crate) fn spacing_stamp(&self) -> Option<Stamp> {
-        self.spacing.as_ref().map(|s| s.stamp)
-    }
-    pub(crate) fn cancel_spacing(&mut self) -> bool {
-        self.spacing.take().is_some()
-    }
-
-    pub(in crate::behavior) fn spacing_paint(
-        &self,
-        context: Context,
-        camera_epoch: u64,
-    ) -> Option<Paint<'_>> {
-        let session = self.spacing.as_ref()?;
-        if session.stamp
-            != (Stamp {
-                context,
-                camera_epoch,
-            })
-        {
-            return None;
-        }
-        let original = &session.drag.original_geometry;
-        let shown = session.preview.as_ref().map_or(original, |p| &p.geometry);
-        Some(Paint {
-            scene: &shown.scene,
-            #[cfg(test)]
-            bounds: shown.bounds,
-            refusal: session.refusal.as_ref(),
-            original_diagnostics: &original.plan.diagnostics,
-            original_latent: &original.latent_messages,
-            diagnostics: &shown.plan.diagnostics,
-        })
-    }
-
-    pub(crate) fn begin_spacing(&mut self, project: &Project, event: Event) -> Result<(), Refusal> {
-        let Event::Begin {
-            stamp,
-            token,
-            target,
-            press_screen,
-            canvas_bounds,
-            scale,
-            pan,
-        } = event
-        else {
-            return Err(Refusal::InvalidGesture);
-        };
-        let context = stamp.context;
-        if self.spacing.is_some()
-            || token.is_nil()
-            || self.context(
-                context.document,
-                context.scenario,
-                context.revision,
-                context.epoch,
-            ) != Some(context)
-            || self.canvas_tool(context.scenario) != CanvasTool::Select
-            || ![
-                press_screen.x,
-                press_screen.y,
-                canvas_bounds.x,
-                canvas_bounds.y,
-                canvas_bounds.width,
-                canvas_bounds.height,
-                scale,
-                pan.x,
-                pan.y,
-            ]
-            .into_iter()
-            .all(f32::is_finite)
-            || scale <= 0.
-            || canvas_bounds.width <= 0.
-            || canvas_bounds.height <= 0.
-            || !canvas_bounds.contains(press_screen)
-        {
-            return Err(Refusal::InvalidGesture);
-        }
-        let Representation::Saved { diagram } = context.representation else {
-            return Err(Refusal::InvalidGesture);
-        };
-        let mut drag = capture(project, diagram, target)?;
-        let camera = self.presentation.camera(drag.original_geometry.bounds);
-        if self.presentation.viewport != Some(canvas_bounds.size())
-            || camera.scale != scale
-            || camera.pan != pan
-        {
-            return Err(Refusal::CameraChanged);
-        }
-        let world = Point::new(
-            (press_screen.x - canvas_bounds.x - pan.x) / scale,
-            (press_screen.y - canvas_bounds.y - pan.y) / scale,
-        );
-        // Hit tolerance is measured in displayed pixels, just like the widget.
-        drag.original_geometry.scene.scale = scale;
-        drag.original_geometry.scene.camera_pan = pan;
-        let hit = drag.original_geometry.scene.hit_item(world);
-        if !hit.is_some_and(|hit| {
-            hit.id == target.id()
-                && match target {
-                    Target::Lane(_) => hit.role == SceneHitRole::LifelineHeader,
-                    Target::Message(_) => matches!(
-                        hit.role,
-                        SceneHitRole::MessageBody | SceneHitRole::MessageLabel
-                    ),
-                }
-        }) {
-            return Err(Refusal::TargetNotHit(target));
-        }
-        // Configure baseline without changing the persistent camera or selection.
-        let scene = &mut drag.original_geometry.scene;
-        scene.selected = target.id();
-        scene.scale = scale;
-        scene.camera_pan = pan;
-        scene.interaction = Some((context, CanvasTool::Select, true));
-        scene.spacing_stamp = Some(stamp);
-        scene.coordinate_input = true;
-        scene.pending_placement = None;
-        self.spacing = Some(Session {
-            stamp,
-            token,
-            press_screen,
-            scale,
-            pan,
-            drag,
-            preview: None,
-            refusal: None,
-            ever_crossed: false,
-        });
-        Ok(())
-    }
-    pub(crate) fn move_spacing(&mut self, screen: Point) {
-        if let Some(session) = &mut self.spacing {
-            session.update(screen);
-        }
-    }
-    pub(crate) fn finish_spacing(&mut self, screen: Point) -> Result<Finish, Refusal> {
-        let Some(mut session) = self.spacing.take() else {
-            return Err(Refusal::InvalidGesture);
-        };
-        session.update(screen);
-        if let Some(error) = session.refusal {
-            return Err(error);
-        }
-        if !session.ever_crossed {
-            return Ok(Finish::Click(session.drag.target.id()));
-        }
-        Ok(match session.preview {
-            None => Finish::Noop,
-            Some(preview) => Finish::Commit {
-                command: Box::new(preview.command),
-                selected: session.drag.target.id(),
-                scale: session.scale,
-                pan: session.pan,
-            },
-        })
-    }
-    pub(crate) fn accept_spacing_camera(&mut self, scale: f32, pan: Vector) {
-        self.presentation.zoom = Some(scale);
-        self.presentation.pan = pan;
-        self.presentation.fit = false;
-    }
-}

crates/oa-desktop/src/behavior/scenario/spacing/controller/tests.rs

@@ -1,421 +0,0 @@
-use super::*;
-use crate::document::Document;
-use iced::Size;
-use oa_core::{Diagram, Layer, ProjectionKind, language, source_project::ProjectLimits};
-
-pub(crate) fn fixture() -> (Document, Id, Id, Id, Id) {
-    let mut p = language::parse(r#"arcadia 7;
-project spacing "Spacing" {
- oa_activity work "Work" {}
- oa_activity response "Response" {}
- oa_scenario incident "Incident" { viewpoint OperationalActivity; steps [@first, @second]; }
- oa_lifeline reporter "Reporter" { parent @incident; represented @work; }
- oa_lifeline operator "Operator" { parent @incident; represented @response; }
- oa_occurrence first "First" { parent @incident; body { Exchange { exchange none; sender @reporter; receiver @operator; message_kind Asynchronous; }; }; }
- oa_occurrence second "Second" { parent @incident; body { Exchange { exchange none; sender @operator; receiver @reporter; message_kind Asynchronous; }; }; }
-}"#).unwrap();
-    let id = |name: &str| {
-        p.identities()
-            .into_iter()
-            .find(|(_, alias)| *alias == name)
-            .unwrap()
-            .0
-    };
-    let (owner, lane, message) = (id("incident"), id("reporter"), id("first"));
-    let diagram = Id::new_v4();
-    p.diagrams.insert(
-        diagram,
-        Diagram {
-            id: diagram,
-            alias: "saved".into(),
-            name: "Saved".into(),
-            description: String::new(),
-            layer: Layer::Oa,
-            projection: ProjectionKind::Scenario { scenario: owner },
-            nodes: Default::default(),
-            routes: vec![],
-            view_options: Default::default(),
-            layout: None,
-        },
-    );
-    (
-        Document::from_project(p, ProjectLimits::default()).unwrap(),
-        owner,
-        diagram,
-        lane,
-        message,
-    )
-}
-
-pub(crate) fn expected(p: &Project, diagram: Id, target: Target, delta: f32) -> Project {
-    capture(p, diagram, target)
-        .unwrap()
-        .prepare(delta)
-        .unwrap()
-        .unwrap()
-        .project
-}
-
-pub(crate) fn packet(
-    p: &Project,
-    state: &State,
-    context: Context,
-    camera_epoch: u64,
-    target: Target,
-) -> Event {
-    let geometry = resolve(p, context.representation, target.id()).unwrap();
-    let world = match target {
-        Target::Lane(id) => geometry
-            .scene
-            .boxes
-            .iter()
-            .find(|item| item.id == id && item.role == SceneHitRole::LifelineHeader)
-            .unwrap()
-            .rect
-            .center(),
-        Target::Message(id) => {
-            let line = geometry
-                .scene
-                .lines
-                .iter()
-                .find(|line| line.id == id)
-                .unwrap();
-            Point::new((line.points[0].x + line.points[1].x) / 2., line.points[0].y)
-        }
-    };
-    assert!(
-        geometry
-            .scene
-            .hit_item(world)
-            .is_some_and(|hit| hit.id == target.id())
-    );
-    let camera = state.presentation.camera(geometry.bounds);
-    let canvas_bounds = Rectangle::new(Point::new(17., 23.), state.presentation.viewport.unwrap());
-    Event::Begin {
-        stamp: Stamp {
-            context,
-            camera_epoch,
-        },
-        token: Id::new_v4(),
-        target,
-        press_screen: Point::new(
-            canvas_bounds.x + world.x * camera.scale + camera.pan.x,
-            canvas_bounds.y + world.y * camera.scale + camera.pan.y,
-        ),
-        canvas_bounds,
-        scale: camera.scale,
-        pan: camera.pan,
-    }
-}
-fn setup(target_message: bool) -> (Document, State, Event) {
-    let (doc, owner, diagram, lane, message) = fixture();
-    let mut state = State::default();
-    state.enter_representation(Id::new_v4(), owner, Representation::Saved { diagram });
-    state.presentation.viewport = Some(Size::new(900., 600.));
-    let context = state
-        .context(
-            state.presentation.identity.unwrap().0,
-            owner,
-            doc.revision(),
-            4,
-        )
-        .unwrap();
-    let target = if target_message {
-        Target::Message(message)
-    } else {
-        Target::Lane(lane)
-    };
-    let event = packet(doc.project(), &state, context, 9, target);
-    (doc, state, event)
-}
-fn press(event: Event) -> Point {
-    let Event::Begin { press_screen, .. } = event else {
-        unreachable!()
-    };
-    press_screen
-}
-
-#[test]
-fn real_preview_moves_only_active_axis_from_original_and_never_changes_document() {
-    for message in [false, true] {
-        let (doc, mut state, begin) = setup(message);
-        let original = doc.snapshot();
-        let camera = state.camera_boundary();
-        let start = press(begin);
-        state.begin_spacing(doc.project(), begin).unwrap();
-        let first = if message {
-            Vector::new(500., 30.)
-        } else {
-            Vector::new(30., 500.)
-        };
-        state.move_spacing(start + first);
-        let session = state.spacing.as_ref().unwrap();
-        let candidate = session.preview.as_ref().unwrap();
-        let delta = 30. / session.scale;
-        let actual_anchor = match session.drag.target {
-            Target::Lane(id) => candidate.geometry.scene.render_lanes[&id],
-            Target::Message(id) => {
-                candidate
-                    .geometry
-                    .scene
-                    .lines
-                    .iter()
-                    .find(|line| line.id == id)
-                    .unwrap()
-                    .points[0]
-                    .y
-            }
-        };
-        let wanted = (f64::from(session.drag.origin) + f64::from(delta)) as f32;
-        assert_eq!(actual_anchor.to_bits(), wanted.to_bits());
-        let expected = session.drag.prepare(delta).unwrap().unwrap();
-        assert_eq!(candidate.project, expected.project);
-        assert_eq!(candidate.geometry.scene.rows, expected.geometry.scene.rows);
-        assert_eq!(
-            candidate.geometry.scene.render_lanes,
-            expected.geometry.scene.render_lanes
-        );
-        state.move_spacing(start + first * 2.);
-        let session = state.spacing.as_ref().unwrap();
-        assert_eq!(
-            session.preview.as_ref().unwrap().project,
-            session.drag.prepare(delta * 2.).unwrap().unwrap().project
-        );
-        assert_eq!(doc.project(), &original.decoded.project);
-        assert_eq!(doc.compiled().bundle, original.bundle);
-        assert!(!doc.dirty() && !doc.can_undo() && !doc.can_redo());
-        assert!(camera == state.camera_boundary());
-    }
-}
-
-#[test]
-fn click_threshold_is_active_axis_and_return_to_zero_is_not_a_click() {
-    let (doc, mut state, begin) = setup(false);
-    let start = press(begin);
-    state.begin_spacing(doc.project(), begin).unwrap();
-    state.move_spacing(start + Vector::new(2., 100.));
-    assert!(matches!(
-        state.finish_spacing(start).unwrap(),
-        Finish::Click(_)
-    ));
-    state.begin_spacing(doc.project(), begin).unwrap();
-    state.move_spacing(start + Vector::new(4., 0.));
-    assert!(matches!(state.finish_spacing(start).unwrap(), Finish::Noop));
-    assert!(!doc.can_undo());
-}
-
-#[test]
-fn invalid_move_discards_prior_candidate_and_finish_rechecks_final_pointer() {
-    let (doc, mut state, begin) = setup(false);
-    let start = press(begin);
-    state.begin_spacing(doc.project(), begin).unwrap();
-    state.move_spacing(start + Vector::new(20., 0.));
-    state.move_spacing(Point::new(f32::NAN, start.y));
-    let paint = state.spacing_paint(begin.stamp().context, 9).unwrap();
-    assert!(matches!(paint.refusal, Some(Refusal::InvalidDelta)));
-    assert_eq!(
-        paint.scene.render_lanes,
-        state
-            .spacing
-            .as_ref()
-            .unwrap()
-            .drag
-            .original_geometry
-            .scene
-            .render_lanes
-    );
-    assert!(matches!(
-        state.finish_spacing(Point::new(f32::NAN, start.y)),
-        Err(Refusal::InvalidDelta)
-    ));
-    assert!(state.spacing_token().is_none());
-}
-
-#[test]
-fn forged_camera_hit_role_and_retired_visit_cannot_capture() {
-    let (doc, mut state, begin) = setup(false);
-    let Event::Begin {
-        stamp,
-        token,
-        target,
-        press_screen,
-        canvas_bounds,
-        scale,
-        pan,
-    } = begin
-    else {
-        unreachable!()
-    };
-    assert!(matches!(
-        state.begin_spacing(
-            doc.project(),
-            Event::Begin {
-                stamp,
-                token,
-                target,
-                press_screen,
-                canvas_bounds,
-                scale: scale * 2.,
-                pan
-            }
-        ),
-        Err(Refusal::CameraChanged)
-    ));
-    assert!(matches!(
-        state.begin_spacing(
-            doc.project(),
-            Event::Begin {
-                stamp,
-                token,
-                target,
-                press_screen: canvas_bounds.center(),
-                canvas_bounds,
-                scale,
-                pan
-            }
-        ),
-        Err(Refusal::TargetNotHit(_))
-    ));
-    state.leave();
-    assert!(matches!(
-        state.begin_spacing(doc.project(), begin),
-        Err(Refusal::InvalidGesture)
-    ));
-}
-
-#[test]
-fn zoomed_out_message_tolerance_matches_actual_canvas_hit() {
-    let (doc, mut state, _) = setup(true);
-    state.presentation.fit = false;
-    state.presentation.zoom = Some(0.25);
-    state.presentation.pan = Vector::ZERO;
-    let context = state
-        .context(
-            state.presentation.identity.unwrap().0,
-            state.owner().unwrap(),
-            doc.revision(),
-            4,
-        )
-        .unwrap();
-    let message = doc
-        .project()
-        .identities()
-        .into_iter()
-        .find(|(_, alias)| *alias == "first")
-        .map(|(id, _)| id)
-        .unwrap();
-    let Event::Begin {
-        stamp,
-        token,
-        target,
-        press_screen,
-        canvas_bounds,
-        scale,
-        pan,
-    } = packet(doc.project(), &state, context, 9, Target::Message(message))
-    else {
-        unreachable!()
-    };
-    let event = Event::Begin {
-        stamp,
-        token,
-        target,
-        press_screen: press_screen + Vector::new(0., 3.),
-        canvas_bounds,
-        scale,
-        pan,
-    };
-    state.begin_spacing(doc.project(), event).unwrap();
-    assert_eq!(state.spacing_token(), Some(token));
-}
-
-#[test]
-fn fractional_screen_packet_preserves_subpixel_motion_in_preview_and_finish() {
-    let (doc, owner, diagram, _, message) = fixture();
-    let original = doc.snapshot();
-    assert!(doc.project().diagrams[&diagram].layout.is_none());
-    let mut state = State::default();
-    let document = Id::new_v4();
-    state.enter_representation(document, owner, Representation::Saved { diagram });
-    state.presentation.viewport = Some(Size::new(900., 600.));
-    state.presentation.fit = false;
-    state.presentation.zoom = Some(0.5);
-    // 406 + 2^-15 puts the press just below the 512 screen-coordinate boundary.
-    state.presentation.pan = Vector::new(0., f32::from_bits(0x43cb_0001));
-    let camera = state.camera_boundary();
-    let context = state.context(document, owner, doc.revision(), 4).unwrap();
-    let baseline = resolve(doc.project(), context.representation, message).unwrap();
-    let line = baseline
-        .scene
-        .lines
-        .iter()
-        .find(|line| line.id == message)
-        .unwrap();
-    assert_eq!(line.points[0].y, 148.);
-    let begin = packet(doc.project(), &state, context, 9, Target::Message(message));
-    let Event::Begin {
-        press_screen,
-        canvas_bounds,
-        scale,
-        pan,
-        ..
-    } = begin
-    else {
-        unreachable!()
-    };
-    assert_eq!(canvas_bounds.y, 23.);
-    assert_eq!(scale, 0.5);
-    assert_eq!(pan.y.to_bits(), 0x43cb_0001);
-    assert_eq!(press_screen.y.to_bits(), 0x43fb_8001); // 503 + 2^-15.
-    let end = press_screen + Vector::new(0., 10.);
-    assert_eq!(end.y, 513.);
-    assert!(canvas_bounds.contains(press_screen) && canvas_bounds.contains(end));
-    // The submitted f32 displacement is 10 - 2^-15, not exactly 10.
-    assert_eq!((end.y - press_screen.y).to_bits(), 0x411f_ffe0);
-    assert_eq!(((end.y - press_screen.y) / scale).to_bits(), 0x419f_ffe0);
-    // Independent oracle: 148 + (10 - 2^-15) / .5 = 168 - 2^-14.
-    let expected_y = f32::from_bits(0x4327_fffc);
-    let mut expected = original.decoded.project.clone();
-    expected.diagrams.get_mut(&diagram).unwrap().layout =
-        Some(oa_core::DiagramLayout::Scenario(oa_core::ScenarioLayout {
-            lanes: vec![],
-            messages: vec![oa_core::ScenarioMessagePosition {
-                address: oa_core::OccurrenceEndpoint {
-                    references: vec![],
-                    occurrence: message,
-                },
-                send_y: expected_y,
-            }],
-        }));
-    state.begin_spacing(doc.project(), begin).unwrap();
-    state.move_spacing(end);
-    let preview = state.spacing.as_ref().unwrap().preview.as_ref().unwrap();
-    assert_eq!(preview.project, expected);
-    let line = preview
-        .geometry
-        .scene
-        .lines
-        .iter()
-        .find(|line| line.id == message)
-        .unwrap();
-    assert_eq!(line.points[0].y.to_bits(), expected_y.to_bits());
-    let Finish::Commit {
-        command,
-        selected,
-        scale,
-        pan,
-    } = state.finish_spacing(end).unwrap()
-    else {
-        panic!("fractional motion must remain a commit")
-    };
-    assert_eq!(selected, message);
-    assert_eq!(scale, 0.5);
-    assert_eq!(pan.y.to_bits(), 0x43cb_0001);
-    let committed = oa_core::execute_batch(doc.project(), &[*command]).unwrap();
-    assert_eq!(committed, expected);
-    assert!(state.spacing_token().is_none());
-    assert_eq!(doc.project(), &original.decoded.project);
-    assert_eq!(doc.compiled().bundle, original.bundle);
-    assert!(!doc.dirty() && !doc.can_undo() && !doc.can_redo());
-    assert!(camera == state.camera_boundary());
-}

crates/oa-desktop/src/behavior/scenario/spacing/controller/timing_tests.rs

@@ -1,304 +0,0 @@
-//! Diagnostic only: production capture/prepare, excluding fixture construction,
-//! oracle work, App source writes, widget rebuilds, text shaping and GPU paint.
-use super::*;
-use crate::document::Document;
-use oa_core::{
-    DiagramLayout, Layer, MessageKind, RelationKind, ScenarioLayout, source_project::ProjectLimits,
-};
-use serde_json::{Value, json};
-use std::{collections::BTreeSet, sync::Arc, time::Instant};
-
-const MESSAGE_COUNT: usize = 1000;
-const TARGET_INDEX: usize = 500;
-
-fn large_fixture() -> (Document, Id, [Id; 3], Vec<Id>, Vec<Id>) {
-    let (seed, owner, a, reporter, first) = super::tests::fixture();
-    let mut p = seed.project().clone();
-    let old_steps = p.elements[&owner].steps().unwrap().clone();
-    let template = p.elements[&first].clone();
-    let work = |alias: &str| {
-        p.identities()
-            .into_iter()
-            .find(|(_, name)| *name == alias)
-            .unwrap()
-            .0
-    };
-    let (source, target) = (work("work"), work("response"));
-    let operator = work("operator");
-    let relation = p.relate(
-        RelationKind::Interaction,
-        "Repeated incident report",
-        source,
-        target,
-    );
-    let mut lanes = vec![];
-    for index in 0..20 {
-        let original = if index < 10 { reporter } else { operator };
-        let mut lane = p.elements[&original].clone();
-        lane.id = Id::new_v4();
-        lane.alias = format!("timing_lane_{index:02}");
-        lane.name = format!("Review participant {index:02}");
-        lanes.push(lane.id);
-        p.elements.insert(lane.id, lane);
-    }
-    p.elements.remove(&reporter);
-    p.elements.remove(&operator);
-    for id in old_steps {
-        p.elements.remove(&id);
-    }
-    let mut messages = vec![];
-    for index in 0..MESSAGE_COUNT {
-        let mut occurrence = template.clone();
-        occurrence.id = Id::new_v4();
-        occurrence.alias = format!("timing_message_{index:04}");
-        occurrence.name = format!("Validate incident report {index:04}");
-        *occurrence.shared_mut().unwrap() = SharedBody::Occurrence {
-            body: OccurrenceBody::Exchange {
-                exchange: Some(relation),
-                sender: Some(lanes[index % 10]),
-                receiver: Some(lanes[10 + index % 10]),
-                message_kind: MessageKind::Asynchronous,
-                operation: None,
-                reply_to: None,
-                values: vec![],
-            },
-            precondition: String::new(),
-            postcondition: String::new(),
-        };
-        messages.push(occurrence.id);
-        p.elements.insert(occurrence.id, occurrence);
-    }
-    *p.elements.get_mut(&owner).unwrap().steps_mut().unwrap() = messages.clone();
-    p.diagrams.get_mut(&a).unwrap().layout = Some(DiagramLayout::Scenario(ScenarioLayout {
-        lanes: lanes
-            .iter()
-            .enumerate()
-            .map(|(i, &lifeline)| ScenarioLanePosition {
-                lifeline,
-                x: 160. + i as f32 * 240.,
-            })
-            .collect(),
-        messages: vec![],
-    }));
-    let mut views = [a, Id::nil(), Id::nil()];
-    for (index, x, offset) in [(1, -500., 12.), (2, 6500., -12.)] {
-        let mut view = p.diagrams[&a].clone();
-        view.id = Id::new_v4();
-        view.alias = format!("timing_saved_{index}");
-        view.name = format!("Review arrangement {index}");
-        view.layout = Some(DiagramLayout::Scenario(ScenarioLayout {
-            lanes: vec![ScenarioLanePosition {
-                lifeline: lanes[0],
-                x,
-            }],
-            messages: vec![ScenarioMessagePosition {
-                address: OccurrenceEndpoint {
-                    references: vec![],
-                    occurrence: messages[TARGET_INDEX],
-                },
-                send_y: 148. + TARGET_INDEX as f32 * 92. + offset,
-            }],
-        }));
-        views[index] = view.id;
-        p.diagrams.insert(view.id, view);
-    }
-    let document = Document::from_project(p, ProjectLimits::default()).unwrap();
-    assert_eq!(
-        document
-            .project()
-            .children(owner)
-            .filter(|e| e.kind() == Kind::Lifeline)
-            .count(),
-        20
-    );
-    assert_eq!(document.project().elements[&owner].layer(), Layer::Oa);
-    assert_eq!(document.project().diagrams.len(), 3);
-    (document, owner, views, lanes, messages)
-}
-
-fn assert_scene(
-    scene: &Scene,
-    lanes: &[Id],
-    messages: &[Id],
-    moved_message: Option<(Id, f32)>,
-    moved_lane: Option<(Id, f32)>,
-) {
-    assert_eq!(scene.render_lanes.len(), 20);
-    assert_eq!(
-        scene
-            .boxes
-            .iter()
-            .filter(|b| b.role == SceneHitRole::LifelineHeader)
-            .count(),
-        20
-    );
-    assert_eq!(scene.lines.len(), MESSAGE_COUNT);
-    assert_eq!(
-        scene
-            .lines
-            .iter()
-            .map(|line| line.id)
-            .collect::<BTreeSet<_>>(),
-        messages.iter().copied().collect::<BTreeSet<_>>()
-    );
-    assert!(scene.activations.is_empty() && scene.open_calls.is_empty());
-    let x = |index: usize| {
-        160. + index as f32 * 240.
-            + moved_lane
-                .filter(|(id, _)| *id == lanes[index])
-                .map_or(0., |(_, delta)| delta)
-    };
-    for (index, &lane) in lanes.iter().enumerate() {
-        assert_eq!(scene.render_lanes[&lane], x(index));
-    }
-    for (index, (line, &id)) in scene.lines.iter().zip(messages).enumerate() {
-        let y = 148.
-            + index as f32 * 92.
-            + moved_message
-                .filter(|(target, _)| *target == id)
-                .map_or(0., |(_, delta)| delta);
-        assert_eq!(line.id, id);
-        assert_eq!(
-            line.points,
-            vec![
-                Point::new(x(index % 10), y),
-                Point::new(x(10 + index % 10), y)
-            ]
-        );
-    }
-}
-
-fn summary(samples: &[Value], phase: &str) -> Value {
-    let mut times: Vec<u64> = samples
-        .iter()
-        .filter(|sample| sample["phase"] == phase)
-        .map(|sample| sample["elapsed_ns"].as_u64().unwrap())
-        .collect();
-    times.sort_unstable();
-    let n = times.len();
-    let median = if n.is_multiple_of(2) {
-        ((u128::from(times[n / 2 - 1]) + u128::from(times[n / 2])) / 2) as u64
-    } else {
-        times[n / 2]
-    };
-    json!({"samples": n, "min_ns": times[0], "median_ns": median, "max_ns": times[n-1]})
-}
-
-#[test]
-#[ignore = "Diagnostic timing only; run alone with --exact --ignored --nocapture after correctness gates; no latency acceptance threshold"]
-fn saved_spacing_capture_prepare_20_lanes_1000_messages_3_views() {
-    let (document, owner, views, lanes, messages) = large_fixture();
-    let original = document.snapshot();
-    let target = messages[TARGET_INDEX];
-    let mut samples = vec![];
-    let mut retained = None;
-    for iteration in 0..4 {
-        let start = Instant::now();
-        let result = capture(document.project(), views[0], Target::Message(target));
-        let elapsed_ns = u64::try_from(start.elapsed().as_nanos()).unwrap();
-        let drag = result.expect("complete asynchronous fixture must resolve");
-        samples.push(json!({"phase":"capture_message", "iteration":iteration,
-            "first_in_probe":iteration==0, "elapsed_ns":elapsed_ns, "outcome":"captured"}));
-        assert_scene(&drag.original_geometry.scene, &lanes, &messages, None, None);
-        if iteration == 0 {
-            retained = Some(drag);
-        }
-    }
-    let drag = retained.unwrap();
-    // Every sample is relative to the original press, including duplicate,
-    // reverse and return-to-start samples. Oracle work is outside each timer.
-    let deltas = [
-        4., 8., 12., 16., 20., 24., 28., 32., 32., 28., 24., 20., 16., 12., 8., 4., -4., -8., -4.,
-        0.,
-    ];
-    for (iteration, delta) in deltas.into_iter().enumerate() {
-        let start = Instant::now();
-        let result = drag.prepare(delta);
-        let elapsed_ns = u64::try_from(start.elapsed().as_nanos()).unwrap();
-        let candidate = result.expect("these isolated asynchronous offsets are feasible");
-        samples.push(json!({"phase":"prepare_message", "iteration":iteration,
-            "delta_world":delta, "elapsed_ns":elapsed_ns, "outcome":if candidate.is_some(){"preview"}else{"noop"}}));
-        if delta == 0. {
-            assert!(candidate.is_none());
-        } else {
-            let candidate = candidate.unwrap();
-            let mut expected = original.decoded.project.clone();
-            let Some(DiagramLayout::Scenario(layout)) =
-                &mut expected.diagrams.get_mut(&views[0]).unwrap().layout
-            else {
-                panic!()
-            };
-            layout.messages.push(ScenarioMessagePosition {
-                address: OccurrenceEndpoint {
-                    references: vec![],
-                    occurrence: target,
-                },
-                send_y: 148. + TARGET_INDEX as f32 * 92. + delta,
-            });
-            assert_eq!(candidate.project, expected);
-            assert_scene(
-                &candidate.geometry.scene,
-                &lanes,
-                &messages,
-                Some((target, delta)),
-                None,
-            );
-        }
-        assert_eq!(
-            document.project().elements[&owner].steps().unwrap(),
-            &messages
-        );
-        assert_eq!(document.project(), &original.decoded.project);
-        assert!(Arc::ptr_eq(&original, &document.snapshot()));
-    }
-    let lane = lanes[10];
-    let start = Instant::now();
-    let result = capture(document.project(), views[0], Target::Lane(lane));
-    let elapsed_ns = u64::try_from(start.elapsed().as_nanos()).unwrap();
-    let drag = result.unwrap();
-    samples.push(json!({"phase":"capture_lane", "iteration":0, "elapsed_ns":elapsed_ns, "outcome":"captured"}));
-    for (iteration, delta) in [20., 40., -20.].into_iter().enumerate() {
-        let start = Instant::now();
-        let result = drag.prepare(delta);
-        let elapsed_ns = u64::try_from(start.elapsed().as_nanos()).unwrap();
-        let candidate = result.unwrap().unwrap();
-        samples.push(json!({"phase":"prepare_lane", "iteration":iteration,
-            "delta_world":delta, "elapsed_ns":elapsed_ns, "outcome":"preview"}));
-        let mut expected = original.decoded.project.clone();
-        let Some(DiagramLayout::Scenario(layout)) =
-            &mut expected.diagrams.get_mut(&views[0]).unwrap().layout
-        else {
-            panic!()
-        };
-        layout.lanes[10].x = 2560. + delta;
-        assert_eq!(candidate.project, expected);
-        assert_scene(
-            &candidate.geometry.scene,
-            &lanes,
-            &messages,
-            None,
-            Some((lane, delta)),
-        );
-    }
-    assert_eq!(document.project(), &original.decoded.project);
-    assert_eq!(document.bundle(), &original.bundle);
-    for view in views {
-        assert_eq!(
-            document.project().diagrams[&view],
-            original.decoded.project.diagrams[&view]
-        );
-    }
-    assert_eq!(document.revision(), 0);
-    assert!(!document.dirty() && !document.can_undo() && !document.can_redo());
-    let report = json!({
-        "schema":"scenario_spacing_timing_v1",
-        "fixture":{"lanes":20,"messages":MESSAGE_COUNT,"saved_views":3,"target_index":TARGET_INDEX,"distinct_message_ids":messages.iter().copied().collect::<BTreeSet<_>>().len()},
-        "profile_context":{"debug_assertions":cfg!(debug_assertions),"os":std::env::consts::OS,"arch":std::env::consts::ARCH,
-            "source_pin_from_runner":std::env::var("SCENARIO_SPACING_SOURCE_PIN").ok(),"source_binary_toolchain_binding":"external gate receipt required"},
-        "summaries":{"capture_message":summary(&samples,"capture_message"),"prepare_message":summary(&samples,"prepare_message"),"capture_lane":summary(&samples,"capture_lane"),"prepare_lane":summary(&samples,"prepare_lane")},
-        "samples":samples,
-        "invariant_status":"passed",
-        "limits":"First capture is first in this probe, not cold OS caches. Timers exclude construction/oracles, prior-preview disposal, source write/history, widget rebuild, label shaping, GPU paint and queued input; no responsiveness acceptance or latency threshold. All messages asynchronous; no nested frame/lifecycle stress."
-    });
-    println!("SPACING_TIMING_JSON={report}");
-}

crates/oa-desktop/src/behavior/scenario/spacing/tests.rs

@@ -1,522 +0,0 @@
-use super::*;
-use crate::behavior::scenario_layout::Diagnostic;
-use crate::document::Document;
-use oa_core::{
-    Diagram, DiagramLayout, ProjectionKind, ScenarioLayout, language, source_project::ProjectLimits,
-};
-
-fn id(project: &Project, alias: &str) -> Id {
-    project
-        .identities()
-        .into_iter()
-        .find(|(_, name)| *name == alias)
-        .unwrap()
-        .0
-}
-
-fn fixture(layout: Option<ScenarioLayout>) -> (Document, Id, Id) {
-    let mut project = language::parse(FIXTURE).unwrap();
-    let owner = id(&project, "conversation");
-    let mut add = |alias: &str, layout: Option<ScenarioLayout>| {
-        let diagram = Id::new_v4();
-        project.diagrams.insert(
-            diagram,
-            Diagram {
-                id: diagram,
-                alias: alias.into(),
-                name: alias.into(),
-                description: String::new(),
-                layer: oa_core::Layer::Oa,
-                projection: ProjectionKind::Scenario { scenario: owner },
-                nodes: Default::default(),
-                routes: vec![],
-                view_options: Default::default(),
-                layout: layout.map(DiagramLayout::Scenario),
-            },
-        );
-        diagram
-    };
-    let a = add("saved_a", layout);
-    let b = add("saved_b", Some(ScenarioLayout::default()));
-    let document = Document::from_project(project, ProjectLimits::default()).unwrap();
-    (document, a, b)
-}
-
-fn resolved(project: &Project, diagram: Id, selected: Id) -> ResolvedScenarioPlan {
-    resolve(project, Representation::Saved { diagram }, selected).unwrap()
-}
-
-fn same_geometry(a: &ResolvedScenarioPlan, b: &ResolvedScenarioPlan) {
-    assert_eq!(a.bounds, b.bounds);
-    assert_eq!(a.lanes, b.lanes);
-    assert_eq!(a.plan.frames, b.plan.frames);
-    assert_eq!(a.plan.scopes, b.plan.scopes);
-    let (a, b) = (&a.scene, &b.scene);
-    assert_eq!(a.rows, b.rows);
-    assert_eq!(a.sequence_bounds, b.sequence_bounds);
-    assert_eq!(a.size, b.size);
-    assert_eq!(a.layout_origin, b.layout_origin);
-    assert_eq!(a.lanes, b.lanes);
-    assert_eq!(a.render_lanes, b.render_lanes);
-    assert_eq!(a.activations, b.activations);
-    assert_eq!(a.lifecycle, b.lifecycle);
-    assert_eq!(a.open_calls, b.open_calls);
-    let slots = |scene: &crate::behavior::Scene| {
-        scene
-            .slots
-            .iter()
-            .map(|item| {
-                (
-                    item.slot.parent,
-                    item.slot.before,
-                    item.y,
-                    item.label.clone(),
-                )
-            })
-            .collect::<Vec<_>>()
-    };
-    assert_eq!(slots(a), slots(b));
-    let lines = |scene: &crate::behavior::Scene| {
-        scene
-            .lines
-            .iter()
-            .map(|line| {
-                (
-                    line.id,
-                    line.points.clone(),
-                    line.label_at,
-                    line.label.clone(),
-                    line.dashed,
-                )
-            })
-            .collect::<Vec<_>>()
-    };
-    let boxes = |scene: &crate::behavior::Scene| {
-        scene
-            .boxes
-            .iter()
-            .map(|item| {
-                (
-                    item.id,
-                    item.rect,
-                    item.title.clone(),
-                    item.detail.clone(),
-                    item.marker,
-                )
-            })
-            .collect::<Vec<_>>()
-    };
-    assert_eq!(lines(a), lines(b));
-    assert_eq!(boxes(a), boxes(b));
-}
-
-fn expected_message(project: &Project, diagram: Id, occurrence: Id, y: f32) -> Project {
-    // Independent expected mutation: tests begin with no message overrides.
-    let mut expected = project.clone();
-    expected.diagrams.get_mut(&diagram).unwrap().layout =
-        Some(DiagramLayout::Scenario(ScenarioLayout {
-            lanes: vec![],
-            messages: vec![ScenarioMessagePosition {
-                address: OccurrenceEndpoint {
-                    references: vec![],
-                    occurrence,
-                },
-                send_y: y,
-            }],
-        }));
-    expected
-}
-
-#[test]
-fn one_repeated_message_moves_in_one_view_with_exact_document_undo_redo_and_reopen() {
-    let (mut document, a, b) = fixture(None);
-    let original = document.snapshot();
-    let before = document.project().clone();
-    let first = id(&before, "first");
-    let second = id(&before, "second");
-    let baseline = resolved(&before, a, second);
-    assert_eq!(baseline.scene.rows[&first].1, 148.);
-    assert_eq!(baseline.scene.rows[&second].1, 240.);
-    let untouched = resolved(&before, b, second);
-    let drag = capture(&before, a, Target::Message(second)).unwrap();
-    let preview = drag.prepare(-40.).unwrap().unwrap();
-    let expected = expected_message(&before, a, second, 200.);
-    assert_eq!(preview.project, expected);
-    assert_eq!(preview.geometry.scene.rows[&first].1, 148.);
-    assert_eq!(preview.geometry.scene.rows[&second].1, 200.);
-    let line = preview
-        .geometry
-        .scene
-        .lines
-        .iter()
-        .find(|line| line.id == second)
-        .unwrap();
-    assert_eq!(line.points.first().unwrap().y, 200.);
-    assert_eq!(line.points.last().unwrap().y, 200.);
-    assert_eq!(
-        preview.geometry.scene.activations,
-        baseline.scene.activations
-    );
-    assert_eq!(preview.geometry.scene.lifecycle, baseline.scene.lifecycle);
-    same_geometry(&resolved(&preview.project, b, second), &untouched);
-    assert_eq!(drag.original, before);
-    assert!(std::sync::Arc::ptr_eq(&original, &document.snapshot()));
-    assert!(!document.can_undo());
-
-    let returned_selection = document.execute(preview.command).unwrap();
-    assert_eq!(
-        returned_selection,
-        Some(a),
-        "controller must preserve the dragged semantic selection separately"
-    );
-    assert_eq!(document.project(), &expected);
-    assert_eq!(document.revision(), 1);
-    let accepted = document.bundle().clone();
-    same_geometry(&resolved(document.project(), a, second), &preview.geometry);
-    assert!(document.undo());
-    assert_eq!(document.project(), &before);
-    assert_eq!(document.bundle(), &original.bundle);
-    assert!(!document.can_undo());
-    assert!(document.redo());
-    assert_eq!(document.project(), &expected);
-    assert_eq!(document.bundle(), &accepted);
-    let reopened = Document::from_bundle(accepted, ProjectLimits::default()).unwrap();
-    assert_eq!(reopened.project(), &expected);
-    same_geometry(&resolved(reopened.project(), a, second), &preview.geometry);
-    assert!(!reopened.dirty() && !reopened.can_undo());
-}
-
-#[test]
-fn horizontal_lane_move_changes_actual_header_and_attached_endpoints_only_in_selected_view() {
-    let (document, a, b) = fixture(None);
-    let before = document.project();
-    let right = id(before, "right");
-    let first = id(before, "first");
-    let other = resolved(before, b, right);
-    let preview = capture(before, a, Target::Lane(right))
-        .unwrap()
-        .prepare(100.)
-        .unwrap()
-        .unwrap();
-    let mut expected = before.clone();
-    expected.diagrams.get_mut(&a).unwrap().layout = Some(DiagramLayout::Scenario(ScenarioLayout {
-        lanes: vec![ScenarioLanePosition {
-            lifeline: right,
-            x: 500.,
-        }],
-        messages: vec![],
-    }));
-    assert_eq!(preview.project, expected);
-    assert_eq!(preview.geometry.scene.lanes[&right], 500.);
-    let header = preview
-        .geometry
-        .scene
-        .boxes
-        .iter()
-        .find(|item| item.id == right)
-        .unwrap();
-    assert_eq!(header.rect.center_x(), 500.);
-    let line = preview
-        .geometry
-        .scene
-        .lines
-        .iter()
-        .find(|line| line.id == first)
-        .unwrap();
-    assert_eq!(line.points.first().unwrap().x, 160.);
-    assert_eq!(line.points.last().unwrap().x, 500.);
-    assert!(line.points.iter().all(|point| point.y == 148.));
-    same_geometry(&resolved(&preview.project, b, right), &other);
-    assert_eq!(document.project(), before);
-    assert!(!document.dirty() && !document.can_undo());
-}
-
-#[test]
-fn drawn_unassigned_lifeline_can_move_without_assigning_a_semantic_participant() {
-    let (document, a, _) = fixture(None);
-    let mut project = document.project().clone();
-    let owner = id(&project, "conversation");
-    let lane = project
-        .add_element(
-            Kind::Lifeline,
-            oa_core::Layer::Oa,
-            "Unassigned header",
-            Some(owner),
-        )
-        .unwrap();
-    let document = Document::from_project(project, ProjectLimits::default()).unwrap();
-    let baseline = resolved(document.project(), a, lane);
-    assert!(!baseline.scene.lanes.contains_key(&lane));
-    let before_header = baseline
-        .scene
-        .boxes
-        .iter()
-        .find(|item| item.id == lane)
-        .unwrap()
-        .rect;
-    let preview = capture(document.project(), a, Target::Lane(lane))
-        .unwrap()
-        .prepare(70.)
-        .unwrap()
-        .unwrap();
-    let after_header = preview
-        .geometry
-        .scene
-        .boxes
-        .iter()
-        .find(|item| item.id == lane)
-        .unwrap()
-        .rect;
-    assert_eq!(after_header.x, before_header.x + 70.);
-    assert_eq!(after_header.y, before_header.y);
-    assert_eq!(after_header.size(), before_header.size());
-    assert_eq!(preview.project.elements, document.project().elements);
-    assert_eq!(preview.project.relations, document.project().relations);
-    assert!(!document.can_undo());
-}
-
-#[test]
-fn self_call_spacing_uses_send_y_and_preserves_reply_and_actual_activation_finish() {
-    let (document, a, _) = fixture(None);
-    let before = document.project();
-    let call = id(before, "call");
-    let reply = id(before, "reply");
-    let baseline = resolved(before, a, call);
-    let preview = capture(before, a, Target::Message(call))
-        .unwrap()
-        .prepare(-22.)
-        .unwrap()
-        .unwrap();
-    assert_eq!(preview.project, expected_message(before, a, call, 310.));
-    let line = preview
-        .geometry
-        .scene
-        .lines
-        .iter()
-        .find(|line| line.id == call)
-        .unwrap();
-    assert_eq!(line.points.first().unwrap().y, 310.);
-    assert_eq!(line.points.last().unwrap().y, 334.);
-    assert_eq!(preview.geometry.scene.rows[&reply].1, 424.);
-    assert_eq!(preview.geometry.scene.activations.len(), 1);
-    let mut expected_activation = baseline.scene.activations.clone();
-    expected_activation[0].rect.y = 334.;
-    expected_activation[0].rect.height = 90.;
-    assert_eq!(preview.geometry.scene.activations, expected_activation);
-    assert_eq!(preview.geometry.scene.lifecycle, baseline.scene.lifecycle);
-}
-
-#[test]
-fn feasible_spacing_crossing_remains_authored_with_diagnostic_and_unchanged_steps() {
-    let (document, a, _) = fixture(None);
-    let before = document.project();
-    let first = id(before, "first");
-    let second = id(before, "second");
-    let owner = id(before, "conversation");
-    let preview = capture(before, a, Target::Message(second))
-        .unwrap()
-        .prepare(-120.)
-        .unwrap()
-        .unwrap();
-    assert_eq!(preview.project, expected_message(before, a, second, 120.));
-    assert_eq!(preview.geometry.scene.rows[&second].1, 120.);
-    assert_eq!(preview.geometry.scene.rows[&first].1, 148.);
-    assert_eq!(
-        preview.project.elements[&owner].steps(),
-        before.elements[&owner].steps()
-    );
-    let shown = crate::behavior::scenario_layout::presentation::present(
-        &preview.project,
-        Representation::Saved { diagram: a },
-        second,
-    );
-    assert!(shown.capabilities().coordinate_input);
-    assert!(
-        shown
-            .diagnostics()
-            .contains(&Diagnostic::SourceOrderCrossing {
-                scope: owner,
-                before: first,
-                after: second
-            })
-    );
-}
-
-#[test]
-fn unsupported_self_call_move_is_refused_and_automatic_fallback_is_not_editable_capture() {
-    let (document, a, _) = fixture(None);
-    let before = document.project();
-    let call = id(before, "call");
-    let drag = capture(before, a, Target::Message(call)).unwrap();
-    let Err(Refusal::Geometry(issues)) = drag.prepare(118.) else {
-        panic!("send450 / receive474 after reply424 must be refused")
-    };
-    assert!(issues.iter().any(|issue| matches!(issue, GeometryIssue::TypedActivationCrossingNotSupported { call: id, .. } if *id == call)));
-    assert_eq!(&drag.original, before);
-    let invalid_geometry = expected_message(before, a, call, 450.);
-    let shown = crate::behavior::scenario_layout::presentation::present(
-        &invalid_geometry,
-        Representation::Saved { diagram: a },
-        call,
-    );
-    assert!(shown.capabilities().geometry_navigation && !shown.capabilities().coordinate_input);
-    assert!(matches!(
-        capture(&invalid_geometry, a, Target::Message(call)),
-        Err(Refusal::Geometry(_))
-    ));
-    assert!(!document.dirty() && !document.can_undo());
-}
-
-#[test]
-fn invalid_view_foreign_identity_and_latent_message_are_not_spacing_targets() {
-    let (document, a, b) = fixture(None);
-    let p = document.project();
-    let unfinished = id(p, "unfinished");
-    let source = id(p, "source");
-    assert!(matches!(
-        capture(p, Id::nil(), Target::Lane(source)),
-        Err(Refusal::InvalidSavedView(_))
-    ));
-    for target in [
-        Target::Lane(source),
-        Target::Lane(b),
-        Target::Message(source),
-        Target::Message(unfinished),
-    ] {
-        assert!(
-            matches!(capture(p, a, target), Err(Refusal::TargetNotRendered(found)) if found == target)
-        );
-    }
-    // A stored latent coordinate is not permission to fabricate a painted arrow.
-    let mut latent = expected_message(p, a, unfinished, 2000.);
-    let foreign_owner = latent
-        .add_element(Kind::Scenario, oa_core::Layer::Oa, "Foreign", None)
-        .unwrap();
-    let foreign_lane = latent
-        .add_element(
-            Kind::Lifeline,
-            oa_core::Layer::Oa,
-            "Foreign lane",
-            Some(foreign_owner),
-        )
-        .unwrap();
-    *latent
-        .elements
-        .get_mut(&foreign_lane)
-        .unwrap()
-        .shared_mut()
-        .unwrap() = SharedBody::Lifeline {
-        represented: Some(source),
-    };
-    let latent_document = Document::from_project(latent, ProjectLimits::default()).unwrap();
-    assert!(matches!(
-        capture(latent_document.project(), a, Target::Message(unfinished)),
-        Err(Refusal::TargetNotRendered(_))
-    ));
-    assert!(matches!(
-        capture(latent_document.project(), a, Target::Lane(foreign_lane)),
-        Err(Refusal::TargetNotRendered(_))
-    ));
-}
-
-#[test]
-fn zero_motion_return_to_start_and_subprecision_preserve_sparse_intent_and_real_redo() {
-    let parsed = language::parse(FIXTURE).unwrap();
-    let left = id(&parsed, "left");
-    let second = id(&parsed, "second");
-    let layouts = [
-        None,
-        Some(ScenarioLayout::default()),
-        Some(ScenarioLayout {
-            lanes: vec![],
-            messages: vec![ScenarioMessagePosition {
-                address: OccurrenceEndpoint {
-                    references: vec![],
-                    occurrence: second,
-                },
-                send_y: 240.,
-            }],
-        }),
-        Some(ScenarioLayout {
-            lanes: vec![ScenarioLanePosition {
-                lifeline: left,
-                x: -0.,
-            }],
-            messages: vec![],
-        }),
-    ];
-    for (index, layout) in layouts.into_iter().enumerate() {
-        let (mut document, a, _) = fixture(layout);
-        let owner = id(document.project(), "conversation");
-        document
-            .execute(Command::Rename(owner, "A real redo entry".into()))
-            .unwrap();
-        let redo = document.snapshot();
-        assert!(document.undo());
-        let before = document.snapshot();
-        let revision = document.revision();
-        let target = if index == 3 {
-            Target::Lane(left)
-        } else {
-            Target::Message(second)
-        };
-        let drag = capture(document.project(), a, target).unwrap();
-        if index == 3 {
-            let Some(DiagramLayout::Scenario(layout)) = &drag.original.diagrams[&a].layout else {
-                panic!()
-            };
-            assert_eq!(layout.lanes[0].x.to_bits(), (-0_f32).to_bits());
-        }
-        assert!(drag.prepare(10.).unwrap().is_some());
-        for delta in [0., -0.] {
-            assert!(drag.prepare(delta).unwrap().is_none());
-        }
-        if index != 3 {
-            assert!(drag.prepare(f32::from_bits(1)).unwrap().is_none());
-        }
-        assert_eq!(
-            serde_json::to_vec(&drag.original).unwrap(),
-            serde_json::to_vec(document.project()).unwrap()
-        );
-        assert!(std::sync::Arc::ptr_eq(&before, &document.snapshot()));
-        assert_eq!(document.bundle(), &before.bundle);
-        assert_eq!(document.revision(), revision);
-        assert!(document.can_redo());
-        assert!(document.redo());
-        assert_eq!(document.project(), &redo.decoded.project);
-        assert_eq!(document.bundle(), &redo.bundle);
-    }
-}
-
-#[test]
-fn malformed_or_out_of_range_motion_cannot_mutate_original() {
-    let (document, a, _) = fixture(None);
-    let drag = capture(
-        document.project(),
-        a,
-        Target::Message(id(document.project(), "second")),
-    )
-    .unwrap();
-    for delta in [f32::NAN, f32::INFINITY, f32::NEG_INFINITY] {
-        assert!(matches!(drag.prepare(delta), Err(Refusal::InvalidDelta)));
-    }
-    assert!(matches!(drag.prepare(f32::MAX), Err(Refusal::Command(_))));
-    assert_eq!(&drag.original, document.project());
-    assert!(!document.dirty() && !document.can_undo());
-}
-
-const FIXTURE: &str = r#"arcadia 7;
-project spacing_probe "Saved spacing probe" id "71000000-0000-4000-8000-000000000001" {
- oa_activity source "Source" id "71000000-0000-4000-8000-000000000002" {}
- oa_activity target "Target" id "71000000-0000-4000-8000-000000000003" {}
- interaction exchange "Repeated exchange" id "71000000-0000-4000-8000-000000000004" { source @source; target @target; }
- oa_scenario conversation "Conversation" id "71000000-0000-4000-8000-000000000005" { viewpoint OperationalActivity; steps [@first, @second, @call, @reply, @unfinished]; }
- oa_lifeline left "Left" id "71000000-0000-4000-8000-000000000006" { parent @conversation; represented @source; }
- oa_lifeline right "Right" id "71000000-0000-4000-8000-000000000007" { parent @conversation; represented @target; }
- oa_occurrence first "First" id "71000000-0000-4000-8000-000000000008" { parent @conversation; body { Exchange { exchange @exchange; sender @left; receiver @right; message_kind Asynchronous; }; }; }
- oa_occurrence second "Second" id "71000000-0000-4000-8000-000000000009" { parent @conversation; body { Exchange { exchange @exchange; sender @left; receiver @right; message_kind Asynchronous; }; }; }
- oa_occurrence call "Call" id "71000000-0000-4000-8000-00000000000a" { parent @conversation; body { Exchange { exchange none; sender @right; receiver @right; message_kind Call; }; }; }
- oa_occurrence reply "Reply" id "71000000-0000-4000-8000-00000000000b" { parent @conversation; body { Exchange { exchange none; sender @right; receiver @right; message_kind Reply; reply_to @call; }; }; }
- oa_occurrence unfinished "Unfinished" id "71000000-0000-4000-8000-00000000000c" { parent @conversation; body { Exchange { exchange @exchange; sender @left; receiver none; message_kind Asynchronous; }; }; }
-}
-"#;

crates/oa-desktop/src/behavior/scenario/usage.rs

@@ -1,6 +1,5 @@
 //! Navigation is derived from the same opaque-reference scene that is painted.
 use super::*;
-use crate::behavior::scenario_layout::{Representation, presentation};
 use crate::diagram_usage::{Surface, Target, Usage};
 
 /// The renderer collapses whitespace before shortening. Require at least one
@@ -23,14 +22,7 @@ fn label_field_visible(full: &str, prefix: &str, value: &str) -> bool {
     start < retained
 }
 
-fn usages(
-    p: &Project,
-    owner: Id,
-    subject: Id,
-    surface: Surface,
-    bounds: Rectangle,
-    scene: &Scene,
-) -> Vec<Usage> {
+fn usages(p: &Project, owner: Id, subject: Id, scene: &Scene) -> Vec<Usage> {
     let mut result = Vec::new();
     let mut add = |id, bounds, role: &str| {
         // Activation bars share the occurrence identity with a labelled message;
@@ -41,7 +33,7 @@ fn usages(
         {
             result.push(Usage {
                 subject,
-                surface,
+                surface: Surface::Scenario(owner),
                 target: Target::ScenarioObject(id),
                 role: role.into(),
                 bounds,
@@ -145,15 +137,15 @@ fn usages(
             }
         }
     }
-    if subject == owner || subject == surface.id() {
+    if subject == owner {
         result.insert(
             0,
             Usage {
                 subject,
-                surface,
+                surface: Surface::Scenario(owner),
                 target: Target::Whole,
                 role: "scenario".into(),
-                bounds,
+                bounds: Rectangle::new(Point::ORIGIN, scene.size),
             },
         );
     }
@@ -161,29 +153,15 @@ fn usages(
 }
 
 impl State {
-    /// Membership comes from the complete presentation chosen for this exact view,
-    /// including automatic fallback geometry while retaining its Saved identity.
-    pub(crate) fn representation_usages(
-        &self,
-        p: &Project,
-        representation: Representation,
-        subject: Id,
-    ) -> Vec<Usage> {
-        let shown = presentation::present(p, representation, subject);
-        let (Some(owner), Some(bounds), Some(scene)) =
-            (shown.owner(), shown.bounds(), shown.scene())
-        else {
-            return vec![];
-        };
-        let surface = match representation {
-            Representation::Derived { owner } => Surface::Scenario(owner),
-            Representation::Saved { diagram } => Surface::Saved(diagram),
-        };
-        usages(p, owner, subject, surface, bounds, scene)
-    }
-
     pub(crate) fn diagram_usages(&self, p: &Project, owner: Id, subject: Id) -> Vec<Usage> {
-        self.representation_usages(p, Representation::Derived { owner }, subject)
+        if !p
+            .elements
+            .get(&owner)
+            .is_some_and(|e| e.kind() == Kind::Scenario)
+        {
+            return vec![];
+        }
+        usages(p, owner, subject, &Scene::sequence(p, owner, subject))
     }
 
     pub(crate) fn reveal_usage(
@@ -193,24 +171,12 @@ impl State {
         owner: Id,
         target: &Target,
     ) -> bool {
-        self.reveal_representation_usage(
-            p,
-            document,
-            owner,
-            Representation::Derived { owner },
-            target,
-        )
-    }
-
-    pub(crate) fn reveal_representation_usage(
-        &mut self,
-        p: &Project,
-        document: Id,
-        owner: Id,
-        representation: Representation,
-        target: &Target,
-    ) -> bool {
-        if self.draft.is_some() || presentation::checked_owner(p, representation) != Some(owner) {
+        if self.draft.is_some()
+            || !p
+                .elements
+                .get(&owner)
+                .is_some_and(|e| e.kind() == Kind::Scenario)
+        {
             return false;
         }
         let id = match target {
@@ -219,7 +185,7 @@ impl State {
             _ => return false,
         };
         let Some(usage) = self
-            .representation_usages(p, representation, id)
+            .diagram_usages(p, owner, id)
             .into_iter()
             .find(|u| &u.target == target)
         else {
@@ -227,29 +193,11 @@ impl State {
         };
         // Preserve an existing mounted viewport across enter's owner reset.
         let viewport = self.presentation.viewport.unwrap_or(Size::new(500., 300.));
-        if !viewport.width.is_finite()
-            || !viewport.height.is_finite()
-            || viewport.width <= 0.
-            || viewport.height <= 0.
-        {
-            return false;
-        }
-        let (zoom, pan) = if matches!(target, Target::Whole) {
-            let Some(camera) = super::camera::fit(usage.bounds, viewport) else {
-                return false;
-            };
-            (None, camera.pan)
-        } else {
-            let (zoom, pan) = crate::diagram_usage::camera_for(target, usage.bounds, viewport);
-            if !zoom.is_finite() || !pan.x.is_finite() || !pan.y.is_finite() {
-                return false;
-            }
-            (Some(zoom), pan)
-        };
-        self.enter_representation(document, owner, representation);
+        self.enter(document, owner);
         self.presentation.viewport = Some(viewport);
         self.canvas_tool = Some((owner, CanvasTool::Select));
-        self.presentation.zoom(zoom);
+        let (zoom, pan) = crate::diagram_usage::camera_for(target, usage.bounds, viewport);
+        self.presentation.zoom(Some(zoom));
         self.presentation.pan = pan;
         true
     }

crates/oa-desktop/src/behavior/scenario/usage/tests.rs

@@ -10,10 +10,10 @@ fn add_occurrence(p: &mut Project, owner: Id, name: &str, body: OccurrenceBody)
         precondition: String::new(),
         postcondition: String::new(),
     };
-    if let Some(steps) = p.elements.get_mut(&owner).unwrap().steps_mut()
-        && !steps.contains(&id)
-    {
-        steps.push(id);
+    if let Some(steps) = p.elements.get_mut(&owner).unwrap().steps_mut() {
+        if !steps.contains(&id) {
+            steps.push(id);
+        }
     }
     id
 }

crates/oa-desktop/src/behavior/scenario/workspace.rs

@@ -13,8 +13,6 @@ pub enum Shelf {
 #[derive(Clone, Default)]
 pub(super) struct Presentation {
     pub(super) identity: Option<(Id, Id)>,
-    pub(super) representation: Option<Representation>,
-    pub(super) visit: Id,
     pub(super) viewport: Option<Size>,
     pub(super) focused: bool,
     pub(super) shelf: Option<Shelf>,
@@ -22,6 +20,7 @@ pub(super) struct Presentation {
     pub(super) zoom: Option<f32>,
     pub(super) fit: bool,
 }
+const MIN_SCALE: f32 = 0.05;
 impl Presentation {
     pub(super) fn viewport(&mut self, size: Size) -> bool {
         if !size.width.is_finite()
@@ -36,26 +35,29 @@ impl Presentation {
         true
     }
     pub(super) fn zoom(&mut self, scale: Option<f32>) -> bool {
-        camera::set_zoom(&mut self.pan, &mut self.zoom, &mut self.fit, scale)
+        if scale.is_some_and(|value| !value.is_finite() || value <= 0.) {
+            return false;
+        }
+        let next = scale.map(|value| value.clamp(MIN_SCALE, 3.));
+        let changed = self.zoom != next || self.fit != scale.is_none();
+        self.zoom = next;
+        self.fit = scale.is_none();
+        changed
     }
-    pub(super) fn camera(&self, bounds: Rectangle) -> camera::Camera {
-        camera::effective_camera(self.pan, self.zoom, self.fit, self.viewport, bounds)
+    fn fit_scale(&self, scene: Size) -> Option<f32> {
+        let viewport = self.viewport?;
+        // Fit uses the actual mounted viewport with a small visual gutter.
+        Some(
+            ((viewport.width - 16.).max(1.) / scene.width.max(1.))
+                .min((viewport.height - 16.).max(1.) / scene.height.max(1.)),
+        )
     }
-    // Legacy tests call size-only scale; actual display always passes full bounds.
-    #[cfg(test)]
-    pub(super) fn scale(&self, size: Size) -> f32 {
-        self.camera(Rectangle::new(Point::ORIGIN, size)).scale
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-struct ArrangementChoice {
-    representation: Representation,
-    label: String,
-}
-impl std::fmt::Display for ArrangementChoice {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&self.label)
+    pub(super) fn scale(&self, scene: Size) -> f32 {
+        if self.fit {
+            self.fit_scale(scene).unwrap_or(1.).clamp(MIN_SCALE, 1.)
+        } else {
+            self.zoom.unwrap_or(1.)
+        }
     }
 }
 
@@ -67,136 +69,43 @@ pub fn view<'a>(app: &'a App, owner: Id, out: Column<'a, Message>) -> Element<'a
         .draft
         .as_ref()
         .is_some_and(|draft| draft.owner == owner);
-    let Some(context) = app.scenario_context() else {
-        return column![
-            out,
-            text("Scenario view is unavailable."),
-            button("Open selected source").on_press(Message::SourceForSelection)
-        ]
-        .spacing(8)
-        .into();
-    };
+    let context = app.scenario_context().expect("visible scenario context");
     let tool = state.canvas_tool(owner);
     let clean = !app.behavior.has_pending() && !app.draft_dirty() && !app.source_dirty();
-    // Resolve once per accepted view. An active spacing session owns its exact
-    // prepared geometry; borrowing it also retains the canvas input state.
-    let preview = state.spacing_paint(context, app.camera_epoch);
-    let shown = preview
-        .is_none()
-        .then(|| presentation::present(p, context.representation, app.selected));
-    let capabilities = shown.as_ref().map_or(
-        presentation::PresentationCapabilities {
-            geometry_navigation: true,
-            coordinate_input: true,
-        },
-        ScenarioPresentation::capabilities,
-    );
-    let coordinate_input = clean && capabilities.coordinate_input;
-    let notice = if let Some(paint) = &preview {
-        display_notice_parts(
-            p,
-            context.representation,
-            &presentation::PresentationStatus::Ready,
-            paint.original_diagnostics,
-            paint.original_latent,
-        )
-    } else {
-        display_notice(p, shown.as_ref().expect("normal presentation"))
-    };
-    let camera_state = preview
-        .as_ref()
-        .map(|paint| camera::Camera {
-            scale: paint.scene.scale,
-            pan: paint.scene.camera_pan,
-        })
-        .or_else(|| {
-            shown
-                .as_ref()
-                .and_then(ScenarioPresentation::bounds)
-                .map(|bounds| presentation.camera(bounds))
-        });
-    let scale = camera_state.map_or(1., |camera| camera.scale);
+    let mut scene = Scene::sequence(p, owner, app.selected);
+    let scale = presentation.scale(scene.size);
+    scene.scale = scale;
+    scene.camera_pan = presentation.pan;
+    scene.interaction = Some((context, tool, clean));
+    scene.pending_placement = state.pending_placement(owner);
     let scope = super::super::canvas_workspace::Scope {
         document: context.document,
         owner,
         revision: context.revision,
         epoch: app.camera_epoch,
-        scenario_view: Some((context.representation, context.visit)),
     };
-    let keyboard = clean
-        && capabilities.geometry_navigation
-        && super::super::canvas_workspace::keyboard_enabled(app);
+    let keyboard = clean && super::super::canvas_workspace::keyboard_enabled(app);
     let camera = move |e| Message::ScenarioCanvas(CanvasEvent::Camera(context, scope.epoch, e));
-    let raw_canvas: Option<Element<'a, Message>> = if let Some(paint) = &preview {
-        Some(
-            canvas::Canvas::new(paint.scene)
-                .width(Fill)
-                .height(Fill)
-                .into(),
-        )
-    } else if let Some(mut scene) = shown.and_then(ScenarioPresentation::into_scene) {
-        let camera_state = camera_state.expect("displayed Scene has complete bounds");
-        scene.scale = camera_state.scale;
-        scene.camera_pan = camera_state.pan;
-        scene.interaction = Some((context, tool, clean));
-        scene.spacing_stamp = (coordinate_input
-            && !app.source_rename.open()
-            && keyboard
-            && matches!(context.representation, Representation::Saved { .. }))
-        .then_some(spacing::Stamp {
-            context,
-            camera_epoch: app.camera_epoch,
-        });
-        scene.coordinate_input = capabilities.coordinate_input;
-        scene.pending_placement = coordinate_input
-            .then(|| state.pending_placement(owner))
-            .flatten();
-        Some(canvas::Canvas::new(scene).width(Fill).height(Fill).into())
-    } else {
-        None
-    };
-    let canvas: Element<'a, Message> = if let Some(raw_canvas) = raw_canvas {
-        // Keep this Stack in both branches: replacing the Canvas with a wrapper
-        // on Begin would discard its pointer capture before Move/Finish.
-        let mut layers = iced::widget::stack![raw_canvas];
-        if let Some(paint) = &preview {
-            let feedback = spacing_feedback(p, paint.refusal, paint.diagnostics);
-            layers = layers.push(
-                container(
-                    container(text(feedback).size(12))
-                        .padding(6)
-                        .width(Fill)
-                        .style(style::card),
-                )
-                .width(Fill)
-                .align_bottom(Fill)
-                .padding(8),
-            );
-        }
-        container(
-            sensor(
-                super::super::canvas_workspace::Viewport::new(
-                    layers, scope, scale, keyboard, camera,
-                )
-                .pan_background(tool == CanvasTool::Select || !capabilities.coordinate_input),
+    let canvas = container(
+        sensor(
+            super::super::canvas_workspace::Viewport::new(
+                canvas::Canvas::new(scene).width(Fill).height(Fill),
+                scope,
+                scale,
+                keyboard,
+                camera,
             )
-            .key((
-                context.document,
-                format!("{:?}", context.representation),
-                context.visit,
-            ))
-            .on_show(move |size| Message::ScenarioCanvas(CanvasEvent::Viewport(context, size)))
-            .on_resize(move |size| Message::ScenarioCanvas(CanvasEvent::Viewport(context, size))),
+            .pan_background(tool == CanvasTool::Select),
         )
-        .id("scenario-viewport")
-        .width(Fill)
-        .height(Fill)
-        .style(style::card)
-        .into()
-    } else {
-        container(text("No supported canvas geometry is available. Inspect the model or open its source to repair this view."))
-            .id("scenario-viewport-unavailable").padding(16).width(Fill).height(Fill).style(style::card).into()
-    };
+        .key((context.document, owner))
+        .on_show(move |size| Message::ScenarioCanvas(CanvasEvent::Viewport(context, size)))
+        .on_resize(move |size| Message::ScenarioCanvas(CanvasEvent::Viewport(context, size))),
+    )
+    .id("scenario-viewport")
+    .width(Fill)
+    .height(Fill)
+    .style(style::card)
+    .into();
     let mut navigation = row![
         out.width(Fill),
         super::super::canvas_workspace::Control::new(
@@ -232,54 +141,9 @@ pub fn view<'a>(app: &'a App, owner: Id, out: Column<'a, Message>) -> Element<'a
                 clean.then_some(Message::ScenarioCanvas(CanvasEvent::Back(context))),
             ));
     }
-    let mut header = column![navigation, notice].spacing(4);
-    let saved_views = p
-        .diagrams
-        .values()
-        .filter(|diagram| {
-            presentation::checked_owner(
-                p,
-                Representation::Saved {
-                    diagram: diagram.id,
-                },
-            ) == Some(owner)
-        })
-        .map(|diagram| ArrangementChoice {
-            representation: Representation::Saved {
-                diagram: diagram.id,
-            },
-            label: short(&diagram.name, 64),
-        })
-        .collect::<Vec<_>>();
-    if !saved_views.is_empty() {
-        let mut choices = vec![ArrangementChoice {
-            representation: Representation::Derived { owner },
-            label: "Automatic arrangement".into(),
-        }];
-        choices.extend(saved_views);
-        let selected = choices
-            .iter()
-            .find(|choice| choice.representation == context.representation)
-            .cloned();
-        header = header.push(
-            container(
-                pick_list(choices, selected, move |choice: ArrangementChoice| {
-                    Message::ScenarioCanvas(CanvasEvent::Representation(
-                        context,
-                        choice.representation,
-                    ))
-                })
-                .placeholder("Choose arrangement")
-                .text_size(12)
-                .padding(5)
-                .width(Fill),
-            )
-            .width(Fill)
-            .id("scenario-arrangement-picker"),
-        );
-    }
-    if capabilities.geometry_navigation {
-        header = header.push(super::super::canvas_workspace::controls(
+    let header = column![
+        navigation,
+        super::super::canvas_workspace::controls(
             scope,
             keyboard,
             scale,
@@ -287,22 +151,15 @@ pub fn view<'a>(app: &'a App, owner: Id, out: Column<'a, Message>) -> Element<'a
             clean.then_some(Message::ScenarioCanvas(CanvasEvent::Camera(
                 context,
                 scope.epoch,
-                super::super::canvas_workspace::Event::Focus,
+                super::super::canvas_workspace::Event::Focus
             ))),
             move |zoom| Message::ScenarioCanvas(CanvasEvent::Zoom(context, zoom)),
-            camera,
-        ));
-    }
+            camera
+        )
+    ]
+    .spacing(4);
     let entries = [
-        (
-            "S",
-            if matches!(context.representation, Representation::Saved { .. }) {
-                "Select / move messages and lifelines"
-            } else {
-                "Select / reorder occurrences"
-            },
-            CanvasTool::Select,
-        ),
+        ("S", "Select / reorder occurrences", CanvasTool::Select),
         (
             "L",
             "Lifeline: click to choose represented work or participant",
@@ -369,21 +226,16 @@ pub fn view<'a>(app: &'a App, owner: Id, out: Column<'a, Message>) -> Element<'a
                 glyph,
                 label,
                 choice == tool,
-                (clean && (choice == CanvasTool::Select || capabilities.coordinate_input))
-                    .then_some(Message::ScenarioCanvas(CanvasEvent::Choose(
-                        context, choice,
-                    ))),
+                clean.then_some(Message::ScenarioCanvas(CanvasEvent::Choose(
+                    context, choice,
+                ))),
             )
         }),
     );
     let mut details = column![
         text(format!("Selected: {}", p.named(app.selected))).size(12),
-        container(button(text("Properties").size(12)).on_press_maybe(
-            (clean && properties_target(p, context, app.selected)).then_some(
-                Message::ScenarioCanvas(CanvasEvent::Properties(context, app.selected)),
-            ),
-        ))
-        .id("scenario-properties")
+        button(text("Properties").size(12))
+            .on_press_maybe(clean.then_some(Message::EditProperties(app.selected)))
     ]
     .spacing(6);
     if referenced_scenario(p, owner, app.selected).is_some() {
@@ -394,10 +246,6 @@ pub fn view<'a>(app: &'a App, owner: Id, out: Column<'a, Message>) -> Element<'a
             ))),
         ));
     }
-    details = details.push(text("Scenario order").size(13));
-    if matches!(context.representation, Representation::Saved { .. }) {
-        details = details.push(text("↑ and ↓ change the shared Scenario order. Saved message positions are retained; automatically placed items may move.").size(11));
-    }
     let details = details_pane(
         context,
         state.scroll_restore(context, ScrollArea::Page),
@@ -727,153 +575,6 @@ pub fn view<'a>(app: &'a App, owner: Id, out: Column<'a, Message>) -> Element<'a
     super::super::canvas_workspace::host(header.into(), palette, canvas, editor)
 }
 
-fn display_notice<'a>(p: &Project, shown: &ScenarioPresentation) -> Element<'a, Message> {
-    display_notice_parts(
-        p,
-        shown.requested(),
-        shown.status(),
-        shown.diagnostics(),
-        shown.latent_messages(),
-    )
-}
-
-fn display_notice_parts<'a>(
-    p: &Project,
-    requested: Representation,
-    status: &presentation::PresentationStatus,
-    diagnostics: &[super::super::scenario_layout::Diagnostic],
-    latent_messages: &[Id],
-) -> Element<'a, Message> {
-    use super::super::scenario_layout::{Diagnostic, presentation::PresentationStatus};
-    let title = match requested {
-        Representation::Saved { diagram } => p.diagrams.get(&diagram).map_or_else(
-            || "Unavailable saved Scenario view".into(),
-            |view| format!("Saved view · {}", view.name),
-        ),
-        Representation::Derived { owner } => format!("Automatic view · {}", p.named(owner)),
-    };
-    let mut notice = column![text(title).size(14)].spacing(4);
-    match status {
-        PresentationStatus::Ready => {
-            for diagnostic in diagnostics.iter().take(3) {
-                let explanation = match diagnostic {
-                    Diagnostic::SourceOrderCrossing { before, after, .. } => format!(
-                        "Saved spacing places '{}' below '{}'. The Scenario order is unchanged.",
-                        p.named(*before),
-                        p.named(*after)
-                    ),
-                    Diagnostic::FrameExtendsPastFollowingAnchor { frame, following } => format!(
-                        "Saved spacing makes '{}' overlap '{}'. Both keep their saved positions.",
-                        p.named(*frame),
-                        p.named(*following)
-                    ),
-                };
-                notice = notice.push(text(explanation).size(12));
-            }
-            if diagnostics.len() > 3 {
-                notice = notice.push(
-                    text(format!(
-                        "{} additional spacing notices are retained.",
-                        diagnostics.len() - 3
-                    ))
-                    .size(12),
-                );
-            }
-        }
-        PresentationStatus::Fallback { requested_issues } => {
-            notice = notice.push(text("Showing the complete automatic arrangement because the saved positions cannot currently be displayed. Saved positions are preserved.").size(12));
-            if let Some(issue) = requested_issues.first() {
-                notice = notice.push(text(geometry_problem(p, issue)).size(12));
-            }
-            notice = notice.push(text("Selection, navigation and Fit remain available. Canvas insertion and reordering are unavailable until the saved positions are repaired.").size(12));
-        }
-        PresentationStatus::Unavailable { .. } => {
-            notice = notice.push(text("This view is unavailable. Its identity or automatic geometry cannot be resolved; the model and source remain available for inspection and repair.").size(12));
-        }
-    }
-    if !latent_messages.is_empty() {
-        notice = notice.push(text(format!("{} unfinished message position(s) are retained until their endpoints are complete.", latent_messages.len())).size(12));
-    }
-    notice = notice.push(button("Open selected source").on_press(Message::SourceForSelection));
-    container(notice)
-        .id("scenario-display-notice")
-        .padding(6)
-        .width(Fill)
-        .into()
-}
-
-fn spacing_feedback(
-    p: &Project,
-    refusal: Option<&spacing::Refusal>,
-    diagnostics: &[super::super::scenario_layout::Diagnostic],
-) -> String {
-    if let Some(refusal) = refusal {
-        let reason = match refusal {
-            spacing::Refusal::Geometry(issues) => issues
-                .first()
-                .map(|issue| geometry_problem(p, issue))
-                .unwrap_or_else(|| "This position cannot be displayed.".into()),
-            spacing::Refusal::Command(error) => error.clone(),
-            _ => "This position is unavailable in the current view.".into(),
-        };
-        return format!(
-            "Position unavailable · {reason} Move back to a supported position, or release to cancel."
-        );
-    }
-    let explanation = match diagnostics.first() {
-        Some(super::super::scenario_layout::Diagnostic::SourceOrderCrossing {
-            before,
-            after,
-            ..
-        }) => format!(
-            " '{}' is below '{}'; Scenario order stays unchanged.",
-            p.named(*before),
-            p.named(*after)
-        ),
-        Some(super::super::scenario_layout::Diagnostic::FrameExtendsPastFollowingAnchor {
-            frame,
-            following,
-        }) => format!(" '{}' overlaps '{}'.", p.named(*frame), p.named(*following)),
-        None => " Scenario order stays unchanged.".into(),
-    };
-    format!("Spacing preview · Release to finish; Escape cancels.{explanation}")
-}
-
-fn geometry_problem(p: &Project, issue: &super::super::scenario_layout::GeometryIssue) -> String {
-    use super::super::scenario_layout::GeometryIssue;
-    match issue {
-        GeometryIssue::TypedActivationCrossingNotSupported { call, event } => format!(
-            "The position of '{}' conflicts with the execution of '{}'.",
-            p.named(*event),
-            p.named(*call)
-        ),
-        GeometryIssue::CoincidentDistinctEndpoints(message) => format!(
-            "The distinct endpoints of '{}' have the same horizontal position.",
-            p.named(*message)
-        ),
-        GeometryIssue::TypedActivationOutsideLifetime { call, .. }
-        | GeometryIssue::TypedActivationOutsideScope { call, .. } => format!(
-            "The position of '{}' falls outside its supported execution interval.",
-            p.named(*call)
-        ),
-        GeometryIssue::FixedFrameHeaderWouldMove { frame } => format!(
-            "The saved spacing would move the fixed header of '{}'.",
-            p.named(*frame)
-        ),
-        GeometryIssue::OperandScopeOutsideEnclosingInterval { operand, .. } => format!(
-            "The spacing of '{}' extends outside its enclosing frame.",
-            p.named(*operand)
-        ),
-        GeometryIssue::LifecycleGeometryNotSupported { .. }
-        | GeometryIssue::LifecycleAnchorOutsideRenderScope { .. }
-        | GeometryIssue::LifetimeInversionNotSupported { .. } => {
-            "The saved spacing cannot preserve the participant lifetime geometry.".into()
-        }
-        _ => "These saved positions are outside the geometry currently supported by the canvas."
-            .into(),
-    }
-}
-
 fn sequence_action<'a>(
     title: &str,
     message: Message,
@@ -930,12 +631,6 @@ fn editor_panel<'a, R: iced::advanced::text::Renderer + 'a>(
 #[cfg(all(test, debug_assertions))]
 mod tests;
 
-#[cfg(all(test, debug_assertions))]
-mod spacing_tests;
-
-#[cfg(all(test, debug_assertions))]
-mod details_tests;
-
 fn sequence_rows<'a>(
     p: &'a Project,
     context: Context,

crates/oa-desktop/src/behavior/scenario/workspace/details_tests.rs

@@ -1,443 +0,0 @@
-//! Mounted Scenario Details → inspector regression and retained-intent guards.
-use super::*;
-use crate::behavior::canvas_workspace::tests::Mounted;
-use crate::behavior::scenario_layout::resolve;
-use iced::advanced::widget;
-use iced::{Vector, keyboard};
-use std::sync::Arc;
-
-const FIXTURE: &str = include_str!("../../../app/diagram_usages/tests/saved_scenario.arcadia");
-
-fn id(app: &App, alias: &str) -> Id {
-    app.project()
-        .identities()
-        .into_iter()
-        .find(|(_, name)| *name == alias)
-        .unwrap()
-        .0
-}
-fn send(app: &mut App, event: impl FnOnce(Context) -> CanvasEvent) {
-    let context = app.scenario_context().unwrap();
-    let _ = app.update(Message::ScenarioCanvas(event(context)));
-}
-fn setup() -> (App, Id, Id) {
-    let mut app = App::with_project(oa_core::language::parse(FIXTURE).unwrap());
-    let owner = id(&app, "incident_response");
-    let diagram = id(&app, "incident_readable");
-    let message = id(&app, "initial_report");
-    let _ = app.update(Message::Select(owner));
-    let _ = app.update(Message::Diagram(crate::app::Choice {
-        id: diagram,
-        label: "A".into(),
-    }));
-    send(&mut app, |c| CanvasEvent::Select(c, message));
-    app.window_size = Size::new(1440., 1000.);
-    (app, diagram, message)
-}
-fn open_focused_details(app: &mut App) {
-    if !app.behavior.scenario.focused() {
-        send(app, CanvasEvent::Focus);
-    }
-    if app.behavior.scenario.presentation.shelf.is_none() {
-        send(app, |c| CanvasEvent::Shelf(c, Shelf::Selection));
-    }
-}
-fn stored_camera(app: &App) -> (Vector, Option<f32>, bool) {
-    let p = &app.behavior.scenario.presentation;
-    (p.pan, p.zoom, p.fit)
-}
-
-#[tokio::test]
-async fn focused_saved_details_opens_real_editable_inspector_and_returns_to_same_view() {
-    let (mut app, diagram, message) = setup();
-    let _ = app.update(Message::InspectorTab(
-        crate::navigation::InspectorTab::Connections,
-    ));
-    let mut mounted = Mounted::new(&mut app).await;
-    open_focused_details(&mut app);
-    mounted.settle(&mut app).await;
-    let before = mounted.geometry(&app);
-    assert!(!before.scrolls.contains_key(&widget::Id::new("inspector")));
-    let (details, offset) = before.scrolls[&widget::Id::new("scenario-details")];
-    let button = before.bounds("scenario-properties").center() - offset;
-    assert!(
-        details.contains(button),
-        "Properties must be actually visible"
-    );
-    let context = app.scenario_context().unwrap();
-    let camera = stored_camera(&app);
-    let original = app.document.snapshot();
-    let bundle = app.document.bundle().clone();
-    let messages = mounted.click(&mut app, button).await;
-    assert!(messages.iter().any(|event| matches!(event,
-        Message::ScenarioCanvas(CanvasEvent::Properties(c, selected))
-        if *c == context && *selected == message)));
-    mounted.settle(&mut app).await;
-    assert!(!app.behavior.scenario.focused());
-    assert!(app.behavior.scenario.presentation.shelf.is_none());
-    assert_eq!(
-        app.inspector_tab,
-        crate::navigation::InspectorTab::Properties
-    );
-    assert_eq!(app.selected, message);
-    assert_eq!(app.active_diagram, Some(diagram));
-    assert_eq!(app.page, crate::app::Page::Behavior);
-    let current = app.scenario_context().unwrap();
-    assert_eq!(current.representation, context.representation);
-    assert_eq!(current.visit, context.visit);
-    assert_eq!(
-        stored_camera(&app),
-        camera,
-        "restoring panels retains camera intent"
-    );
-    assert!(Arc::ptr_eq(&original, &app.document.snapshot()));
-    assert_eq!(app.document.bundle(), &bundle);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-
-    let shown = mounted.geometry(&app);
-    assert!(
-        !shown
-            .scrolls
-            .contains_key(&widget::Id::new("scenario-details"))
-    );
-    let (inspector, offset) = shown.scrolls[&widget::Id::new("inspector")];
-    assert!(inspector.width > 250. && inspector.height > 500.);
-    // Production Properties places Name before the other scalar text inputs.
-    // Account for the retained inspector scroll, rather than clicking content coordinates.
-    let input = shown
-        .text_inputs
-        .iter()
-        .map(|bounds| bounds.center() - offset)
-        .filter(|point| inspector.contains(*point))
-        .min_by(|a, b| a.y.total_cmp(&b.y))
-        .expect("visible editable property");
-    mounted.click(&mut app, input).await;
-    let typed = mounted
-        .batch(
-            &mut app,
-            &[iced::Event::Keyboard(keyboard::Event::KeyPressed {
-                key: keyboard::Key::Character("x".into()),
-                modified_key: keyboard::Key::Character("x".into()),
-                physical_key: keyboard::key::Physical::Unidentified(
-                    keyboard::key::NativeCode::Unidentified,
-                ),
-                location: keyboard::Location::Standard,
-                modifiers: keyboard::Modifiers::empty(),
-                text: Some("x".into()),
-                repeat: false,
-            })],
-            mouse::Cursor::Available(input),
-        )
-        .await;
-    assert!(
-        typed
-            .iter()
-            .any(|message| matches!(message, Message::Field(path, _) if path == "/name")),
-        "real Name editor must publish its edit: {typed:?}"
-    );
-    assert!(app.draft_dirty());
-    assert!(
-        Arc::ptr_eq(&original, &app.document.snapshot()),
-        "typing is only a draft"
-    );
-    let _ = app.update(Message::RevertProperties);
-    assert!(!app.draft_dirty());
-    send(&mut app, CanvasEvent::Focus);
-    mounted.settle(&mut app).await;
-    let returned = mounted.geometry(&app);
-    assert!(!returned.scrolls.contains_key(&widget::Id::new("inspector")));
-    let viewport = returned.bounds("scenario-viewport");
-    assert_eq!(app.selected, message);
-    assert_eq!(app.scenario_context().unwrap().visit, context.visit);
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        context.representation
-    );
-    assert_eq!(stored_camera(&app), camera);
-    let geometry = resolve(app.project(), context.representation, message).unwrap();
-    let line = geometry
-        .scene
-        .lines
-        .iter()
-        .find(|line| line.id == message)
-        .unwrap();
-    let effective = app.behavior.scenario.presentation.camera(geometry.bounds);
-    let point = viewport.position()
-        + effective.pan
-        + Vector::new(line.points[0].x, line.points[0].y) * effective.scale;
-    assert!(
-        viewport.contains(point),
-        "the same selected message remains in fitted view"
-    );
-    assert!(Arc::ptr_eq(&original, &app.document.snapshot()));
-    assert_eq!(app.document.bundle(), &bundle);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-}
-
-#[test]
-fn details_properties_refuses_pending_property_source_and_behavior_drafts_without_apply() {
-    for kind in 0..3 {
-        let (mut app, _, message) = setup();
-        open_focused_details(&mut app);
-        match kind {
-            0 => {
-                let _ = app.update(Message::Field(
-                    "/name".into(),
-                    "Retained property draft".into(),
-                ));
-                assert!(app.draft_dirty());
-            }
-            1 => {
-                let _ = app.update(Message::SourceEdit(
-                    iced::widget::text_editor::Action::Edit(
-                        iced::widget::text_editor::Edit::Insert('x'),
-                    ),
-                ));
-                assert!(app.source_dirty());
-            }
-            _ => {
-                let owner = app.scenario_context().unwrap().scenario;
-                let _ = app.update(Message::Behavior(super::super::super::Event::Scenario(
-                    Event::Start(owner, Tool::Lifeline),
-                )));
-                assert!(app.behavior.has_pending());
-            }
-        }
-        let snapshot = app.document.snapshot();
-        let bundle = app.document.bundle().clone();
-        let property = app.draft.as_ref().unwrap().materialize();
-        let source = app.source_editor.text();
-        let behavior = app.behavior.recovery_snapshot();
-        let camera = app.behavior.scenario.camera_boundary();
-        let context = app.scenario_context().unwrap();
-        let epochs = (app.canvas_epoch, app.camera_epoch);
-        let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Properties(
-            context, message,
-        )));
-        assert!(app.behavior.scenario.camera_boundary() == camera);
-        assert_eq!(app.scenario_context(), Some(context));
-        assert_eq!((app.canvas_epoch, app.camera_epoch), epochs);
-        assert_eq!(app.draft.as_ref().unwrap().materialize(), property);
-        assert_eq!(app.source_editor.text(), source);
-        assert_eq!(app.behavior.recovery_snapshot(), behavior);
-        assert_eq!(app.selected, message);
-        assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-        assert_eq!(app.document.bundle(), &bundle);
-        assert!(!app.document.can_undo() && !app.document.can_redo());
-    }
-}
-
-#[tokio::test]
-async fn focused_details_opens_current_saved_view_properties_after_following_diagram_picker() {
-    let (mut app, a, _) = setup();
-    let b = id(&app, "incident_wide");
-    // Selecting the current view record makes the real picker follow that
-    // record selection to B. Do not seed selected=B or its property draft.
-    let _ = app.update(Message::Select(a));
-    assert_eq!(app.selected, a);
-    let _ = app.update(Message::Diagram(crate::app::Choice {
-        id: b,
-        label: "B".into(),
-    }));
-    assert_eq!(app.selected, b);
-    assert_eq!(app.draft.as_ref().unwrap().original, b);
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        Representation::Saved { diagram: b }
-    );
-    let _ = app.update(Message::InspectorTab(
-        crate::navigation::InspectorTab::Connections,
-    ));
-    let mut mounted = Mounted::new(&mut app).await;
-    open_focused_details(&mut app);
-    mounted.settle(&mut app).await;
-    let context = app.scenario_context().unwrap();
-    let camera = stored_camera(&app);
-    let snapshot = app.document.snapshot();
-    let bundle = app.document.bundle().clone();
-    let before = mounted.geometry(&app);
-    assert!(!before.scrolls.contains_key(&widget::Id::new("inspector")));
-    let (details, offset) = before.scrolls[&widget::Id::new("scenario-details")];
-    let point = before.bounds("scenario-properties").center() - offset;
-    assert!(details.contains(point));
-    let events = mounted.click(&mut app, point).await;
-    assert!(events.iter().any(|event| matches!(event,
-        Message::ScenarioCanvas(CanvasEvent::Properties(c, selected))
-        if *c == context && *selected == b)));
-    mounted.settle(&mut app).await;
-    let shown = mounted.geometry(&app);
-    assert!(
-        !shown
-            .scrolls
-            .contains_key(&widget::Id::new("scenario-details"))
-    );
-    let (inspector, offset) = shown.scrolls[&widget::Id::new("inspector")];
-    assert!(
-        shown
-            .text_inputs
-            .iter()
-            .any(|bounds| inspector.contains(bounds.center() - offset)),
-        "current Saved diagram has a visible editable inspector"
-    );
-    assert!(!app.behavior.scenario.focused());
-    assert_eq!(
-        app.inspector_tab,
-        crate::navigation::InspectorTab::Properties
-    );
-    assert_eq!(app.selected, b);
-    assert_eq!(app.draft.as_ref().unwrap().original, b);
-    assert_eq!(app.active_diagram, Some(b));
-    assert_eq!(app.page, crate::app::Page::Behavior);
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        context.representation
-    );
-    assert_eq!(app.scenario_context().unwrap().visit, context.visit);
-    assert_eq!(stored_camera(&app), camera);
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    assert_eq!(app.document.bundle(), &bundle);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-}
-
-#[test]
-fn details_properties_refuses_another_saved_view_even_with_the_same_scenario_owner() {
-    let (mut app, a, _) = setup();
-    let b = id(&app, "incident_wide");
-    let _ = app.update(Message::Diagram(crate::app::Choice {
-        id: b,
-        label: "B".into(),
-    }));
-    let _ = app.update(Message::Select(a));
-    assert_eq!(app.selected, a);
-    open_focused_details(&mut app);
-    let context = app.scenario_context().unwrap();
-    assert_eq!(context.representation, Representation::Saved { diagram: b });
-    assert_eq!(
-        presentation::checked_owner(app.project(), Representation::Saved { diagram: a }),
-        Some(context.scenario)
-    );
-    assert!(!properties_target(app.project(), context, a));
-    let camera = app.behavior.scenario.camera_boundary();
-    let epochs = (app.canvas_epoch, app.camera_epoch);
-    let snapshot = app.document.snapshot();
-    let bundle = app.document.bundle().clone();
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Properties(context, a)));
-    assert!(app.behavior.scenario.camera_boundary() == camera);
-    assert_eq!((app.canvas_epoch, app.camera_epoch), epochs);
-    assert_eq!(app.scenario_context(), Some(context));
-    assert_eq!(app.selected, a);
-    assert_eq!(app.draft.as_ref().unwrap().original, a);
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    assert_eq!(app.document.bundle(), &bundle);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-}
-
-#[test]
-fn details_properties_rejects_retired_view_selection_and_epoch_without_changing_panels() {
-    for kind in 0..3 {
-        let (mut app, diagram, message) = setup();
-        open_focused_details(&mut app);
-        let captured = app.scenario_context().unwrap();
-        match kind {
-            0 => {
-                let other = id(&app, "incident_wide");
-                for view in [other, diagram] {
-                    let _ = app.update(Message::Diagram(crate::app::Choice {
-                        id: view,
-                        label: "view".into(),
-                    }));
-                }
-                open_focused_details(&mut app);
-                assert_ne!(app.scenario_context().unwrap().visit, captured.visit);
-            }
-            1 => {
-                let other = id(&app, "updated_report");
-                send(&mut app, |c| CanvasEvent::Select(c, other));
-            }
-            _ => {
-                send(&mut app, |c| CanvasEvent::Zoom(c, Some(0.5)));
-            }
-        }
-        let camera = app.behavior.scenario.camera_boundary();
-        let context = app.scenario_context();
-        let selected = app.selected;
-        let tab = app.inspector_tab;
-        let epochs = (app.canvas_epoch, app.camera_epoch);
-        let snapshot = app.document.snapshot();
-        let bundle = app.document.bundle().clone();
-        let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Properties(
-            captured, message,
-        )));
-        assert!(app.behavior.scenario.camera_boundary() == camera);
-        assert_eq!(app.scenario_context(), context);
-        assert_eq!(app.selected, selected);
-        assert_eq!(app.inspector_tab, tab);
-        assert_eq!((app.canvas_epoch, app.camera_epoch), epochs);
-        assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-        assert_eq!(app.document.bundle(), &bundle);
-    }
-}
-
-#[test]
-fn opening_scenario_properties_cancels_held_spacing_and_rejects_its_late_finish() {
-    use super::super::spacing::{Event as Spacing, Target, controller::tests::packet};
-    let (mut app, _, message) = setup();
-    send(&mut app, |c| {
-        CanvasEvent::Viewport(c, Size::new(900., 600.))
-    });
-    open_focused_details(&mut app);
-    let begin = packet(
-        app.project(),
-        &app.behavior.scenario,
-        app.scenario_context().unwrap(),
-        app.camera_epoch,
-        Target::Message(message),
-    );
-    let Spacing::Begin { press_screen, .. } = begin else {
-        panic!()
-    };
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Spacing(begin)));
-    assert_eq!(app.behavior.scenario.spacing_token(), Some(begin.token()));
-    let snapshot = app.document.snapshot();
-    let end = press_screen + Vector::new(0., 12.);
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Spacing(
-        Spacing::Move {
-            stamp: begin.stamp(),
-            token: begin.token(),
-            screen: end,
-        },
-    )));
-    let paint = app
-        .behavior
-        .scenario
-        .spacing_paint(begin.stamp().context, begin.stamp().camera_epoch)
-        .unwrap();
-    assert!(paint.refusal.is_none());
-    let line = paint
-        .scene
-        .lines
-        .iter()
-        .find(|line| line.id == message)
-        .unwrap();
-    assert!(
-        line.points[0].y > 160.,
-        "a real proposed scene moved the first message"
-    );
-    assert!(
-        Arc::ptr_eq(&snapshot, &app.document.snapshot()),
-        "preview is not authored"
-    );
-    let camera = stored_camera(&app);
-    send(&mut app, |c| CanvasEvent::Properties(c, message));
-    assert!(app.behavior.scenario.spacing_token().is_none());
-    assert_eq!(stored_camera(&app), camera);
-    let _ = app.update(Message::ScenarioCanvas(CanvasEvent::Spacing(
-        Spacing::Finish {
-            stamp: begin.stamp(),
-            token: begin.token(),
-            screen: end,
-        },
-    )));
-    assert!(Arc::ptr_eq(&snapshot, &app.document.snapshot()));
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-}

crates/oa-desktop/src/behavior/scenario/workspace/spacing_tests.rs

@@ -1,438 +0,0 @@
-//! Real mounted widgets dispatch the gesture; expectations name authored fields
-//! and actual displayed anchors independently of controller command results.
-use super::*;
-use crate::behavior::canvas_workspace::tests::{Mounted, key};
-use crate::behavior::scenario_layout::{ResolvedScenarioPlan, resolve};
-use crate::document::Document;
-use iced::Vector;
-use std::sync::Arc;
-
-const FIXTURE: &str = include_str!("../../../app/diagram_usages/tests/saved_scenario.arcadia");
-
-fn id(app: &App, alias: &str) -> Id {
-    app.project()
-        .identities()
-        .into_iter()
-        .find(|(_, name)| *name == alias)
-        .unwrap()
-        .0
-}
-
-async fn setup(fit: bool) -> (App, Mounted, Id) {
-    let mut app = App::with_project(oa_core::language::parse(FIXTURE).unwrap());
-    let owner = id(&app, "incident_response");
-    let diagram = id(&app, "incident_readable");
-    let _ = app.update(Message::Select(owner));
-    let _ = app.update(Message::Diagram(crate::app::Choice {
-        id: diagram,
-        label: "A - Incident review readable".into(),
-    }));
-    app.window_size = Size::new(1440., 900.);
-    let mut mounted = Mounted::new(&mut app).await;
-    if !fit {
-        let context = app.scenario_context().unwrap();
-        let task = app.update(Message::ScenarioCanvas(CanvasEvent::Zoom(
-            context,
-            Some(0.5),
-        )));
-        mounted.perform(&mut app, task).await;
-        mounted.settle(&mut app).await;
-    }
-    assert_eq!(
-        app.scenario_context().unwrap().representation,
-        Representation::Saved { diagram }
-    );
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-    (app, mounted, diagram)
-}
-
-fn resolved(app: &App) -> ResolvedScenarioPlan {
-    resolve(
-        app.project(),
-        app.scenario_context().unwrap().representation,
-        app.selected,
-    )
-    .unwrap()
-}
-
-fn stored_camera(app: &App) -> (Vector, Option<f32>, bool) {
-    let p = &app.behavior.scenario.presentation;
-    (p.pan, p.zoom, p.fit)
-}
-
-fn screen(mounted: &mut Mounted, app: &App, world: Point) -> Point {
-    let bounds = mounted.geometry(app).bounds("scenario-viewport");
-    let geometry = resolved(app);
-    let camera = app.behavior.scenario.presentation.camera(geometry.bounds);
-    let point = bounds.position() + camera.pan + Vector::new(world.x, world.y) * camera.scale;
-    assert!(
-        bounds.contains(point),
-        "actual visible world {world:?}: {point:?} in {bounds:?}"
-    );
-    point
-}
-
-fn mouse_event(event: mouse::Event) -> iced::Event {
-    iced::Event::Mouse(event)
-}
-
-async fn press(mounted: &mut Mounted, app: &mut App, point: Point) -> Vec<Message> {
-    mounted
-        .batch(
-            app,
-            &[
-                mouse_event(mouse::Event::CursorMoved { position: point }),
-                mouse_event(mouse::Event::ButtonPressed(mouse::Button::Left)),
-            ],
-            mouse::Cursor::Available(point),
-        )
-        .await
-}
-
-async fn move_to(mounted: &mut Mounted, app: &mut App, point: Point) -> Vec<Message> {
-    mounted
-        .batch(
-            app,
-            &[mouse_event(mouse::Event::CursorMoved { position: point })],
-            mouse::Cursor::Available(point),
-        )
-        .await
-}
-
-async fn release(mounted: &mut Mounted, app: &mut App, point: Point) -> Vec<Message> {
-    mounted
-        .batch(
-            app,
-            &[mouse_event(mouse::Event::ButtonReleased(
-                mouse::Button::Left,
-            ))],
-            mouse::Cursor::Available(point),
-        )
-        .await
-}
-
-fn set_expected_message(project: &mut oa_core::Project, diagram: Id, occurrence: Id, y: f32) {
-    let Some(oa_core::DiagramLayout::Scenario(layout)) =
-        &mut project.diagrams.get_mut(&diagram).unwrap().layout
-    else {
-        panic!()
-    };
-    layout
-        .messages
-        .iter_mut()
-        .find(|m| m.address.occurrence == occurrence)
-        .unwrap()
-        .send_y = y;
-}
-
-fn set_expected_lane(project: &mut oa_core::Project, diagram: Id, lifeline: Id, x: f32) {
-    let Some(oa_core::DiagramLayout::Scenario(layout)) =
-        &mut project.diagrams.get_mut(&diagram).unwrap().layout
-    else {
-        panic!()
-    };
-    layout
-        .lanes
-        .iter_mut()
-        .find(|lane| lane.lifeline == lifeline)
-        .unwrap()
-        .x = x;
-}
-
-fn assert_reopens_exactly(app: &App) {
-    let reopened = Document::from_bundle(
-        app.document.bundle().clone(),
-        oa_core::source_project::ProjectLimits::default(),
-    )
-    .unwrap();
-    assert_eq!(reopened.project(), app.project());
-    assert_eq!(reopened.bundle(), app.document.bundle());
-}
-
-#[tokio::test]
-async fn saved_message_same_batch_pointer_events_commit_once_and_one_undo_redo_restores_exact_source()
- {
-    let (mut app, mut mounted, diagram) = setup(false).await;
-    let target = id(&app, "updated_report");
-    let before = app.document.snapshot();
-    let revision = app.document.revision();
-    let projected = screen(&mut mounted, &app, Point::new(400., 252.));
-    // This fixture asks for exactly +20 world units. A fractional start near a
-    // screen-coordinate exponent boundary need not retain an exact +10 delta.
-    let start = Point::new(projected.x.round(), projected.y.round());
-    let mut geometry = resolved(&app);
-    let camera = app.behavior.scenario.presentation.camera(geometry.bounds);
-    assert_eq!(camera.scale, 0.5);
-    let bounds = mounted.geometry(&app).bounds("scenario-viewport");
-    let world = Point::new(
-        (start.x - bounds.x - camera.pan.x) / camera.scale,
-        (start.y - bounds.y - camera.pan.y) / camera.scale,
-    );
-    geometry.scene.scale = camera.scale;
-    geometry.scene.camera_pan = camera.pan;
-    let hit = geometry.scene.hit_item(world).unwrap();
-    assert_eq!(hit.id, target);
-    assert_eq!(hit.role, crate::behavior::SceneHitRole::MessageBody);
-    let end = start + Vector::new(0., 10.); // .5 display scale: +20 authored y.
-    assert_eq!(end.y - start.y, 10.);
-    assert!(bounds.contains(start) && bounds.contains(end));
-    let messages = mounted
-        .batch(
-            &mut app,
-            &[
-                mouse_event(mouse::Event::CursorMoved { position: start }),
-                mouse_event(mouse::Event::ButtonPressed(mouse::Button::Left)),
-                mouse_event(mouse::Event::CursorMoved { position: end }),
-                mouse_event(mouse::Event::ButtonReleased(mouse::Button::Left)),
-            ],
-            mouse::Cursor::Available(end),
-        )
-        .await;
-    assert_eq!(
-        messages
-            .iter()
-            .filter(|m| matches!(
-                m,
-                Message::ScenarioCanvas(CanvasEvent::Spacing(spacing::Event::Begin { .. }))
-            ))
-            .count(),
-        1
-    );
-    assert_eq!(
-        messages
-            .iter()
-            .filter(|m| matches!(
-                m,
-                Message::ScenarioCanvas(CanvasEvent::Spacing(spacing::Event::Finish { .. }))
-            ))
-            .count(),
-        1
-    );
-    let mut expected = before.decoded.project.clone();
-    set_expected_message(&mut expected, diagram, target, 272.);
-    assert_eq!(
-        app.project(),
-        &expected,
-        "Only Saved A's addressed y changes; steps, other occurrences and B/C are exact"
-    );
-    assert_eq!(app.document.revision(), revision + 1);
-    assert_eq!(app.selected, target);
-    assert!(app.behavior.scenario.spacing_token().is_none());
-    assert_reopens_exactly(&app);
-    let after = app.document.snapshot();
-    let task = app.update(Message::Undo);
-    mounted.perform(&mut app, task).await;
-    assert_eq!(app.project(), &before.decoded.project);
-    assert_eq!(app.document.bundle(), &before.bundle);
-    assert!(!app.document.can_undo() && app.document.can_redo());
-    let task = app.update(Message::Redo);
-    mounted.perform(&mut app, task).await;
-    assert_eq!(app.project(), &after.decoded.project);
-    assert_eq!(app.document.bundle(), &after.bundle);
-}
-
-#[tokio::test]
-async fn saved_header_preview_survives_frames_and_freezes_fit_while_actual_bounds_expand() {
-    let (mut app, mut mounted, diagram) = setup(true).await;
-    let assessor = id(&app, "assessor");
-    let before = app.document.snapshot();
-    let original = resolved(&app);
-    let original_camera = app.behavior.scenario.presentation.camera(original.bounds);
-    let stored = stored_camera(&app);
-    assert!(stored.2, "test must exercise original Fit");
-    let start = screen(&mut mounted, &app, Point::new(640., 45.));
-    press(&mut mounted, &mut app, start).await;
-    let token = app
-        .behavior
-        .scenario
-        .spacing_token()
-        .expect("actual header press begins");
-    for x in [670., 700.] {
-        let end = start + Vector::new((x - 640.) * original_camera.scale, 0.);
-        move_to(&mut mounted, &mut app, end).await;
-        mounted.settle(&mut app).await; // Actual borrowed Scene/Stack tree is rebuilt.
-        assert_eq!(app.behavior.scenario.spacing_token(), Some(token));
-        assert!(Arc::ptr_eq(&before, &app.document.snapshot()));
-        assert_eq!(stored_camera(&app), stored);
-        let paint = app
-            .behavior
-            .scenario
-            .spacing_paint(app.scenario_context().unwrap(), app.camera_epoch)
-            .unwrap();
-        assert!(paint.refusal.is_none());
-        assert!((paint.scene.render_lanes[&assessor] - x).abs() < 0.001);
-        assert!(paint.bounds.width > original.bounds.width);
-        assert_eq!(paint.scene.scale, original_camera.scale);
-        assert_eq!(paint.scene.camera_pan, original_camera.pan);
-        let header = paint.scene.boxes.iter().find(|b| b.id == assessor).unwrap();
-        let displayed = Vector::new(header.rect.center().x, header.rect.center().y)
-            * paint.scene.scale
-            + paint.scene.camera_pan;
-        let baseline = Vector::new(640., 50.) * original_camera.scale + original_camera.pan;
-        assert!((displayed.x - baseline.x - (x - 640.) * original_camera.scale).abs() < 0.001);
-        assert_eq!(displayed.y, baseline.y);
-    }
-    let end = start + Vector::new(60. * original_camera.scale, 0.);
-    release(&mut mounted, &mut app, end).await;
-    let final_geometry = resolved(&app);
-    let actual_x = final_geometry.scene.render_lanes[&assessor];
-    assert!((actual_x - 700.).abs() < 0.001);
-    let mut expected = before.decoded.project.clone();
-    set_expected_lane(&mut expected, diagram, assessor, actual_x);
-    assert_eq!(app.project(), &expected);
-    let final_camera = app
-        .behavior
-        .scenario
-        .presentation
-        .camera(final_geometry.bounds);
-    assert_eq!(
-        final_camera, original_camera,
-        "commit must not refit underneath pointer"
-    );
-    assert!(!app.behavior.scenario.presentation.fit);
-    assert_eq!(app.selected, assessor);
-    assert_reopens_exactly(&app);
-}
-
-#[tokio::test]
-async fn saved_body_and_header_clicks_select_without_materializing_spacing() {
-    let (mut app, mut mounted, _) = setup(false).await;
-    let before = app.document.snapshot();
-    let original_camera = stored_camera(&app);
-    for (alias, world) in [
-        ("updated_report", Point::new(400., 252.)),
-        ("assessor", Point::new(640., 45.)),
-    ] {
-        let target = id(&app, alias);
-        let point = screen(&mut mounted, &app, world);
-        mounted.click(&mut app, point).await;
-        assert_eq!(app.selected, target);
-        assert!(app.behavior.scenario.spacing_token().is_none());
-        assert!(Arc::ptr_eq(&before, &app.document.snapshot()));
-        assert_eq!(stored_camera(&app), original_camera);
-    }
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-}
-
-#[tokio::test]
-async fn saved_valid_preview_then_refused_self_call_never_commits_last_valid_candidate() {
-    let (mut app, mut mounted, _) = setup(false).await;
-    let target = id(&app, "assess_call");
-    let before = app.document.snapshot();
-    let camera = stored_camera(&app);
-    let start = screen(&mut mounted, &app, Point::new(680., 344.));
-    press(&mut mounted, &mut app, start).await;
-    let valid = start + Vector::new(0., -10.); // send324, receive348, reply436 unchanged.
-    move_to(&mut mounted, &mut app, valid).await;
-    mounted.settle(&mut app).await;
-    let paint = app
-        .behavior
-        .scenario
-        .spacing_paint(app.scenario_context().unwrap(), app.camera_epoch)
-        .unwrap();
-    assert!(paint.refusal.is_none());
-    let line = paint.scene.lines.iter().find(|l| l.id == target).unwrap();
-    assert_eq!(line.points[0].y, 324.);
-    assert_eq!(line.points.last().unwrap().y, 348.);
-    let refused = start + Vector::new(0., 53.); // send450, receive474 would follow reply436.
-    move_to(&mut mounted, &mut app, refused).await;
-    mounted.settle(&mut app).await;
-    let paint = app
-        .behavior
-        .scenario
-        .spacing_paint(app.scenario_context().unwrap(), app.camera_epoch)
-        .unwrap();
-    assert!(paint.refusal.is_some());
-    assert_eq!(
-        paint
-            .scene
-            .lines
-            .iter()
-            .find(|l| l.id == target)
-            .unwrap()
-            .points[0]
-            .y,
-        344.
-    );
-    assert!(Arc::ptr_eq(&before, &app.document.snapshot()));
-    release(&mut mounted, &mut app, refused).await;
-    assert!(app.behavior.scenario.spacing_token().is_none());
-    assert!(Arc::ptr_eq(&before, &app.document.snapshot()));
-    assert_eq!(stored_camera(&app), camera);
-    assert!(!app.document.can_undo() && !app.document.can_redo());
-}
-
-#[tokio::test]
-async fn saved_escape_and_outside_pointer_cancel_actual_held_preview() {
-    for escape in [true, false] {
-        let (mut app, mut mounted, _) = setup(false).await;
-        let before = app.document.snapshot();
-        let camera = stored_camera(&app);
-        let start = screen(&mut mounted, &app, Point::new(400., 252.));
-        let end = start + Vector::new(0., 10.);
-        press(&mut mounted, &mut app, start).await;
-        move_to(&mut mounted, &mut app, end).await;
-        mounted.settle(&mut app).await;
-        assert!(app.behavior.scenario.spacing_token().is_some());
-        let release_at = if escape {
-            mounted
-                .batch(
-                    &mut app,
-                    &[key(iced::keyboard::key::Named::Escape)],
-                    mouse::Cursor::Available(end),
-                )
-                .await;
-            end
-        } else {
-            let bounds = mounted.geometry(&app).bounds("scenario-viewport");
-            let outside = Point::new(bounds.x - 5., bounds.y + 100.);
-            move_to(&mut mounted, &mut app, outside).await;
-            outside
-        };
-        assert!(app.behavior.scenario.spacing_token().is_none());
-        release(&mut mounted, &mut app, release_at).await;
-        assert!(Arc::ptr_eq(&before, &app.document.snapshot()));
-        assert_eq!(stored_camera(&app), camera);
-        assert!(!app.document.can_undo() && !app.document.can_redo());
-    }
-}
-
-#[tokio::test]
-async fn saved_drag_return_to_origin_preserves_redo_selection_and_original_fit_camera() {
-    let (mut app, mut mounted, _) = setup(true).await;
-    let owner = id(&app, "incident_response");
-    app.document
-        .execute(oa_core::Command::Rename(
-            owner,
-            "Previously edited owner".into(),
-        ))
-        .unwrap();
-    let redo = app.document.snapshot();
-    let task = app.update(Message::Undo);
-    mounted.perform(&mut app, task).await;
-    mounted.settle(&mut app).await;
-    assert!(app.document.can_redo());
-    let before = app.document.snapshot();
-    let camera = stored_camera(&app);
-    let selected = app.selected;
-    let revision = app.document.revision();
-    let start = screen(&mut mounted, &app, Point::new(400., 252.));
-    press(&mut mounted, &mut app, start).await;
-    move_to(&mut mounted, &mut app, start + Vector::new(0., 12.)).await;
-    mounted.settle(&mut app).await;
-    assert!(app.behavior.scenario.spacing_token().is_some());
-    move_to(&mut mounted, &mut app, start).await;
-    mounted.settle(&mut app).await;
-    release(&mut mounted, &mut app, start).await;
-    assert!(app.behavior.scenario.spacing_token().is_none());
-    assert!(Arc::ptr_eq(&before, &app.document.snapshot()));
-    assert_eq!(app.document.bundle(), &before.bundle);
-    assert_eq!(app.document.revision(), revision);
-    assert_eq!(stored_camera(&app), camera);
-    assert_eq!(app.selected, selected);
-    assert!(app.document.can_redo());
-    let task = app.update(Message::Redo);
-    mounted.perform(&mut app, task).await;
-    assert_eq!(app.project(), &redo.decoded.project);
-    assert_eq!(app.document.bundle(), &redo.bundle);
-}

crates/oa-desktop/src/behavior/scenario/workspace/tests.rs

@@ -48,28 +48,8 @@ async fn production_scenario_canvas_keeps_bounds_draft_identity_and_camera_throu
             mounted.pan(&mut app, start, start + delta).await;
             let diff = app.behavior.scenario.presentation.pan - next_pan;
             assert!(diff.x.hypot(diff.y) < 0.01);
-            // Iced operations report palette children in content coordinates.
-            // The preceding Action focus may have scrolled this retained palette.
-            let geometry = mounted.geometry(&app);
-            let scope = canvas_workspace::Scope::current(&app).unwrap();
-            let (palette, offset) = geometry.scrolls[&scope.control_id("palette-scroll")];
-            let tool = geometry.bounds("behavior-tool:A").center() - offset;
-            assert!(
-                palette.contains(tool),
-                "visible Action at {tool:?}: {palette:?}"
-            );
-            let chosen = mounted.click(&mut app, tool).await;
-            assert!(
-                chosen.iter().any(|message| matches!(
-                    canvas_workspace::tests::intent_action(message),
-                    Message::ScenarioCanvas(CanvasEvent::Choose(_, CanvasTool::Add(Tool::Action)))
-                )),
-                "Action palette click at scale {scale}, offset {offset:?}: {chosen:?}"
-            );
-            assert_eq!(
-                app.behavior.scenario.canvas_tool(f.owner),
-                CanvasTool::Add(Tool::Action)
-            );
+            let tool = mounted.geometry(&app).bounds("behavior-tool:A").center();
+            mounted.click(&mut app, tool).await;
             let messages = mounted.click(&mut app, bounds.position() + desired).await;
             assert!(
                 messages.iter().any(
@@ -77,7 +57,7 @@ async fn production_scenario_canvas_keeps_bounds_draft_identity_and_camera_throu
                 tool: Tool::Action, slot, lifeline: Some(line), ..
             }) if *slot == expected && *line == f.sender)
                 ),
-                "scale {scale}, expected slot {expected:?}: {messages:?}"
+                "scale {scale}: {messages:?}"
             );
             let session = app.behavior.scenario.form_session().unwrap();
             let invocation = app.behavior.scenario.draft.as_ref().unwrap().invocation;
@@ -1357,18 +1337,7 @@ async fn production_scenario_camera_external_controls_bounds_and_retained_deltas
         let bounds = mounted.geometry(&app).bounds("scenario-viewport");
         let point = bounds.position() + iced::Vector::new(95., 90.);
         let lifetime = app.camera_epoch;
-        // Fit stores no pan offset. A real drag starts from the displayed fitted
-        // camera, then materializes it before applying its ordered screen deltas.
-        let shown = app
-            .behavior
-            .scenario
-            .display(app.project(), f.owner, app.selected)
-            .unwrap();
-        let before_camera = app
-            .behavior
-            .scenario
-            .presentation
-            .camera(shown.bounds().unwrap());
+        let pan = app.behavior.scenario.presentation.pan;
         let first = point + iced::Vector::new(13., 9.);
         let last = first + iced::Vector::new(17., -3.);
         let emitted = mounted
@@ -1383,21 +1352,7 @@ async fn production_scenario_camera_external_controls_bounds_and_retained_deltas
                 mouse::Cursor::Available(last),
             )
             .await;
-        let expected_pan = before_camera.pan + (last - point);
-        let actual_pan = app.behavior.scenario.presentation.pan;
-        let difference = actual_pan - expected_pan;
-        assert!(
-            difference.x.hypot(difference.y) < 0.001,
-            "{boundary}: displayed pan {actual_pan:?} must follow {expected_pan:?}"
-        );
-        assert_eq!(
-            app.behavior.scenario.presentation.zoom,
-            Some(before_camera.scale)
-        );
-        assert!(
-            !app.behavior.scenario.presentation.fit,
-            "drag materializes the visible Fit camera"
-        );
+        assert_eq!(app.behavior.scenario.presentation.pan, pan + (last - point));
         assert_eq!(
             app.camera_epoch, lifetime,
             "own ordered deltas retain their lifetime"
@@ -1805,19 +1760,14 @@ fn scenario_workspace_fit_uses_measured_inner_viewport_and_rejects_nonfinite_inp
     assert!(!presentation.viewport(Size::new(484., 204.)));
     let scale = presentation.scale(graph);
     assert!(graph.width * scale <= 468. && graph.height * scale <= 188.);
-    assert!(scale > camera::MIN_SCALE);
+    assert!(scale > MIN_SCALE);
     for bad in [f32::NAN, f32::INFINITY, 0., -1.] {
         assert!(!presentation.zoom(Some(bad)));
         assert!(!presentation.viewport(Size::new(bad, 100.)));
         assert!(!presentation.viewport(Size::new(100., bad)));
         assert_eq!(presentation.scale(graph), scale);
     }
-    let tall = Rectangle::with_size(Size::new(900., 10000.));
-    let camera = presentation.camera(tall);
-    assert!(camera.scale < 0.05 && camera.scale > 0.);
-    assert!((camera.scale - 188. / 10000.).abs() < 1e-8);
-    assert!((tall.height * camera.scale + camera.pan.y - 196.).abs() < 1e-4);
-    assert!((camera.pan.y - 8.).abs() < 1e-4);
+    assert_eq!(presentation.scale(Size::new(900., 10000.)), MIN_SCALE);
     assert!(presentation.zoom(Some(1.25)));
     presentation.viewport(Size::new(200., 100.));
     assert_eq!(

crates/oa-desktop/src/behavior/scenario_activation.rs

@@ -1,492 +0,0 @@
-//! Derived call geometry. Correlation and branch ownership come from the model;
-//! columns separate overlapping drawings and do not assert an execution thread.
-use super::*;
-
-const WIDTH: f32 = 12.;
-const OFFSET: f32 = 6.;
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub(super) enum Finish {
-    Reply(Id),
-    Boundary,
-    /// Still open at this scope boundary; the visible span is not an isolated stub.
-    Continuation,
-    Open,
-    /// The receiver was deleted without answering this call.
-    Terminated(Id),
-    /// Lifetime clipping ended this visible piece before its logical terminal.
-    Clipped,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub(super) struct Segment {
-    pub call: Id,
-    pub receiver: Id,
-    pub scope: Id,
-    pub rect: Rectangle,
-    pub column: usize,
-    pub finish: Finish,
-}
-impl Segment {
-    fn bottom(&self) -> f32 {
-        self.rect.y + self.rect.height
-    }
-    fn overlaps(&self, other: &Self) -> bool {
-        self.receiver == other.receiver
-            && self.scope == other.scope
-            && self.rect.y < other.bottom()
-            && other.rect.y < self.bottom()
-    }
-    fn edge(&self, right: bool) -> f32 {
-        self.rect.x + if right { self.rect.width } else { 0. }
-    }
-}
-
-impl Scene {
-    pub(super) fn layout_activations(&mut self, p: &Project, lanes: &BTreeMap<Id, f32>) {
-        // Logical endpoints precede clipping and remain available even when a
-        // lifetime hides a whole execution or terminates it before its Reply.
-        let correlations = logical_correlations(p, &self.rows, &self.lines);
-        let mut calls: Vec<_> = self
-            .rows
-            .iter()
-            .filter_map(|(&call, &(scope, y))| {
-                let Some(SharedBody::Occurrence {
-                    body:
-                        OccurrenceBody::Exchange {
-                            message_kind: MessageKind::Call,
-                            receiver: Some(receiver),
-                            ..
-                        },
-                    ..
-                }) = p.elements.get(&call).and_then(|e| e.shared())
-                else {
-                    return None;
-                };
-                Some((call, *receiver, scope, y, *lanes.get(receiver)?))
-            })
-            .collect();
-        // Rows are laid out in semantic order. UUID order must not choose which
-        // rectangle obscures another (especially after source reidentification).
-        calls.sort_by(|a, b| a.3.total_cmp(&b.3).then_with(|| a.0.cmp(&b.0)));
-        for &(call, receiver, scope, _, x) in &calls {
-            let first = self.activations.len();
-            let first_cue = self.open_calls.len();
-            self.activation_sequence(p, scope, call, receiver, x, None);
-            let column = self.activations[first..]
-                .iter()
-                .flat_map(|segment| {
-                    self.activations[..first]
-                        .iter()
-                        .filter(move |other| segment.overlaps(other))
-                })
-                .map(|other| other.column + 1)
-                .max()
-                .unwrap_or(0);
-            for segment in &mut self.activations[first..] {
-                segment.column = column;
-                segment.rect.x += column as f32 * OFFSET;
-            }
-            for cue in &mut self.open_calls[first_cue..] {
-                cue.x += column as f32 * OFFSET;
-            }
-        }
-        // Shallow executions paint first; columns cannot collide within a scope.
-        self.activations.sort_by(|a, b| {
-            a.column
-                .cmp(&b.column)
-                .then_with(|| a.rect.y.total_cmp(&b.rect.y))
-                .then_with(|| a.call.cmp(&b.call))
-        });
-        self.anchor_activation_messages(p, lanes, &correlations);
-    }
-
-    fn activation_segment(
-        &mut self,
-        call: Id,
-        receiver: Id,
-        scope: Id,
-        x: f32,
-        span: std::ops::Range<f32>,
-        finish: Finish,
-    ) {
-        // Cues describe unanswered logical paths, including wholly invisible
-        // ones. Never derive them only from the surviving paint rectangles.
-        if matches!(
-            finish,
-            Finish::Open | Finish::Continuation | Finish::Terminated(_)
-        ) {
-            self.open_calls
-                .push(Point::new(x + WIDTH / 2. + 4., span.end - 7.));
-        }
-        for alive in self
-            .lifecycle
-            .alive_spans(receiver, scope, span.start, span.end)
-        {
-            self.activations.push(Segment {
-                call,
-                receiver,
-                scope,
-                rect: Rectangle::new(
-                    Point::new(x - WIDTH / 2., alive.start),
-                    Size::new(WIDTH, alive.end - alive.start),
-                ),
-                column: 0,
-                finish: if alive.end == span.end {
-                    finish
-                } else {
-                    Finish::Clipped
-                },
-            });
-        }
-    }
-
-    /// Follow one exact correlation. A segment belongs to one ordered scope;
-    /// vertically stacked operands must not become a single chronological span.
-    fn activation_sequence(
-        &mut self,
-        p: &Project,
-        owner: Id,
-        call: Id,
-        receiver: Id,
-        x: f32,
-        mut start: Option<f32>,
-    ) -> Outcome {
-        let entered_open = start.is_some();
-        let mut split = false;
-        let mut may_be_terminated = false;
-        for id in p.elements[&owner].steps().into_iter().flatten() {
-            let Some(&(_, y)) = self.rows.get(id) else {
-                continue;
-            };
-            if *id == call {
-                // A reflective call is received at the lower end of its loop.
-                start = Some(
-                    self.lines
-                        .iter()
-                        .find(|line| line.id == call)
-                        .and_then(|line| line.points.last())
-                        .map_or(y, |point| point.y),
-                );
-            }
-            let Some(top) = start else {
-                continue;
-            };
-            match p.elements[id].shared() {
-                Some(SharedBody::Occurrence {
-                    body:
-                        OccurrenceBody::Exchange {
-                            message_kind: MessageKind::Delete,
-                            receiver: Some(deleted),
-                            ..
-                        },
-                    ..
-                }) if *deleted == receiver => {
-                    self.activation_segment(
-                        call,
-                        receiver,
-                        owner,
-                        x,
-                        top..y,
-                        Finish::Terminated(*id),
-                    );
-                    start = None;
-                    may_be_terminated = true;
-                }
-                Some(SharedBody::Occurrence {
-                    body:
-                        OccurrenceBody::Exchange {
-                            message_kind: MessageKind::Reply,
-                            reply_to: Some(correlation),
-                            ..
-                        },
-                    ..
-                }) if *correlation == call => {
-                    // Execution ends when its reply is sent, including a self reply.
-                    self.activation_segment(call, receiver, owner, x, top..y, Finish::Reply(*id));
-                    start = None;
-                }
-                Some(SharedBody::Occurrence {
-                    body: OccurrenceBody::Fragment { operator, branches },
-                    ..
-                }) => {
-                    split = true;
-                    self.activation_segment(call, receiver, owner, x, top..y, Finish::Boundary);
-                    let bottom = self
-                        .boxes
-                        .iter()
-                        .find(|b| b.id == *id && !b.title.is_empty())
-                        .map(|b| b.rect.y + b.rect.height)
-                        .unwrap_or(y);
-                    let outcomes: Vec<_> = branches
-                        .iter()
-                        .filter_map(|branch| {
-                            let &(top, _) = self.sequence_bounds.get(branch)?;
-                            Some(self.activation_sequence(p, *branch, call, receiver, x, Some(top)))
-                        })
-                        .collect();
-                    let open = match operator {
-                        FragmentOperator::Alternative => {
-                            outcomes.is_empty() || outcomes.iter().any(|outcome| outcome.open)
-                        }
-                        FragmentOperator::Parallel => outcomes.iter().all(|outcome| outcome.open),
-                        FragmentOperator::Optional | FragmentOperator::Loop => true,
-                    };
-                    if outcomes.iter().any(|outcome| outcome.may_be_terminated) {
-                        // Sibling bars retain their own entry paths, but a
-                        // conditional death cannot become a definite parent
-                        // execution again after a later Create.
-                        self.open_calls
-                            .push(Point::new(x + WIDTH / 2. + 4., bottom - 7.));
-                        may_be_terminated = true;
-                        start = None;
-                    } else {
-                        start = open.then_some(bottom);
-                    }
-                }
-                _ => {}
-            }
-        }
-        if let Some(top) = start {
-            let bottom = if entered_open || split {
-                self.sequence_bounds
-                    .get(&owner)
-                    .map_or(top + 26., |(_, bottom)| (*bottom).max(top + 26.))
-            } else {
-                top + 26.
-            };
-            let finish = if entered_open || split {
-                Finish::Continuation
-            } else {
-                Finish::Open
-            };
-            self.activation_segment(call, receiver, owner, x, top..bottom, finish);
-        }
-        Outcome {
-            open: start.is_some(),
-            may_be_terminated,
-        }
-    }
-
-    fn anchor_activation_messages(
-        &mut self,
-        p: &Project,
-        lanes: &BTreeMap<Id, f32>,
-        correlations: &BTreeMap<Id, Correlation>,
-    ) {
-        let segments = &self.activations;
-        for line in &mut self.lines {
-            let Some(SharedBody::Occurrence {
-                body:
-                    OccurrenceBody::Exchange {
-                        sender: Some(sender),
-                        receiver: Some(receiver),
-                        message_kind,
-                        reply_to,
-                        ..
-                    },
-                ..
-            }) = p.elements.get(&line.id).and_then(|e| e.shared())
-            else {
-                continue;
-            };
-            if !matches!(
-                message_kind,
-                MessageKind::Call | MessageKind::Reply | MessageKind::Asynchronous
-            ) {
-                continue;
-            }
-            let (Some(&from), Some(&to), Some(&(scope, _))) = (
-                lanes.get(sender),
-                lanes.get(receiver),
-                self.rows.get(&line.id),
-            ) else {
-                continue;
-            };
-            let send_y = line.points[0].y;
-            let receive_y = line.points.last().unwrap().y;
-            let reflective = sender == receiver;
-            let source = if *message_kind == MessageKind::Reply {
-                reply_to.and_then(|call| {
-                    segments.iter().find(|a| {
-                        a.call == call
-                            && a.scope == scope
-                            && a.finish == Finish::Reply(line.id)
-                            && a.bottom() == send_y
-                    })
-                })
-            } else {
-                active_segment(
-                    p,
-                    segments,
-                    correlations,
-                    *sender,
-                    scope,
-                    send_y,
-                    Some(line.id),
-                )
-            };
-            let target = if *message_kind == MessageKind::Call {
-                segments
-                    .iter()
-                    .find(|a| a.call == line.id && a.scope == scope && a.rect.y == receive_y)
-            } else {
-                active_segment(
-                    p,
-                    segments,
-                    correlations,
-                    *receiver,
-                    scope,
-                    receive_y,
-                    *reply_to,
-                )
-            };
-            let start = source.map_or(from, |a| a.edge(reflective || to > from));
-            let end = target.map_or(to, |a| a.edge(reflective || from > to));
-            if reflective {
-                let outside = start.max(end) + 60.;
-                line.points = vec![
-                    Point::new(start, send_y),
-                    Point::new(outside, send_y),
-                    Point::new(outside, receive_y),
-                    Point::new(end, receive_y),
-                ];
-            } else {
-                line.points = vec![Point::new(start, send_y), Point::new(end, receive_y)];
-            }
-            line.label_at.x = start.min(end) + 12.;
-        }
-    }
-}
-
-struct Outcome {
-    open: bool,
-    may_be_terminated: bool,
-}
-
-fn logical_correlations(
-    p: &Project,
-    rows: &BTreeMap<Id, (Id, f32)>,
-    lines: &[Line],
-) -> BTreeMap<Id, Correlation> {
-    let mut result = BTreeMap::new();
-    let points: BTreeMap<_, _> = lines.iter().map(|line| (line.id, &line.points)).collect();
-    for (&id, &(_, y)) in rows {
-        if matches!(
-            p.elements.get(&id).and_then(|e| e.shared()),
-            Some(SharedBody::Occurrence {
-                body: OccurrenceBody::Exchange {
-                    message_kind: MessageKind::Call,
-                    ..
-                },
-                ..
-            })
-        ) {
-            result.insert(
-                id,
-                Correlation {
-                    start: points.get(&id).and_then(|p| p.last()).map_or(y, |p| p.y),
-                    replies: vec![],
-                },
-            );
-        }
-    }
-    for (&id, &(scope, y)) in rows {
-        if let Some(SharedBody::Occurrence {
-            body:
-                OccurrenceBody::Exchange {
-                    message_kind: MessageKind::Reply,
-                    reply_to: Some(call),
-                    ..
-                },
-            ..
-        }) = p.elements.get(&id).and_then(|e| e.shared())
-            && let Some(correlation) = result.get_mut(call)
-        {
-            let sent = points.get(&id).and_then(|p| p.first()).map_or(y, |p| p.y);
-            correlation.replies.push((scope, sent));
-        }
-    }
-    result
-}
-
-/// A caller has no implicit execution just because it sent a message. Only an
-/// actually drawn, known-duration execution can supply its anchor. Crossed
-/// intervals provide no unambiguous innermost execution, so fall back to the lane.
-fn active_segment<'a>(
-    p: &Project,
-    segments: &'a [Segment],
-    correlations: &BTreeMap<Id, Correlation>,
-    receiver: Id,
-    scope: Id,
-    y: f32,
-    exclude: Option<Id>,
-) -> Option<&'a Segment> {
-    let candidates: Vec<_> = segments
-        .iter()
-        .filter(|a| {
-            a.receiver == receiver
-                && a.scope == scope
-                && Some(a.call) != exclude
-                && a.rect.y <= y
-                && y < a.bottom()
-                && a.finish != Finish::Open
-        })
-        .collect();
-    let inner = candidates.iter().max_by_key(|a| a.column).copied()?;
-    candidates
-        .iter()
-        .all(|a| {
-            a.call == inner.call
-                || correlations[&a.call].contains(p, scope, &correlations[&inner.call])
-        })
-        .then_some(inner)
-}
-
-struct Correlation {
-    start: f32,
-    replies: Vec<(Id, f32)>,
-}
-impl Correlation {
-    fn contains(&self, p: &Project, scope: Id, inner: &Self) -> bool {
-        // Segment clipping at a fragment can make crossed calls appear nested.
-        // Compare actual correlated replies on compatible scope paths instead.
-        let relevant = |&(reply_scope, _): &(Id, f32)| {
-            ancestor(p, scope, reply_scope) || ancestor(p, reply_scope, scope)
-        };
-        let mut compared = false;
-        for &(inner_scope, inner_end) in inner.replies.iter().filter(|reply| relevant(reply)) {
-            let mut matched = false;
-            for &(outer_scope, outer_end) in self.replies.iter().filter(|reply| relevant(reply)) {
-                if ancestor(p, inner_scope, outer_scope) || ancestor(p, outer_scope, inner_scope) {
-                    // Alternative operands are not chronological. Compare only
-                    // returns that can belong to the same enclosing branch path.
-                    if outer_end < inner_end {
-                        return false;
-                    }
-                    matched = true;
-                }
-            }
-            if !matched {
-                return false;
-            }
-            compared = true;
-        }
-        self.start <= inner.start && compared
-    }
-}
-fn ancestor(p: &Project, expected: Id, mut scope: Id) -> bool {
-    for _ in 0..=p.elements.len() {
-        if scope == expected {
-            return true;
-        }
-        let Some(parent) = p.elements.get(&scope).and_then(|e| e.parent) else {
-            return false;
-        };
-        scope = parent;
-    }
-    false
-}
-
-#[cfg(test)]
-mod tests;

crates/oa-desktop/src/behavior/scenario_activation/tests.rs

@@ -1,842 +0,0 @@
-use super::*;
-
-fn id(n: u128) -> Id {
-    Id::from_u128(0x21ca1100000040008000000000000000 + n)
-}
-struct Fixture {
-    project: Project,
-    owner: Id,
-    caller: Id,
-    callee: Id,
-    call: Id,
-    inner: Id,
-    reply: Id,
-    inner_reply: Id,
-}
-fn seed(p: &mut Project, layer: Layer, n: u128, kind: Kind, parent: Option<Id>) -> Id {
-    let mut e = p
-        .make_element(kind, layer, &format!("Element {n}"), parent)
-        .unwrap();
-    e.id = id(n);
-    e.alias = format!("element_{n}");
-    p.elements.insert(e.id, e);
-    id(n)
-}
-fn message(
-    p: &mut Project,
-    layer: Layer,
-    n: u128,
-    parent: Id,
-    endpoints: (Id, Id),
-    reply: Option<Id>,
-) -> Id {
-    let e = seed(p, layer, n, Kind::Occurrence, Some(parent));
-    *p.elements.get_mut(&e).unwrap().shared_mut().unwrap() = SharedBody::Occurrence {
-        body: OccurrenceBody::Exchange {
-            operation: None,
-            exchange: None,
-            sender: Some(endpoints.0),
-            receiver: Some(endpoints.1),
-            message_kind: if reply.is_some() {
-                MessageKind::Reply
-            } else {
-                MessageKind::Call
-            },
-            reply_to: reply,
-            values: vec![],
-        },
-        precondition: String::new(),
-        postcondition: String::new(),
-    };
-    e
-}
-fn fixture(layer: Layer, reverse_uuid_order: bool) -> Fixture {
-    let mut p = Project::empty();
-    let work = if layer == Layer::Oa {
-        Kind::Activity
-    } else {
-        Kind::Function
-    };
-    let a = seed(&mut p, layer, 1, work, None);
-    let b = seed(&mut p, layer, 2, work, None);
-    let owner = seed(&mut p, layer, 3, Kind::Scenario, None);
-    if let SharedBody::Scenario { viewpoint, .. } =
-        p.elements.get_mut(&owner).unwrap().shared_mut().unwrap()
-    {
-        *viewpoint = if layer == Layer::Oa {
-            ScenarioViewpoint::OperationalActivity
-        } else {
-            ScenarioViewpoint::Functional
-        };
-    }
-    let caller = seed(&mut p, layer, 4, Kind::Lifeline, Some(owner));
-    let callee = seed(&mut p, layer, 5, Kind::Lifeline, Some(owner));
-    for (line, represented) in [(caller, a), (callee, b)] {
-        *p.elements.get_mut(&line).unwrap().shared_mut().unwrap() = SharedBody::Lifeline {
-            represented: Some(represented),
-        };
-    }
-    let (first, second) = if reverse_uuid_order {
-        (40, 30)
-    } else {
-        (30, 40)
-    };
-    let call = message(&mut p, layer, first, owner, (caller, callee), None);
-    let inner = message(&mut p, layer, second, owner, (caller, callee), None);
-    let reply = message(&mut p, layer, 50, owner, (callee, caller), Some(call));
-    let inner_reply = message(&mut p, layer, 60, owner, (callee, caller), Some(inner));
-    *p.elements.get_mut(&owner).unwrap().steps_mut().unwrap() =
-        vec![call, inner, inner_reply, reply];
-    Fixture {
-        project: p,
-        owner,
-        caller,
-        callee,
-        call,
-        inner,
-        reply,
-        inner_reply,
-    }
-}
-fn scene(f: &Fixture) -> Scene {
-    let errors: Vec<_> = validation::validate(&f.project)
-        .into_iter()
-        .filter(|i| i.severity == validation::Severity::Error)
-        .collect();
-    assert!(errors.is_empty(), "Actual core fixture: {errors:#?}");
-    let source = language::format(&f.project);
-    let reparsed = language::parse(&source).unwrap();
-    assert_eq!(language::format(&reparsed), source);
-    let result = Scene::sequence(&reparsed, f.owner, f.owner);
-    assert_eq!(
-        language::format(&reparsed),
-        source,
-        "Projection must not write geometry into the model"
-    );
-    result
-}
-fn bar(scene: &Scene, call: Id) -> &Segment {
-    scene.activations.iter().find(|a| a.call == call).unwrap()
-}
-
-fn long_labels(f: &mut Fixture) {
-    for occurrence in [f.call, f.inner, f.inner_reply, f.reply] {
-        f.project.elements.get_mut(&occurrence).unwrap().name =
-            "Pressure verification with a descriptive operation label".into();
-    }
-}
-
-#[test]
-fn activation_shoulders_under_label_backplates_select_their_call() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = fixture(layer, true);
-        long_labels(&mut f);
-        let scene = scene(&f);
-        let outer = bar(&scene, f.call);
-        for occurrence in [f.inner, f.inner_reply, f.reply] {
-            let message = line(&scene, occurrence);
-            let shoulder = Point::new(outer.rect.x + 1., message.label_at.y + 11.);
-            assert!(outer.rect.contains(shoulder));
-            assert!(Rectangle::new(message.label_at, Size::new(225., 22.)).contains(shoulder));
-            assert!(message.label.chars().count() > 32);
-            assert!(message.points.windows(2).all(|p| {
-                crate::diagram::distance_to_segment(shoulder, p[0], p[1]) > 8. / scene.scale
-            }));
-            assert_eq!(scene.hit(shoulder), Some(f.call));
-            assert_eq!(
-                scene.hit(message.label_at + iced::Vector::new(4., 4.)),
-                Some(occurrence),
-                "Label text outside activations remains selectable"
-            );
-        }
-        for occurrence in [f.call, f.inner, f.inner_reply, f.reply] {
-            let message = line(&scene, occurrence);
-            for endpoint in [message.points[0], *message.points.last().unwrap()] {
-                assert_eq!(scene.hit(endpoint), Some(occurrence));
-            }
-        }
-    }
-}
-
-#[tokio::test]
-async fn long_message_backplates_do_not_erase_selected_activation_border_pixels() {
-    use iced::advanced::renderer::Headless;
-    use iced_runtime::user_interface::{Cache, UserInterface};
-
-    let mut mounted = crate::behavior::canvas_workspace::tests::Mounted::unshown().await;
-    let mut f = fixture(Layer::Oa, true);
-    long_labels(&mut f);
-    let mut scene = scene(&f);
-    scene.selected = f.call;
-    let border_x = bar(&scene, f.call).rect.x;
-    let label_spans: Vec<_> = [f.inner, f.inner_reply, f.reply]
-        .into_iter()
-        .map(|id| {
-            let message = line(&scene, id);
-            assert!(
-                Rectangle::new(message.label_at, Size::new(225., 22.))
-                    .contains(Point::new(border_x, message.label_at.y + 11.))
-            );
-            (message.label_at.y + 3.) as usize..(message.label_at.y + 20.) as usize
-        })
-        .collect();
-    let dimensions = Size::new(800., 700.);
-    let content: Element<'_, Message> = canvas::Canvas::new(scene)
-        .width(dimensions.width)
-        .height(dimensions.height)
-        .into();
-    let mut ui = UserInterface::build(content, dimensions, Cache::new(), &mut mounted.renderer);
-    ui.draw(
-        &mut mounted.renderer,
-        &style::theme(),
-        &iced::advanced::renderer::Style {
-            text_color: style::INK,
-        },
-        mouse::Cursor::Unavailable,
-    );
-    let pixels = Headless::screenshot(&mut mounted.renderer, Size::new(800, 700), 1., Color::WHITE);
-    let expected = [style::TEAL.r, style::TEAL.g, style::TEAL.b].map(|v| v * 255.);
-    for span in label_spans {
-        for y in span {
-            assert!(
-                ((border_x as usize - 2)..=(border_x as usize + 2)).any(|x| {
-                    let offset = (y * 800 + x) * 4;
-                    pixels[offset..offset + 3]
-                        .iter()
-                        .zip(expected)
-                        .all(|(actual, target)| (*actual as f32 - target).abs() < 30.)
-                }),
-                "Selected activation border was erased at y={y}"
-            );
-        }
-    }
-}
-fn line(scene: &Scene, occurrence: Id) -> &super::super::Line {
-    scene.lines.iter().find(|a| a.id == occurrence).unwrap()
-}
-fn endpoints(p: &mut Project, occurrence: Id, from: Id, to: Id) {
-    if let SharedBody::Occurrence {
-        body: OccurrenceBody::Exchange {
-            sender, receiver, ..
-        },
-        ..
-    } = p
-        .elements
-        .get_mut(&occurrence)
-        .unwrap()
-        .shared_mut()
-        .unwrap()
-    {
-        *sender = Some(from);
-        *receiver = Some(to);
-    }
-}
-
-#[test]
-fn nested_calls_expose_both_bars_and_end_at_their_exact_replies_in_both_directions() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        for reverse in [false, true] {
-            let mut f = fixture(layer, true);
-            if reverse {
-                for occurrence in [f.call, f.inner] {
-                    endpoints(&mut f.project, occurrence, f.callee, f.caller);
-                }
-                for occurrence in [f.reply, f.inner_reply] {
-                    endpoints(&mut f.project, occurrence, f.caller, f.callee);
-                }
-            }
-            let scene = scene(&f);
-            let outer = bar(&scene, f.call);
-            let inner = bar(&scene, f.inner);
-            assert!(outer.rect.y < inner.rect.y && outer.bottom() > inner.bottom());
-            assert_eq!(outer.column, 0);
-            assert_eq!(inner.column, 1);
-            assert!(outer.rect.x < inner.rect.x && outer.edge(true) < inner.edge(true));
-            for (call, reply) in [(f.call, f.reply), (f.inner, f.inner_reply)] {
-                let execution = bar(&scene, call);
-                let received = *line(&scene, call).points.last().unwrap();
-                let returned = line(&scene, reply).points[0];
-                assert_eq!(execution.rect.y, received.y);
-                assert_eq!(execution.bottom(), returned.y);
-                assert_eq!(received.x, execution.edge(reverse));
-                assert_eq!(returned.x, execution.edge(reverse));
-                assert_eq!(execution.finish, Finish::Reply(reply));
-            }
-            assert!(scene.open_calls.is_empty());
-        }
-    }
-}
-
-#[test]
-fn call_uuid_order_does_not_choose_activation_columns_or_message_anchors() {
-    let f = fixture(Layer::Oa, false);
-    let g = fixture(Layer::Oa, true);
-    let a = scene(&f);
-    let b = scene(&g);
-    for (x, y) in [
-        (f.call, g.call),
-        (f.inner, g.inner),
-        (f.reply, g.reply),
-        (f.inner_reply, g.inner_reply),
-    ] {
-        assert_eq!(line(&a, x).points, line(&b, y).points);
-    }
-    for (x, y) in [(f.call, g.call), (f.inner, g.inner)] {
-        assert_eq!(bar(&a, x).rect, bar(&b, y).rect);
-    }
-}
-
-#[test]
-fn sequential_calls_reuse_column_and_crossed_replies_keep_their_correlations() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = fixture(layer, true);
-        *f.project
-            .elements
-            .get_mut(&f.owner)
-            .unwrap()
-            .steps_mut()
-            .unwrap() = vec![f.call, f.reply, f.inner, f.inner_reply];
-        let sequential = scene(&f);
-        assert_eq!(
-            bar(&sequential, f.call).rect.x,
-            bar(&sequential, f.inner).rect.x
-        );
-        *f.project
-            .elements
-            .get_mut(&f.owner)
-            .unwrap()
-            .steps_mut()
-            .unwrap() = vec![f.call, f.inner, f.reply, f.inner_reply];
-        let crossed = scene(&f);
-        assert!(bar(&crossed, f.call).bottom() < bar(&crossed, f.inner).bottom());
-        assert!(bar(&crossed, f.call).rect.x < bar(&crossed, f.inner).rect.x);
-        assert_eq!(
-            line(&crossed, f.reply).points[0].x,
-            bar(&crossed, f.call).edge(false)
-        );
-        assert_eq!(
-            line(&crossed, f.inner_reply).points[0].x,
-            bar(&crossed, f.inner).edge(false)
-        );
-    }
-}
-
-#[test]
-fn self_call_receives_at_lower_loop_end_and_self_reply_returns_to_the_parent() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = fixture(layer, true);
-        endpoints(&mut f.project, f.inner, f.callee, f.callee);
-        endpoints(&mut f.project, f.inner_reply, f.callee, f.callee);
-        let scene = scene(&f);
-        let parent = bar(&scene, f.call);
-        let child = bar(&scene, f.inner);
-        let call = line(&scene, f.inner);
-        let reply = line(&scene, f.inner_reply);
-        assert_eq!(call.points[0].x, parent.edge(true));
-        assert_eq!(call.points[3], Point::new(child.edge(true), child.rect.y));
-        assert_eq!(child.rect.y, scene.rows[&f.inner].1 + 24.);
-        assert_eq!(
-            reply.points[0],
-            Point::new(child.edge(true), child.bottom())
-        );
-        assert_eq!(reply.points[3].x, parent.edge(true));
-        assert!(call.points[1].x > child.edge(true));
-        assert!(reply.points[1].x > child.edge(true));
-    }
-}
-
-#[test]
-fn an_inactive_self_call_has_no_fabricated_parent_and_three_nested_calls_expose_three_columns() {
-    let mut f = fixture(Layer::Oa, true);
-    endpoints(&mut f.project, f.inner, f.callee, f.callee);
-    endpoints(&mut f.project, f.inner_reply, f.callee, f.callee);
-    f.project.elements.remove(&f.call);
-    f.project.elements.remove(&f.reply);
-    *f.project
-        .elements
-        .get_mut(&f.owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap() = vec![f.inner, f.inner_reply];
-    let isolated = scene(&f);
-    assert_eq!(isolated.activations.len(), 1);
-    assert_eq!(bar(&isolated, f.inner).column, 0);
-    assert_eq!(
-        line(&isolated, f.inner).points[0].x,
-        isolated.lanes[&f.callee]
-    );
-    assert_eq!(
-        line(&isolated, f.inner_reply).points[3].x,
-        isolated.lanes[&f.callee]
-    );
-    assert_eq!(
-        bar(&isolated, f.inner).rect.y,
-        line(&isolated, f.inner).points[3].y
-    );
-
-    let mut f = fixture(Layer::Oa, true);
-    let third = message(
-        &mut f.project,
-        Layer::Oa,
-        20,
-        f.owner,
-        (f.caller, f.callee),
-        None,
-    );
-    let third_reply = message(
-        &mut f.project,
-        Layer::Oa,
-        21,
-        f.owner,
-        (f.callee, f.caller),
-        Some(third),
-    );
-    *f.project
-        .elements
-        .get_mut(&f.owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap() = vec![f.call, f.inner, third, third_reply, f.inner_reply, f.reply];
-    let scene = scene(&f);
-    let calls: Vec<_> = scene.activations.iter().map(|a| a.call).collect();
-    assert_eq!(
-        calls,
-        vec![f.call, f.inner, third],
-        "Paint order is shallow to deep"
-    );
-    for (column, call) in [f.call, f.inner, third].into_iter().enumerate() {
-        let execution = bar(&scene, call);
-        assert_eq!(execution.column, column);
-        let y = (bar(&scene, third).rect.y + bar(&scene, third).bottom()) / 2.;
-        assert_eq!(
-            scene.hit(Point::new(execution.rect.x + OFFSET / 2., y)),
-            Some(call)
-        );
-    }
-}
-
-#[test]
-fn reentrant_call_uses_the_other_receiver_without_inventing_a_caller_execution() {
-    let mut f = fixture(Layer::Oa, true);
-    endpoints(&mut f.project, f.inner, f.callee, f.caller);
-    endpoints(&mut f.project, f.inner_reply, f.caller, f.callee);
-    let scene = scene(&f);
-    assert_eq!(bar(&scene, f.call).column, 0);
-    assert_eq!(bar(&scene, f.inner).column, 0);
-    assert_eq!(bar(&scene, f.inner).receiver, f.caller);
-    assert_eq!(line(&scene, f.call).points[0].x, scene.lanes[&f.caller]);
-    assert_eq!(
-        line(&scene, f.inner).points[0].x,
-        bar(&scene, f.call).edge(false)
-    );
-}
-
-#[test]
-fn actual_canvas_pointer_selects_each_exposed_shoulder_under_zoom_and_pan() {
-    let f = fixture(Layer::Oa, true);
-    let mut scene = scene(&f);
-    let context = scenario::direct_tests::context(f.owner);
-    scene.interaction = Some((context, scenario::CanvasTool::Select, true));
-    let y = (bar(&scene, f.inner).rect.y + bar(&scene, f.inner).bottom()) / 2.;
-    let outer = Point::new(bar(&scene, f.call).rect.x + OFFSET / 2., y);
-    let inner = Point::new(bar(&scene, f.inner).edge(true) - OFFSET / 2., y);
-    for scale in [1., 0.25, 0.05] {
-        scene.scale = scale;
-        scene.camera_pan = iced::Vector::new(50., 25.);
-        let bounds = Rectangle::new(Point::new(30., 40.), Size::new(1000., 700.));
-        for (point, call) in [(outer, f.call), (inner, f.inner)] {
-            assert_eq!(scene.hit(point), Some(call));
-            let cursor = bounds.position()
-                + scene.camera_pan
-                + iced::Vector::new(point.x * scale, point.y * scale);
-            let mut state = SequenceInput::default();
-            let _ = canvas::Program::update(
-                &scene,
-                &mut state,
-                &canvas::Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)),
-                bounds,
-                mouse::Cursor::Available(cursor),
-            );
-            let action = canvas::Program::update(
-                &scene,
-                &mut state,
-                &canvas::Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)),
-                bounds,
-                mouse::Cursor::Available(cursor),
-            )
-            .unwrap();
-            assert!(matches!(action.into_inner().0,
-                Some(Message::ScenarioCanvas(scenario::CanvasEvent::Select(_, selected))) if selected == call));
-        }
-    }
-}
-
-#[test]
-fn missing_reply_is_a_short_explicit_open_span_and_an_uncorrelated_reply_closes_nothing() {
-    let mut f = fixture(Layer::Oa, true);
-    if let SharedBody::Occurrence {
-        body: OccurrenceBody::Exchange { reply_to, .. },
-        ..
-    } = f
-        .project
-        .elements
-        .get_mut(&f.reply)
-        .unwrap()
-        .shared_mut()
-        .unwrap()
-    {
-        *reply_to = None;
-    }
-    let scene = scene(&f);
-    assert_eq!(bar(&scene, f.call).finish, Finish::Open);
-    assert_eq!(bar(&scene, f.call).rect.height, 26.);
-    assert_eq!(scene.open_calls.len(), 1);
-    assert_eq!(
-        bar(&scene, f.inner).column,
-        0,
-        "Unknown duration does not prove later nesting"
-    );
-    assert_eq!(bar(&scene, f.inner).finish, Finish::Reply(f.inner_reply));
-}
-
-#[test]
-fn alternative_and_parallel_operand_local_calls_do_not_nest_from_screen_order() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        for operator in [FragmentOperator::Alternative, FragmentOperator::Parallel] {
-            let mut f = fixture(layer, true);
-            let fragment = seed(&mut f.project, layer, 70, Kind::Occurrence, Some(f.owner));
-            let branches = [id(71), id(72)];
-            *f.project
-                .elements
-                .get_mut(&fragment)
-                .unwrap()
-                .shared_mut()
-                .unwrap() = SharedBody::Occurrence {
-                body: OccurrenceBody::Fragment {
-                    operator,
-                    branches: branches.to_vec(),
-                },
-                precondition: String::new(),
-                postcondition: String::new(),
-            };
-            for (index, occurrences) in [vec![f.call, f.reply], vec![f.inner, f.inner_reply]]
-                .into_iter()
-                .enumerate()
-            {
-                let branch = seed(
-                    &mut f.project,
-                    layer,
-                    71 + index as u128,
-                    Kind::Occurrence,
-                    Some(fragment),
-                );
-                for occurrence in &occurrences {
-                    f.project.elements.get_mut(occurrence).unwrap().parent = Some(branch);
-                }
-                *f.project
-                    .elements
-                    .get_mut(&branch)
-                    .unwrap()
-                    .shared_mut()
-                    .unwrap() = SharedBody::Occurrence {
-                    body: OccurrenceBody::Branch {
-                        guard: format!("condition_{index}"),
-                        occurrences,
-                    },
-                    precondition: String::new(),
-                    postcondition: String::new(),
-                };
-            }
-            *f.project
-                .elements
-                .get_mut(&f.owner)
-                .unwrap()
-                .steps_mut()
-                .unwrap() = vec![fragment];
-            let scene = scene(&f);
-            assert_eq!(bar(&scene, f.call).column, 0);
-            assert_eq!(bar(&scene, f.inner).column, 0);
-            assert_ne!(bar(&scene, f.call).scope, bar(&scene, f.inner).scope);
-            assert!(scene.open_calls.is_empty());
-        }
-    }
-}
-
-#[test]
-fn inherited_execution_anchors_a_self_call_inside_an_operand_before_returning_after_the_fragment() {
-    let mut f = fixture(Layer::Oa, true);
-    endpoints(&mut f.project, f.inner, f.callee, f.callee);
-    endpoints(&mut f.project, f.inner_reply, f.callee, f.callee);
-    let fragment = seed(
-        &mut f.project,
-        Layer::Oa,
-        70,
-        Kind::Occurrence,
-        Some(f.owner),
-    );
-    *f.project
-        .elements
-        .get_mut(&fragment)
-        .unwrap()
-        .shared_mut()
-        .unwrap() = SharedBody::Occurrence {
-        body: OccurrenceBody::Fragment {
-            operator: FragmentOperator::Alternative,
-            branches: vec![id(71), id(72)],
-        },
-        precondition: String::new(),
-        postcondition: String::new(),
-    };
-    for (index, occurrences) in [vec![f.inner, f.inner_reply], vec![]]
-        .into_iter()
-        .enumerate()
-    {
-        let branch = seed(
-            &mut f.project,
-            Layer::Oa,
-            71 + index as u128,
-            Kind::Occurrence,
-            Some(fragment),
-        );
-        for occurrence in &occurrences {
-            f.project.elements.get_mut(occurrence).unwrap().parent = Some(branch);
-        }
-        *f.project
-            .elements
-            .get_mut(&branch)
-            .unwrap()
-            .shared_mut()
-            .unwrap() = SharedBody::Occurrence {
-            body: OccurrenceBody::Branch {
-                guard: format!("condition_{index}"),
-                occurrences,
-            },
-            precondition: String::new(),
-            postcondition: String::new(),
-        };
-    }
-    *f.project
-        .elements
-        .get_mut(&f.owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap() = vec![f.call, fragment, f.reply];
-    let scene = scene(&f);
-    let parent = scene
-        .activations
-        .iter()
-        .find(|a| a.call == f.call && a.scope == id(71))
-        .unwrap();
-    assert_eq!(parent.finish, Finish::Continuation);
-    assert_eq!(bar(&scene, f.inner).column, parent.column + 1);
-    assert_eq!(line(&scene, f.inner).points[0].x, parent.edge(true));
-    assert_eq!(line(&scene, f.inner_reply).points[3].x, parent.edge(true));
-    assert!(
-        scene
-            .activations
-            .iter()
-            .any(|a| a.call == f.call && a.finish == Finish::Reply(f.reply))
-    );
-}
-
-#[test]
-fn a_fragment_cannot_make_crossed_calls_an_unambiguous_caller_execution() {
-    for placement in ["plain", "before_fragment", "in_operand"] {
-        let mut f = fixture(Layer::Oa, true);
-        let outgoing = message(
-            &mut f.project,
-            Layer::Oa,
-            80,
-            f.owner,
-            (f.callee, f.caller),
-            None,
-        );
-        if let SharedBody::Occurrence {
-            body: OccurrenceBody::Exchange { message_kind, .. },
-            ..
-        } = f
-            .project
-            .elements
-            .get_mut(&outgoing)
-            .unwrap()
-            .shared_mut()
-            .unwrap()
-        {
-            *message_kind = MessageKind::Asynchronous;
-        }
-        let mut ordered = vec![f.call, f.inner];
-        if placement != "in_operand" {
-            ordered.push(outgoing);
-        }
-        if placement != "plain" {
-            let fragment = seed(
-                &mut f.project,
-                Layer::Oa,
-                70,
-                Kind::Occurrence,
-                Some(f.owner),
-            );
-            *f.project
-                .elements
-                .get_mut(&fragment)
-                .unwrap()
-                .shared_mut()
-                .unwrap() = SharedBody::Occurrence {
-                body: OccurrenceBody::Fragment {
-                    operator: FragmentOperator::Alternative,
-                    branches: vec![id(71), id(72)],
-                },
-                precondition: String::new(),
-                postcondition: String::new(),
-            };
-            for index in 0..2u128 {
-                let branch = seed(
-                    &mut f.project,
-                    Layer::Oa,
-                    71 + index,
-                    Kind::Occurrence,
-                    Some(fragment),
-                );
-                let occurrences = if index == 0 && placement == "in_operand" {
-                    f.project.elements.get_mut(&outgoing).unwrap().parent = Some(branch);
-                    vec![outgoing]
-                } else {
-                    vec![]
-                };
-                *f.project
-                    .elements
-                    .get_mut(&branch)
-                    .unwrap()
-                    .shared_mut()
-                    .unwrap() = SharedBody::Occurrence {
-                    body: OccurrenceBody::Branch {
-                        guard: format!("condition_{index}"),
-                        occurrences,
-                    },
-                    precondition: String::new(),
-                    postcondition: String::new(),
-                };
-            }
-            ordered.push(fragment);
-        }
-        ordered.extend([f.reply, f.inner_reply]);
-        *f.project
-            .elements
-            .get_mut(&f.owner)
-            .unwrap()
-            .steps_mut()
-            .unwrap() = ordered;
-        let scene = scene(&f);
-        assert_eq!(
-            line(&scene, outgoing).points[0].x,
-            scene.lanes[&f.callee],
-            "{placement}"
-        );
-    }
-}
-
-#[test]
-fn nested_correlations_returning_in_alternative_operands_remain_nested_before_the_fragment() {
-    let mut f = fixture(Layer::Oa, true);
-    let outgoing = message(
-        &mut f.project,
-        Layer::Oa,
-        80,
-        f.owner,
-        (f.callee, f.caller),
-        None,
-    );
-    if let SharedBody::Occurrence {
-        body: OccurrenceBody::Exchange { message_kind, .. },
-        ..
-    } = f
-        .project
-        .elements
-        .get_mut(&outgoing)
-        .unwrap()
-        .shared_mut()
-        .unwrap()
-    {
-        *message_kind = MessageKind::Asynchronous;
-    }
-    let fragment = seed(
-        &mut f.project,
-        Layer::Oa,
-        70,
-        Kind::Occurrence,
-        Some(f.owner),
-    );
-    *f.project
-        .elements
-        .get_mut(&fragment)
-        .unwrap()
-        .shared_mut()
-        .unwrap() = SharedBody::Occurrence {
-        body: OccurrenceBody::Fragment {
-            operator: FragmentOperator::Alternative,
-            branches: vec![id(71), id(72)],
-        },
-        precondition: String::new(),
-        postcondition: String::new(),
-    };
-    for index in 0..2u128 {
-        let branch = seed(
-            &mut f.project,
-            Layer::Oa,
-            71 + index,
-            Kind::Occurrence,
-            Some(fragment),
-        );
-        let occurrences = if index == 0 {
-            for reply in [f.inner_reply, f.reply] {
-                f.project.elements.get_mut(&reply).unwrap().parent = Some(branch);
-            }
-            vec![f.inner_reply, f.reply]
-        } else {
-            vec![
-                message(
-                    &mut f.project,
-                    Layer::Oa,
-                    90,
-                    branch,
-                    (f.callee, f.caller),
-                    Some(f.inner),
-                ),
-                message(
-                    &mut f.project,
-                    Layer::Oa,
-                    91,
-                    branch,
-                    (f.callee, f.caller),
-                    Some(f.call),
-                ),
-            ]
-        };
-        *f.project
-            .elements
-            .get_mut(&branch)
-            .unwrap()
-            .shared_mut()
-            .unwrap() = SharedBody::Occurrence {
-            body: OccurrenceBody::Branch {
-                guard: format!("condition_{index}"),
-                occurrences,
-            },
-            precondition: String::new(),
-            postcondition: String::new(),
-        };
-    }
-    *f.project
-        .elements
-        .get_mut(&f.owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap() = vec![f.call, f.inner, outgoing, fragment];
-    let scene = scene(&f);
-    let inner = scene
-        .activations
-        .iter()
-        .find(|a| a.call == f.inner && a.scope == f.owner)
-        .unwrap();
-    assert_eq!(line(&scene, outgoing).points[0].x, inner.edge(false));
-}

crates/oa-desktop/src/behavior/scenario_hit_tests.rs

@@ -1,386 +0,0 @@
-//! Actual Scene primitives, with independently chosen points and semantic IDs.
-//! These preserve the existing label hit band; they do not establish ink bounds
-//! or authoring eligibility, and do not dispatch a spacing gesture.
-use super::*;
-use crate::document::Document;
-
-struct Fixture {
-    project: Project,
-    owner: Id,
-    sender: Id,
-    receiver: Id,
-    call: Id,
-    reply: Id,
-    exchange: Id,
-}
-
-fn fixture() -> Fixture {
-    let project = language::parse(r#"arcadia 7;
-project hits "Hit roles" {
- oa_activity source "Source" {}
- oa_activity target "Target" {}
- interaction exchange "Contract" { source @source; target @target; }
- oa_scenario conversation "Conversation" { viewpoint OperationalActivity; steps [@call, @reply]; }
- oa_lifeline left "Left" { parent @conversation; represented @source; }
- oa_lifeline right "Right" { parent @conversation; represented @target; }
- oa_occurrence call "Call" { parent @conversation; body { Exchange { exchange @exchange; sender @left; receiver @right; message_kind Call; }; }; }
- oa_occurrence reply "Reply" { parent @conversation; body { Exchange { exchange @exchange; sender @right; receiver @left; message_kind Reply; reply_to @call; }; }; }
-}
-"#).unwrap();
-    let id = |alias: &str| {
-        project
-            .identities()
-            .into_iter()
-            .find(|(_, name)| *name == alias)
-            .unwrap()
-            .0
-    };
-    Fixture {
-        owner: id("conversation"),
-        sender: id("left"),
-        receiver: id("right"),
-        call: id("call"),
-        reply: id("reply"),
-        exchange: id("exchange"),
-        project,
-    }
-}
-
-fn scene(f: &Fixture) -> Scene {
-    let document =
-        Document::from_project(f.project.clone(), source_project::ProjectLimits::default())
-            .unwrap();
-    let before = document.snapshot();
-    let result = Scene::sequence_geometry(
-        document.project(),
-        f.owner,
-        f.call,
-        Some(&BTreeMap::from([(f.sender, 160.), (f.receiver, 400.)])),
-        None,
-    );
-    assert_eq!(document.project(), &before.decoded.project);
-    assert_eq!(document.bundle(), &before.bundle);
-    assert_eq!(document.revision(), 0);
-    assert!(!document.can_undo() && !document.can_redo() && !document.dirty());
-    result
-}
-
-fn hit(scene: &Scene, point: Point, id: Id, role: SceneHitRole) {
-    assert_eq!(scene.hit_item(point), Some(SceneHit { id, role }));
-    assert_eq!(scene.hit(point), Some(id));
-}
-
-fn occurrence(p: &mut Project, parent: Id, body: OccurrenceBody) -> Id {
-    let mut element = p
-        .make_element(Kind::Occurrence, Layer::Oa, "Hit target", Some(parent))
-        .unwrap();
-    let id = element.id;
-    *element.shared_mut().unwrap() = SharedBody::Occurrence {
-        body,
-        precondition: String::new(),
-        postcondition: String::new(),
-    };
-    p.elements.insert(id, element);
-    p.elements
-        .get_mut(&parent)
-        .unwrap()
-        .steps_mut()
-        .unwrap()
-        .push(id);
-    id
-}
-
-fn exchange_mut(p: &mut Project, id: Id) -> &mut OccurrenceBody {
-    let SharedBody::Occurrence { body, .. } =
-        p.elements.get_mut(&id).unwrap().shared_mut().unwrap()
-    else {
-        panic!("expected occurrence")
-    };
-    body
-}
-
-#[test]
-fn exact_headers_include_unassigned_lifelines_but_guides_are_not_headers() {
-    let mut f = fixture();
-    *f.project
-        .elements
-        .get_mut(&f.receiver)
-        .unwrap()
-        .shared_mut()
-        .unwrap() = SharedBody::Lifeline { represented: None };
-    let s = scene(&f);
-    assert!(!s.lanes.contains_key(&f.receiver));
-    assert_eq!(s.render_lanes[&f.receiver], 400.);
-    for (id, x) in [(f.sender, 160.), (f.receiver, 400.)] {
-        // The actual header is x-102..x+102, y15..85, including its padding.
-        for point in [Point::new(x - 101., 16.), Point::new(x + 101., 84.)] {
-            hit(&s, point, id, SceneHitRole::LifelineHeader);
-        }
-        hit(&s, Point::new(x, 95.), id, SceneHitRole::LifelineGuide);
-    }
-}
-
-#[test]
-fn repeated_exchange_occurrences_keep_distinct_message_body_and_label_hits() {
-    let f = fixture();
-    let s = scene(&f);
-    assert_eq!(s.rows[&f.call].1, 148.);
-    assert_eq!(s.rows[&f.reply].1, 240.);
-    for (id, y) in [(f.call, 148.), (f.reply, 240.)] {
-        hit(&s, Point::new(280., y), id, SceneHitRole::MessageBody);
-        hit(
-            &s,
-            Point::new(180., y - 16.),
-            id,
-            SceneHitRole::MessageLabel,
-        );
-        assert_ne!(id, f.exchange);
-    }
-}
-
-#[test]
-fn self_call_elbow_and_receive_endpoint_are_messages_not_execution_hits() {
-    let mut f = fixture();
-    for id in [f.call, f.reply] {
-        let OccurrenceBody::Exchange {
-            sender,
-            receiver,
-            exchange,
-            ..
-        } = exchange_mut(&mut f.project, id)
-        else {
-            unreachable!()
-        };
-        *sender = Some(f.sender);
-        *receiver = Some(f.sender);
-        *exchange = None;
-    }
-    let s = scene(&f);
-    let call = s.lines.iter().find(|l| l.id == f.call).unwrap();
-    assert_eq!(call.points.len(), 4);
-    assert_eq!(call.points[0].y, 148.);
-    assert_eq!(call.points[3].y, 172.);
-    hit(
-        &s,
-        Point::new(call.points[1].x, 160.),
-        f.call,
-        SceneHitRole::MessageBody,
-    );
-    hit(&s, call.points[3], f.call, SceneHitRole::MessageBody);
-    hit(
-        &s,
-        Point::new(180., 132.),
-        f.call,
-        SceneHitRole::MessageLabel,
-    );
-    let bar = s.activations.iter().find(|a| a.call == f.call).unwrap();
-    hit(
-        &s,
-        Point::new(bar.rect.x + 2., 190.),
-        f.call,
-        SceneHitRole::Activation,
-    );
-}
-
-#[test]
-fn activation_shoulder_beats_another_calls_label_and_broad_message_tolerance() {
-    let mut f = fixture();
-    let mut inner = f.project.elements[&f.call].clone();
-    inner.id = Id::new_v4();
-    inner.alias = "inner_call_hit".into();
-    inner.name = "Pressure verification with a descriptive operation label".into();
-    let inner_id = inner.id;
-    f.project.elements.insert(inner_id, inner);
-    let mut inner_reply = f.project.elements[&f.reply].clone();
-    inner_reply.id = Id::new_v4();
-    inner_reply.alias = "inner_reply_hit".into();
-    let reply_id = inner_reply.id;
-    f.project.elements.insert(reply_id, inner_reply);
-    let OccurrenceBody::Exchange { reply_to, .. } = exchange_mut(&mut f.project, reply_id) else {
-        unreachable!()
-    };
-    *reply_to = Some(inner_id);
-    *f.project
-        .elements
-        .get_mut(&f.owner)
-        .unwrap()
-        .steps_mut()
-        .unwrap() = vec![f.call, inner_id, reply_id, f.reply];
-    let mut s = scene(&f);
-    let inner = s.lines.iter().find(|l| l.id == inner_id).unwrap();
-    let outer = s.activations.iter().find(|a| a.call == f.call).unwrap();
-    let shoulder = Point::new(outer.rect.x + 1., 225.);
-    assert!(outer.rect.contains(shoulder));
-    assert!(inner.label_bounds().contains(shoulder));
-    let endpoint = *inner.points.last().unwrap();
-    for scale in [1., 0.05, 0.0003] {
-        s.scale = scale;
-        hit(&s, shoulder, f.call, SceneHitRole::Activation);
-        hit(&s, endpoint, inner_id, SceneHitRole::MessageBody);
-        hit(
-            &s,
-            Point::new(180., 225.),
-            inner_id,
-            SceneHitRole::MessageLabel,
-        );
-    }
-}
-
-#[test]
-fn create_delete_markers_are_distinct_from_their_own_message_body_and_label() {
-    let mut f = fixture();
-    for (id, kind) in [
-        (f.call, MessageKind::Create),
-        (f.reply, MessageKind::Delete),
-    ] {
-        let OccurrenceBody::Exchange {
-            sender,
-            receiver,
-            message_kind,
-            reply_to,
-            ..
-        } = exchange_mut(&mut f.project, id)
-        else {
-            unreachable!()
-        };
-        *sender = Some(f.sender);
-        *receiver = Some(f.receiver);
-        *message_kind = kind;
-        *reply_to = None;
-    }
-    let s = scene(&f);
-    for (id, y, label_y) in [(f.call, 148., 118.), (f.reply, 240., 224.)] {
-        hit(&s, Point::new(400., y), id, SceneHitRole::LifecycleMarker);
-        hit(&s, Point::new(280., y), id, SceneHitRole::MessageBody);
-        hit(
-            &s,
-            Point::new(180., label_y),
-            id,
-            SceneHitRole::MessageLabel,
-        );
-    }
-    // Capsule boundary owns its contact with the incoming Create arrow.
-    hit(
-        &s,
-        Point::new(330., 148.),
-        f.call,
-        SceneHitRole::LifecycleMarker,
-    );
-}
-
-#[test]
-fn tiny_scale_nearest_hit_retains_the_winning_marker_or_message_role() {
-    let mut f = fixture();
-    let OccurrenceBody::Exchange {
-        sender,
-        receiver,
-        message_kind,
-        reply_to,
-        ..
-    } = exchange_mut(&mut f.project, f.reply)
-    else {
-        unreachable!()
-    };
-    *sender = Some(f.sender);
-    *receiver = Some(f.receiver);
-    *message_kind = MessageKind::Delete;
-    *reply_to = None;
-    let mut s = scene(&f);
-    s.scale = 0.0003;
-    // Both are outside exact strokes/labels. Comparing all broad candidates
-    // chooses the actual nearer shape, even when their UUID is identical.
-    hit(
-        &s,
-        Point::new(280., 246.),
-        f.reply,
-        SceneHitRole::MessageBody,
-    );
-    hit(
-        &s,
-        Point::new(400., 265.),
-        f.reply,
-        SceneHitRole::LifecycleMarker,
-    );
-    hit(
-        &s,
-        Point::new(280., 154.),
-        f.call,
-        SceneHitRole::MessageBody,
-    );
-}
-
-#[test]
-fn action_frame_and_use_boxes_do_not_advertise_message_or_header_roles() {
-    for body in [
-        OccurrenceBody::Action {
-            action: None,
-            lifeline: None,
-        },
-        OccurrenceBody::Fragment {
-            operator: FragmentOperator::Alternative,
-            branches: vec![],
-        },
-        OccurrenceBody::ScenarioUse {
-            scenario: None,
-            bindings: vec![],
-        },
-        OccurrenceBody::Exchange {
-            exchange: None,
-            sender: None,
-            receiver: None,
-            message_kind: MessageKind::Asynchronous,
-            operation: None,
-            reply_to: None,
-            values: vec![],
-        },
-    ] {
-        let mut f = fixture();
-        let id = occurrence(&mut f.project, f.owner, body);
-        let s = scene(&f);
-        let item = s.boxes.iter().find(|b| b.id == id).unwrap();
-        hit(
-            &s,
-            item.rect.position() + iced::Vector::new(15., 15.),
-            id,
-            SceneHitRole::Box,
-        );
-    }
-}
-
-#[test]
-fn winning_primitive_role_does_not_come_from_its_shared_uuid() {
-    let f = fixture();
-    let mut s = scene(&f);
-    // A controlled overlapping primitive verifies reverse box order without
-    // inventing a core alias. Its ID intentionally equals a real header's ID.
-    s.boxes.push(BoxItem {
-        id: f.sender,
-        role: SceneHitRole::Box,
-        rect: Rectangle::new(Point::new(150., 20.), Size::new(20., 20.)),
-        title: "Overlay control".into(),
-        detail: String::new(),
-        marker: None,
-    });
-    hit(&s, Point::new(160., 30.), f.sender, SceneHitRole::Box);
-    hit(
-        &s,
-        Point::new(180., 30.),
-        f.sender,
-        SceneHitRole::LifelineHeader,
-    );
-}
-
-#[test]
-fn invalid_points_never_produce_a_semantic_or_spacing_hit() {
-    let f = fixture();
-    let s = scene(&f);
-    for point in [
-        Point::new(f32::NAN, 148.),
-        Point::new(280., f32::NAN),
-        Point::new(f32::INFINITY, 148.),
-        Point::new(280., f32::NEG_INFINITY),
-    ] {
-        assert_eq!(s.hit_item(point), None);
-        assert_eq!(s.hit(point), None);
-    }
-}

crates/oa-desktop/src/behavior/scenario_label.rs

@@ -1,430 +0,0 @@
-//! Unwired single-line scenario label experiment. No renderer or schema is changed.
-//!
-//! Iced 0.14.0 WGPU `geometry::Frame::fill_text` shapes positive uniform-scale
-//! canvas text at `size * zoom`; its `text::prepare` uses graphics text::Cache.
-//! This adapter uses that same allocator/font system/attributes, not a character
-//! width estimate. Canvas Text::max_width is wrapping, so it stays infinite.
-//! Experimental parity requires settled fonts and a fresh renderer/cache after
-//! font loading. Iced's WGPU text cache key omits FontSystem::Version, so merely
-//! remeasuring here cannot repair its cached glyph buffers after dynamic loading.
-//! A RenderSession is caller attestation of that lifecycle, not its enforcement.
-//! No fonts may be loaded between measurement, guarded access and actual draw.
-//!
-//! Integration seam: after lifecycle/activation endpoint alignment, a caller
-//! supplies a usable text width in world units and retains one cache per live
-//! labelled occurrence across Scene rebuilds. Paint, hit testing, navigation and extents
-//! consume the returned Label. Position/color do not invalidate measurement.
-//! This does NOT choose a self-call, reversed-arrow or obstacle corridor policy.
-//! It measures layout advances, not raster ink; overhang/clip/activation-border
-//! acceptance still requires the real WGPU evaluator. The old 32-grapheme/225px
-//! renderer is deliberately untouched for a later baseline comparison.
-use iced::advanced::{
-    graphics::text as graphics_text,
-    text::{Alignment, LineHeight, Shaping},
-};
-use iced::{Color, Font, Pixels, Point, Rectangle, Size, widget::canvas::Text};
-use std::{collections::VecDeque, ops::Range, sync::Arc};
-use unicode_segmentation::UnicodeSegmentation;
-
-const MAX_SOURCE_BYTES: usize = 64 * 1024;
-const MAX_GRAPHEMES: usize = 4096;
-const MAX_ENTRIES: usize = 2;
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub(super) struct Style {
-    pub font: Font,
-    pub size: Pixels,
-    pub line_height: LineHeight,
-    pub shaping: Shaping,
-}
-
-impl Default for Style {
-    fn default() -> Self {
-        let text = Text::default();
-        Self {
-            font: text.font,
-            size: Pixels(12.),
-            line_height: text.line_height,
-            shaping: text.shaping,
-        }
-    }
-}
-
-impl Style {
-    fn scaled(self, zoom: f32) -> (f32, f32) {
-        let size = Pixels(self.size.0 * zoom);
-        let line_height = match self.line_height {
-            LineHeight::Absolute(value) => LineHeight::Absolute(Pixels(value.0 * zoom)),
-            LineHeight::Relative(value) => LineHeight::Relative(value),
-        };
-        (size.0, line_height.to_absolute(size).0)
-    }
-}
-
-/// Explicit experimental contract: the caller finishes loading fonts and starts
-/// a fresh renderer/cache BEFORE capturing this session, then keeps fonts fixed.
-/// This module cannot inspect or reset the actual renderer's text cache.
-#[derive(Clone, Debug)]
-pub(super) struct RenderSession {
-    version: graphics_text::Version,
-    identity: Arc<()>,
-}
-
-impl RenderSession {
-    pub fn after_fonts_settled_and_renderer_reset() -> Result<Self, Error> {
-        let fonts = graphics_text::font_system()
-            .read()
-            .map_err(|_| Error::FontSystemUnavailable)?;
-        Ok(Self {
-            version: fonts.version(),
-            identity: Arc::new(()),
-        })
-    }
-}
-
-#[derive(Clone, Debug)]
-pub(super) struct Label {
-    source: String,
-    displayed: String,
-    /// Original-label bytes represented before any added ellipsis. Includes
-    /// collapsed whitespace, but `retains_any` never counts whitespace as text.
-    retained_source: Range<usize>,
-    /// World-space layout advances, at origin; not glyph-ink containment.
-    bounds: Rectangle,
-    style: Style,
-    measured_session: RenderSession,
-    measured_zoom: f32,
-}
-
-impl Label {
-    fn check(&self, session: &RenderSession, zoom: f32) -> Result<(), Error> {
-        if !Arc::ptr_eq(&self.measured_session.identity, &session.identity) {
-            return Err(Error::StaleRenderSession);
-        }
-        if !zoom.is_finite() || zoom != self.measured_zoom {
-            return Err(Error::StaleZoom);
-        }
-        let fonts = graphics_text::font_system()
-            .read()
-            .map_err(|_| Error::FontSystemUnavailable)?;
-        if fonts.version() != self.measured_session.version || fonts.version() != session.version {
-            return Err(Error::FontSetChanged);
-        }
-        Ok(())
-    }
-
-    pub fn displayed(&self, session: &RenderSession, zoom: f32) -> Result<&str, Error> {
-        self.check(session, zoom)?;
-        Ok(&self.displayed)
-    }
-
-    pub fn retained_source(
-        &self,
-        session: &RenderSession,
-        zoom: f32,
-    ) -> Result<Range<usize>, Error> {
-        self.check(session, zoom)?;
-        Ok(self.retained_source.clone())
-    }
-
-    pub fn retains_any(
-        &self,
-        session: &RenderSession,
-        zoom: f32,
-        field: Range<usize>,
-    ) -> Result<bool, Error> {
-        self.check(session, zoom)?;
-        if field.start > field.end || self.source.get(field.clone()).is_none() {
-            return Ok(false);
-        }
-        let end = field.end.min(self.retained_source.end);
-        Ok(field.start < end
-            && self
-                .source
-                .get(field.start..end)
-                .is_some_and(|text| text.chars().any(|c| !c.is_whitespace())))
-    }
-
-    /// Validate finite world position and rectangle endpoints only. Camera
-    /// transforms and raster bounds remain a separate integration contract.
-    pub fn bounds_at(
-        &self,
-        session: &RenderSession,
-        zoom: f32,
-        position: Point,
-    ) -> Result<Rectangle, Error> {
-        self.check(session, zoom)?;
-        translated_bounds(position, self.bounds.size())
-    }
-
-    /// Paint under the same positive uniform zoom used for `Cache::resolve`.
-    /// No per-label wrapping or implicit text maximum is introduced.
-    /// The returned Text must be consumed immediately in this session/zoom;
-    /// retaining raw Text past another font load/zoom change bypasses the guard.
-    pub fn canvas_text(
-        &self,
-        session: &RenderSession,
-        zoom: f32,
-        position: Point,
-        color: Color,
-    ) -> Result<Text, Error> {
-        self.bounds_at(session, zoom, position)?;
-        Ok(Text {
-            content: self.displayed.clone(),
-            position,
-            color,
-            size: self.style.size,
-            line_height: self.style.line_height,
-            font: self.style.font,
-            shaping: self.style.shaping,
-            max_width: f32::INFINITY,
-            ..Text::default()
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub(super) enum Error {
-    InvalidMetrics,
-    SourceBudget,
-    GraphemeBudget,
-    FontSystemUnavailable,
-    InvalidMeasurement,
-    InvalidPosition,
-    StaleZoom,
-    StaleRenderSession,
-    FontSetChanged,
-}
-
-struct Entry {
-    source: String,
-    style: Style,
-    zoom: f32,
-    width: f32,
-    label: Arc<Label>,
-}
-
-#[derive(Default)]
-/// Two recent resolutions for ONE live labelled occurrence. A global small LRU
-/// would thrash when a larger Scene is rebuilt in order. The integration owner
-/// must retain these by occurrence identity and prune on removal/document change.
-pub(super) struct Cache {
-    version: Option<graphics_text::Version>,
-    session: Option<Arc<()>>,
-    entries: VecDeque<Entry>,
-    #[cfg(test)]
-    allocations: usize,
-}
-
-impl Cache {
-    /// `width` excludes any caller-chosen backplate padding. Zero is valid.
-    /// Cache ownership must survive redraws; constructing one per Scene defeats
-    /// reuse. Changed fonts invalidate the SESSION: the caller must establish
-    /// a fresh renderer and a new settled session, not just remeasure this cache.
-    /// Error handling/fallback for these explicit experiment budgets is an
-    /// integration decision; never silently paint the old truncated contract.
-    pub fn resolve(
-        &mut self,
-        session: &RenderSession,
-        source: &str,
-        width: f32,
-        zoom: f32,
-        style: Style,
-    ) -> Result<Arc<Label>, Error> {
-        let (size, line_height) = style.scaled(zoom);
-        if !width.is_finite()
-            || width < 0.
-            || !zoom.is_finite()
-            || zoom <= 0.
-            || !size.is_finite()
-            || size <= 0.
-            || !line_height.is_finite()
-            || line_height <= 0.
-            || !(width * zoom).is_finite()
-            || !(size / zoom).is_finite()
-            || !(line_height / zoom).is_finite()
-        {
-            return Err(Error::InvalidMetrics);
-        }
-        if source.len() > MAX_SOURCE_BYTES {
-            return Err(Error::SourceBudget);
-        }
-        let mut fonts = graphics_text::font_system()
-            .write()
-            .map_err(|_| Error::FontSystemUnavailable)?;
-        if session.version != fonts.version() {
-            return Err(Error::FontSetChanged);
-        }
-        if self.version != Some(fonts.version())
-            || self
-                .session
-                .as_ref()
-                .is_none_or(|identity| !Arc::ptr_eq(identity, &session.identity))
-        {
-            self.entries.clear();
-            self.version = Some(fonts.version());
-            self.session = Some(session.identity.clone());
-        }
-        if let Some(index) = self.entries.iter().position(|entry| {
-            entry.source == source
-                && entry.style == style
-                && entry.zoom == zoom
-                && entry.width == width
-        }) {
-            let entry = self.entries.remove(index).unwrap();
-            let label = entry.label.clone();
-            self.entries.push_back(entry);
-            return Ok(label);
-        }
-        let normalized = Normalized::new(source);
-        let cuts: Vec<usize> = normalized
-            .text
-            .grapheme_indices(true)
-            .map(|(i, _)| i)
-            .chain(std::iter::once(normalized.text.len()))
-            .collect();
-        if cuts.len().saturating_sub(1) > MAX_GRAPHEMES {
-            return Err(Error::GraphemeBudget);
-        }
-        // Candidate buffers are temporary. Only the resolved strings/metrics
-        // survive, bounded by MAX_ENTRIES; renderer caching remains independent.
-        let mut shapes = graphics_text::Cache::new();
-        let mut measure = |content: &str| -> Result<Size, Error> {
-            if content.is_empty() {
-                return Ok(Size::ZERO);
-            }
-            #[cfg(test)]
-            {
-                self.allocations += 1;
-            }
-            let (_, entry) = shapes.allocate(
-                fonts.raw(),
-                graphics_text::cache::Key {
-                    content,
-                    size,
-                    line_height,
-                    font: style.font,
-                    bounds: Size::INFINITE,
-                    shaping: style.shaping,
-                    align_x: Alignment::Default,
-                },
-            );
-            if entry.buffer.layout_runs().count() != 1
-                || !entry.min_bounds.width.is_finite()
-                || !entry.min_bounds.height.is_finite()
-            {
-                return Err(Error::InvalidMeasurement);
-            }
-            world_size(entry.min_bounds, zoom)
-        };
-        let full = measure(&normalized.text)?;
-        let (displayed, retained, measured) = if full.width <= width {
-            (normalized.text.clone(), normalized.text.len(), full)
-        } else {
-            let ellipsis = measure("…")?;
-            if ellipsis.width > width {
-                (String::new(), 0, Size::ZERO)
-            } else {
-                // Every accepted candidate is actually shaped and fits. Search
-                // is bounded/logarithmic; contextual shaping is not universally
-                // monotone, so this does NOT promise the globally longest prefix.
-                // Full content is always checked first and never needlessly cut.
-                let mut best = ("…".to_owned(), 0, ellipsis);
-                let (mut low, mut high) = (1, cuts.len().saturating_sub(1));
-                while low < high {
-                    let middle = low + (high - low) / 2;
-                    let candidate = format!("{}…", &normalized.text[..cuts[middle]]);
-                    let measured = measure(&candidate)?;
-                    if measured.width <= width {
-                        best = (candidate, cuts[middle], measured);
-                        low = middle + 1;
-                    } else {
-                        high = middle;
-                    }
-                }
-                best
-            }
-        };
-        let label = Arc::new(Label {
-            source: source.into(),
-            displayed,
-            retained_source: 0..normalized.source_end(retained),
-            bounds: Rectangle::with_size(measured),
-            style,
-            measured_session: session.clone(),
-            measured_zoom: zoom,
-        });
-        if self.entries.len() == MAX_ENTRIES {
-            self.entries.pop_front();
-        }
-        self.entries.push_back(Entry {
-            source: source.into(),
-            style,
-            zoom,
-            width,
-            label: label.clone(),
-        });
-        Ok(label)
-    }
-}
-
-fn world_size(scaled: Size, zoom: f32) -> Result<Size, Error> {
-    let world = Size::new(scaled.width / zoom, scaled.height / zoom);
-    if !world.width.is_finite()
-        || !world.height.is_finite()
-        || world.width < 0.
-        || world.height < 0.
-    {
-        return Err(Error::InvalidMeasurement);
-    }
-    Ok(world)
-}
-
-fn translated_bounds(position: Point, size: Size) -> Result<Rectangle, Error> {
-    if !position.x.is_finite()
-        || !position.y.is_finite()
-        || !(position.x + size.width).is_finite()
-        || !(position.y + size.height).is_finite()
-    {
-        return Err(Error::InvalidPosition);
-    }
-    Ok(Rectangle::new(position, size))
-}
-
-struct Normalized {
-    text: String,
-    ends: Vec<(usize, usize)>,
-}
-impl Normalized {
-    fn new(source: &str) -> Self {
-        let mut result = Self {
-            text: String::new(),
-            ends: vec![(0, 0)],
-        };
-        let mut separator = false;
-        for (start, c) in source.char_indices() {
-            if c.is_whitespace() {
-                separator = !result.text.is_empty();
-                continue;
-            }
-            if separator {
-                result.text.push(' ');
-                result.ends.push((result.text.len(), start));
-                separator = false;
-            }
-            result.text.push(c);
-            result.ends.push((result.text.len(), start + c.len_utf8()));
-        }
-        result
-    }
-    fn source_end(&self, normalized_end: usize) -> usize {
-        self.ends
-            .binary_search_by_key(&normalized_end, |(end, _)| *end)
-            .map(|index| self.ends[index].1)
-            .expect("grapheme cuts are character boundaries")
-    }
-}
-
-#[cfg(test)]
-#[path = "scenario_label/tests.rs"]
-mod tests;

crates/oa-desktop/src/behavior/scenario_label/corridor.rs

@@ -1,231 +0,0 @@
-//! Unwired corridor-policy candidate for the measured scenario-label experiment.
-//!
-//! The caller supplies a finite structural label band AFTER endpoint/activation
-//! alignment, with padding already removed from its edges. Blockers include
-//! padded activation/card/header bounds over the complete text band, including
-//! stroke/ink clearance. This function does not infer a self-message corridor,
-//! alter scene extents, change zoom, or establish raster-ink containment.
-use iced::Rectangle;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(super) struct InvalidGeometry;
-
-fn edges(rect: Rectangle) -> Result<(f32, f32, f32, f32), InvalidGeometry> {
-    let right = rect.x + rect.width;
-    let bottom = rect.y + rect.height;
-    if [rect.x, rect.y, rect.width, rect.height, right, bottom]
-        .into_iter()
-        .any(|value| !value.is_finite())
-        || rect.width < 0.
-        || rect.height < 0.
-    {
-        return Err(InvalidGeometry);
-    }
-    Ok((rect.x, right, rect.y, bottom))
-}
-
-/// Select one connected clear interval; never assemble text across blockers.
-/// Prefer greater width, then proximity to the previous label anchor, then the
-/// leftmost interval. Input order has no influence. A zero-area band has no
-/// corridor. Touching the padded vertical band is conservatively obstructing;
-/// a zero-area blocker has no area and must receive stroke padding upstream.
-pub(super) fn widest_clear(
-    band: Rectangle,
-    blockers: &[Rectangle],
-    preferred_anchor: f32,
-) -> Result<Option<Rectangle>, InvalidGeometry> {
-    let (left, right, top, bottom) = edges(band)?;
-    if !preferred_anchor.is_finite() {
-        return Err(InvalidGeometry);
-    }
-    let mut blocked = Vec::new();
-    for &blocker in blockers {
-        let (x0, x1, y0, y1) = edges(blocker)?;
-        if blocker.width > 0. && blocker.height > 0. && y1 >= top && y0 <= bottom {
-            let interval = (x0.max(left), x1.min(right));
-            if interval.0 < interval.1 {
-                blocked.push(interval);
-            }
-        }
-    }
-    if band.width == 0. || band.height == 0. {
-        return Ok(None);
-    }
-    blocked.sort_by(|a, b| a.0.total_cmp(&b.0).then(a.1.total_cmp(&b.1)));
-    let mut best: Option<Rectangle> = None;
-    let mut consider = |start: f32, end: f32| {
-        if start >= end {
-            return;
-        }
-        let candidate = Rectangle {
-            x: start,
-            width: contained_width(start, end),
-            ..band
-        };
-        // Use f64 only for comparison distance: subtracting two admitted f32
-        // world coordinates can overflow even though each rectangle is finite.
-        let distance = |x: f32| (f64::from(x) - f64::from(preferred_anchor)).abs();
-        if best.is_none_or(|old| {
-            candidate.width > old.width
-                || (candidate.width == old.width
-                    && (distance(candidate.x) < distance(old.x)
-                        || (distance(candidate.x) == distance(old.x) && candidate.x < old.x)))
-        }) {
-            best = Some(candidate);
-        }
-    };
-    let mut cursor = left;
-    for (start, end) in blocked {
-        consider(cursor, start);
-        cursor = cursor.max(end);
-    }
-    consider(cursor, right);
-    Ok(best)
-}
-
-/// Finite f32 endpoints can subtract to infinity or round across a blocker.
-/// Compute in f64, cap to finite f32, and round inward if nearest rounding
-/// overshot the admitted interval's end.
-fn contained_width(start: f32, end: f32) -> f32 {
-    let exact = f64::from(end) - f64::from(start);
-    let mut width = exact.min(f64::from(f32::MAX)) as f32;
-    if f64::from(start) + f64::from(width) > f64::from(end) {
-        width = width.next_down();
-    }
-    width
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn rect(x: f32, y: f32, width: f32, height: f32) -> Rectangle {
-        Rectangle {
-            x,
-            y,
-            width,
-            height,
-        }
-    }
-
-    #[test]
-    fn long_message_does_not_cross_an_intermediate_execution() {
-        let band = rect(20., 100., 700., 22.);
-        let blockers = [rect(250., 80., 16., 80.), rect(490., 90., 28., 140.)];
-        let result = widest_clear(band, &blockers, band.x).unwrap().unwrap();
-        assert_eq!(result, rect(20., 100., 230., 22.));
-        for blocker in blockers {
-            assert!(result.x + result.width <= blocker.x || result.x >= blocker.x + blocker.width);
-        }
-        assert_eq!(widest_clear(band, &[], band.x).unwrap(), Some(band));
-    }
-
-    #[test]
-    fn overlapping_unsorted_blockers_merge_and_widest_gap_wins() {
-        let band = rect(-100., 10., 600., 20.);
-        let blockers = [
-            rect(50., 0., 80., 60.),
-            rect(0., 5., 70., 30.),
-            rect(450., 0., 100., 60.),
-        ];
-        let expected = Some(rect(130., 10., 320., 20.));
-        assert_eq!(widest_clear(band, &blockers, -100.).unwrap(), expected);
-        let mut reversed = blockers;
-        reversed.reverse();
-        assert_eq!(widest_clear(band, &reversed, -100.).unwrap(), expected);
-    }
-
-    #[test]
-    fn complete_padded_band_and_touching_boundaries_are_obstructed() {
-        let band = rect(0., 100., 200., 20.);
-        // The first blocker ends at the band top: checking only a baseline
-        // would miss it. The second starts at the band bottom.
-        let blockers = [rect(0., 70., 60., 30.), rect(150., 120., 50., 30.)];
-        assert_eq!(
-            widest_clear(band, &blockers, 0.).unwrap(),
-            Some(rect(60., 100., 90., 20.))
-        );
-        let outside = [rect(0., 70., 200., 29.), rect(0., 121., 200., 30.)];
-        assert_eq!(widest_clear(band, &outside, 0.).unwrap(), Some(band));
-    }
-
-    #[test]
-    fn ties_keep_the_nearest_anchor_then_choose_leftmost() {
-        let band = rect(0., 0., 300., 20.);
-        let blockers = [rect(100., 0., 100., 20.)];
-        assert_eq!(
-            widest_clear(band, &blockers, 190.).unwrap(),
-            Some(rect(200., 0., 100., 20.))
-        );
-        assert_eq!(
-            widest_clear(band, &blockers, 100.).unwrap(),
-            Some(rect(0., 0., 100., 20.))
-        );
-    }
-
-    #[test]
-    fn caller_defined_self_and_reversed_corridors_keep_their_geometry() {
-        // Direction and self-loop policy are explicit caller inputs. Neither
-        // a zero endpoint gap nor screen width can silently supply a corridor.
-        for band in [rect(420., 40., 180., 22.), rect(-400., 90., 350., 22.)] {
-            assert_eq!(widest_clear(band, &[], band.x).unwrap(), Some(band));
-        }
-        assert_eq!(
-            widest_clear(rect(420., 40., 0., 22.), &[], 420.).unwrap(),
-            None
-        );
-        assert_eq!(
-            widest_clear(rect(420., 40., 180., 0.), &[], 420.).unwrap(),
-            None
-        );
-        assert_eq!(
-            widest_clear(rect(0., 0., 100., 20.), &[rect(-10., -10., 200., 50.)], 0.).unwrap(),
-            None
-        );
-    }
-
-    #[test]
-    fn invalid_or_overflowing_geometry_never_enters_a_corridor() {
-        let band = rect(0., 0., 100., 20.);
-        for invalid in [
-            rect(f32::NAN, 0., 10., 20.),
-            rect(0., 0., -1., 20.),
-            rect(f32::MAX, 0., f32::MAX, 20.),
-            rect(0., f32::MAX, 10., f32::MAX),
-        ] {
-            assert_eq!(widest_clear(invalid, &[], 0.), Err(InvalidGeometry));
-            assert_eq!(widest_clear(band, &[invalid], 0.), Err(InvalidGeometry));
-        }
-        assert_eq!(widest_clear(band, &[], f32::INFINITY), Err(InvalidGeometry));
-    }
-
-    #[test]
-    fn finite_band_cannot_reconstruct_an_infinite_width() {
-        let band = rect(f32::from_bits(0xfe79636e), 0., f32::MAX, 20.);
-        let right = band.x + band.width;
-        assert!(right.is_finite());
-        assert!(
-            (right - band.x).is_infinite(),
-            "counterexample must exercise f32 subtraction overflow"
-        );
-        let result = widest_clear(band, &[], 0.).unwrap().unwrap();
-        assert!(result.width.is_finite() && result.width > 0.);
-        assert!(result.x + result.width <= right);
-        assert!(f64::from(result.x) + f64::from(result.width) <= f64::from(right));
-    }
-
-    #[test]
-    fn reconstructed_width_rounds_inward_at_a_blocker() {
-        let band = rect(-999_948.562_5, 0., 1_000_000., 20.);
-        let blocker = rect(2.1, 0., 10., 20.);
-        assert!(
-            band.x + (blocker.x - band.x) > blocker.x,
-            "counterexample must cross the blocker under naive reconstruction"
-        );
-        let result = widest_clear(band, &[blocker], 0.).unwrap().unwrap();
-        assert_eq!(result.x, band.x);
-        assert!(result.width > 999_000.);
-        assert!(result.x + result.width <= blocker.x);
-        assert!(f64::from(result.x) + f64::from(result.width) <= f64::from(blocker.x));
-    }
-}

crates/oa-desktop/src/behavior/scenario_label/tests.rs

@@ -1,487 +0,0 @@
-//! Unexecuted evaluator candidates; the module is intentionally not wired yet.
-use super::*;
-use iced::advanced::{
-    graphics::text::Paragraph,
-    text::{Paragraph as _, Text as ParagraphText, Wrapping},
-};
-
-// Independent paragraph construction: no candidate cache, normalization, search,
-// or character-width estimate is used by this measurement oracle.
-fn paragraph_size(content: &str, zoom: f32, style: Style) -> Size {
-    let size = Pixels(style.size.0 * zoom);
-    let line_height = match style.line_height {
-        LineHeight::Relative(factor) => LineHeight::Relative(factor),
-        LineHeight::Absolute(pixels) => LineHeight::Absolute(Pixels(pixels.0 * zoom)),
-    };
-    let paragraph = Paragraph::with_text(ParagraphText {
-        content,
-        bounds: Size::INFINITE,
-        size,
-        line_height,
-        font: style.font,
-        align_x: Alignment::Default,
-        align_y: iced::alignment::Vertical::Top,
-        shaping: style.shaping,
-        wrapping: Wrapping::default(),
-    });
-    assert_eq!(paragraph.buffer().layout_runs().count(), 1);
-    Size::new(paragraph.min_width() / zoom, paragraph.min_height() / zoom)
-}
-
-#[test]
-fn adequate_corridor_reveals_full_realistic_names_and_distinguishing_suffixes() {
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let style = Style::default();
-    for text in [
-        "1. call · Request valve repair · Technician service conversation",
-        "2. reply · Return pressure after repair · Technician service conversation",
-        "1. call · Request redundant hydraulic pressure calibration channel A",
-        "1. call · Request redundant hydraulic pressure calibration channel B",
-    ] {
-        let wide = cache.resolve(&session, text, 1600., 1., style).unwrap();
-        assert_eq!(wide.displayed(&session, 1.).unwrap(), text);
-        assert_eq!(wide.retained_source(&session, 1.).unwrap(), 0..text.len());
-        assert_eq!(wide.bounds.size(), paragraph_size(text, 1., style));
-        let narrow = cache.resolve(&session, text, 80., 1., style).unwrap();
-        assert_ne!(narrow.displayed, text);
-        assert!(narrow.bounds.width <= 80.);
-        assert_eq!(
-            narrow.bounds.size(),
-            paragraph_size(&narrow.displayed, 1., style)
-        );
-    }
-}
-
-#[test]
-fn normalized_visible_prefix_maps_to_original_bytes_without_claiming_hidden_operation() {
-    let raw = " \t1.  call · Pump\r\n  · Operation: Need\u{301}le  ";
-    let expected = "1. call · Pump · Operation: Need\u{301}le";
-    let n = Normalized::new(raw);
-    assert_eq!(n.text, expected);
-    let prefix = "1. call · Pump ";
-    assert_eq!(n.source_end(prefix.len()), raw.find("· Operation").unwrap());
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let wide = cache
-        .resolve(&session, raw, 1600., 1., Style::default())
-        .unwrap();
-    assert_eq!(wide.displayed, expected);
-    assert_eq!(wide.retained_source.end, raw.trim_end().len());
-    let field = raw.find("Need").unwrap()..raw.trim_end().len();
-    assert!(wide.retains_any(&session, 1., field.clone()).unwrap());
-    assert!(
-        !wide.retains_any(&session, 1., 0..2).unwrap(),
-        "normalized whitespace is not a visible field"
-    );
-    let small = cache
-        .resolve(&session, raw, 70., 1., Style::default())
-        .unwrap();
-    assert!(!small.retains_any(&session, 1., field).unwrap());
-    assert!(small.retained_source.end < raw.find("Operation").unwrap());
-}
-
-#[test]
-fn grapheme_prefixes_and_zoom_match_actual_paragraph_layout() {
-    let text = "call · 戻り値 圧力 e\u{301} 👩‍🔬 safety valve verification";
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    for zoom in [0.66, 1., 1.75] {
-        let label = cache
-            .resolve(&session, text, 105., zoom, Style::default())
-            .unwrap();
-        assert!(label.bounds.width <= 105.);
-        assert_eq!(
-            label.bounds.size(),
-            paragraph_size(&label.displayed, zoom, Style::default())
-        );
-        assert!(
-            text.grapheme_indices(true)
-                .any(|(i, _)| i == label.retained_source.end)
-                || label.retained_source.end == text.len()
-        );
-        let painted = label
-            .canvas_text(&session, zoom, Point::new(400., 90.), Color::BLACK)
-            .unwrap();
-        assert_eq!(painted.content, label.displayed);
-        assert!(painted.max_width.is_infinite());
-        assert_eq!(
-            label
-                .bounds_at(&session, zoom, painted.position)
-                .unwrap()
-                .size(),
-            label.bounds.size()
-        );
-    }
-}
-
-#[test]
-fn empty_and_too_narrow_labels_never_claim_source_visibility() {
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    for text in ["", " \t\n", "Operation: Pump"] {
-        let label = cache
-            .resolve(&session, text, 0., 1., Style::default())
-            .unwrap();
-        assert_eq!(label.displayed, "");
-        assert_eq!(label.retained_source, 0..0);
-        assert_eq!(label.bounds.size(), Size::ZERO);
-        assert!(!label.retains_any(&session, 1., 0..text.len()).unwrap());
-    }
-}
-
-#[test]
-fn redraws_reuse_resolution_but_width_zoom_and_style_are_dependencies() {
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let text = "call · Pressure verification with a descriptive operation label";
-    let style = Style::default();
-    let a = cache.resolve(&session, text, 100., 1., style).unwrap();
-    let measured = cache.allocations;
-    let b = cache.resolve(&session, text, 100., 1., style).unwrap();
-    assert!(Arc::ptr_eq(&a, &b));
-    assert_eq!(cache.allocations, measured);
-    for (width, zoom, style) in [
-        (120., 1., style),
-        (100., 0.66, style),
-        (
-            100.,
-            1.,
-            Style {
-                size: Pixels(14.),
-                ..style
-            },
-        ),
-    ] {
-        let other = cache.resolve(&session, text, width, zoom, style).unwrap();
-        assert!(!Arc::ptr_eq(&a, &other));
-    }
-}
-
-#[test]
-fn resident_entry_is_remeasured_for_a_fresh_settled_render_session() {
-    let mut cache = Cache::default();
-    let old_session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let text = "call · Pressure verification";
-    let a = cache
-        .resolve(&old_session, text, 100., 1., Style::default())
-        .unwrap();
-    assert_eq!(cache.entries.len(), 1);
-    assert!(Arc::ptr_eq(&cache.entries.front().unwrap().label, &a));
-    let measured = cache.allocations;
-    assert!(measured > 0);
-    assert!(Arc::ptr_eq(
-        &a,
-        &cache
-            .resolve(&old_session, text, 100., 1., Style::default())
-            .unwrap()
-    ));
-    assert_eq!(cache.allocations, measured);
-    // A fresh renderer session invalidates a still-resident entry. This does
-    // not mutate global fonts or purport to test dynamic WGPU font loading.
-    let new_session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let refreshed = cache
-        .resolve(&new_session, text, 100., 1., Style::default())
-        .unwrap();
-    assert!(!Arc::ptr_eq(&a, &refreshed));
-    assert!(cache.allocations > measured);
-    assert_eq!(cache.entries.len(), 1);
-    assert!(Arc::ptr_eq(
-        &cache.entries.front().unwrap().label,
-        &refreshed
-    ));
-}
-
-#[test]
-fn resident_entry_remeasures_after_local_font_epoch_invalidation() {
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let text = "call · Resident pressure label";
-    let a = cache
-        .resolve(&session, text, 100., 1., Style::default())
-        .unwrap();
-    assert_eq!(cache.entries.len(), 1);
-    assert!(Arc::ptr_eq(&cache.entries.front().unwrap().label, &a));
-    let measured = cache.allocations;
-    assert!(measured > 0);
-    // Exercise the local memo epoch branch while a is still resident. No
-    // intervening width/zoom/style resolution can cause incidental eviction.
-    // This is not an actual font-load or renderer-cache acceptance test.
-    cache.version = None;
-    let refreshed = cache
-        .resolve(&session, text, 100., 1., Style::default())
-        .unwrap();
-    assert!(!Arc::ptr_eq(&a, &refreshed));
-    assert!(cache.allocations > measured);
-    assert_eq!(cache.entries.len(), 1);
-    assert!(Arc::ptr_eq(
-        &cache.entries.front().unwrap().label,
-        &refreshed
-    ));
-}
-
-#[test]
-fn retained_artifact_rejects_other_zoom_and_render_session_for_every_consumer() {
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let label = cache
-        .resolve(&session, "Operation: Pressure", 200., 1., Style::default())
-        .unwrap();
-    let other = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    for (context, zoom, expected) in [
-        (&session, 0.66, Error::StaleZoom),
-        (&other, 1., Error::StaleRenderSession),
-    ] {
-        assert_eq!(label.displayed(context, zoom).unwrap_err(), expected);
-        assert_eq!(label.retained_source(context, zoom).unwrap_err(), expected);
-        assert_eq!(
-            label.retains_any(context, zoom, 0..9).unwrap_err(),
-            expected
-        );
-        assert_eq!(
-            label.bounds_at(context, zoom, Point::ORIGIN).unwrap_err(),
-            expected
-        );
-        assert_eq!(
-            label
-                .canvas_text(context, zoom, Point::ORIGIN, Color::BLACK)
-                .unwrap_err(),
-            expected
-        );
-    }
-    assert!(
-        label
-            .canvas_text(&session, 1., Point::ORIGIN, Color::BLACK)
-            .is_ok()
-    );
-}
-
-#[test]
-fn finite_scaled_metrics_cannot_escape_as_infinite_world_dimensions() {
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let style = Style {
-        size: Pixels(2.),
-        line_height: LineHeight::Relative(f32::MAX),
-        ..Style::default()
-    };
-    // At zoom 0.5 the scaled size=1 and line height=MAX are finite. The
-    // required world line height is not; reject before passing it to shaping.
-    let scaled = style.scaled(0.5);
-    assert!(scaled.0.is_finite() && scaled.1.is_finite());
-    assert_eq!(
-        cache
-            .resolve(&session, "call", 100., 0.5, style)
-            .unwrap_err(),
-        Error::InvalidMetrics
-    );
-    assert_eq!(cache.allocations, 0);
-    assert!(cache.entries.is_empty());
-    // Independently exercise validation after division for actual measured
-    // dimensions: finite scaled width/height do not imply finite world values.
-    assert_eq!(
-        world_size(Size::new(f32::MAX, 1.), 0.5),
-        Err(Error::InvalidMeasurement)
-    );
-    assert_eq!(
-        world_size(Size::new(1., f32::MAX), 0.5),
-        Err(Error::InvalidMeasurement)
-    );
-    assert_eq!(
-        world_size(Size::new(20., 8.), 0.5).unwrap(),
-        Size::new(40., 16.)
-    );
-}
-
-#[test]
-fn malformed_metrics_and_explicit_experiment_budgets_fail_without_a_cached_candidate() {
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    for (width, zoom) in [(f32::NAN, 1.), (-1., 1.), (100., 0.), (100., f32::INFINITY)] {
-        assert_eq!(
-            cache
-                .resolve(&session, "call", width, zoom, Style::default())
-                .unwrap_err(),
-            Error::InvalidMetrics
-        );
-    }
-    assert_eq!(
-        cache
-            .resolve(
-                &session,
-                &"x".repeat(MAX_SOURCE_BYTES + 1),
-                100.,
-                1.,
-                Style::default()
-            )
-            .unwrap_err(),
-        Error::SourceBudget
-    );
-    assert_eq!(
-        cache
-            .resolve(
-                &session,
-                &"x".repeat(MAX_GRAPHEMES + 1),
-                100.,
-                1.,
-                Style::default()
-            )
-            .unwrap_err(),
-        Error::GraphemeBudget
-    );
-    assert!(cache.entries.is_empty());
-}
-
-#[test]
-fn bounds_translation_rejects_nonfinite_world_positions_and_endpoints() {
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let label = cache
-        .resolve(&session, "call", 100., 1., Style::default())
-        .unwrap();
-    for position in [Point::new(f32::NAN, 0.), Point::new(0., f32::INFINITY)] {
-        assert_eq!(
-            label.bounds_at(&session, 1., position).unwrap_err(),
-            Error::InvalidPosition
-        );
-        assert_eq!(
-            label
-                .canvas_text(&session, 1., position, Color::BLACK)
-                .unwrap_err(),
-            Error::InvalidPosition
-        );
-    }
-    assert_eq!(
-        translated_bounds(Point::new(f32::MAX, 0.), Size::new(f32::MAX, 1.)),
-        Err(Error::InvalidPosition)
-    );
-    assert_eq!(
-        translated_bounds(Point::new(0., f32::MAX), Size::new(1., f32::MAX)),
-        Err(Error::InvalidPosition)
-    );
-    assert_eq!(
-        label
-            .bounds_at(&session, 1., Point::new(-20., -10.))
-            .unwrap()
-            .position(),
-        Point::new(-20., -10.)
-    );
-}
-
-/// Must run as the ONLY selected test in a dedicated, fresh test process.
-/// The ignored marker keeps this global-font mutation out of normal parallel
-/// desktop tests. See the evidence directory's exact executable runner.
-#[test]
-#[ignore = "mutates the global font database; run only this exact test in a fresh process"]
-fn actual_font_load_rejects_retained_label_and_old_session() {
-    use graphics_text::cosmic_text::fontdb;
-    use std::borrow::Cow;
-
-    let mut cache = Cache::default();
-    let session = RenderSession::after_fonts_settled_and_renderer_reset().unwrap();
-    let source = "Operation: Pressure";
-    let label = cache
-        .resolve(&session, source, 200., 1., Style::default())
-        .unwrap();
-    assert_eq!(label.displayed(&session, 1.).unwrap(), source);
-    assert!(
-        label
-            .canvas_text(&session, 1., Point::ORIGIN, Color::BLACK)
-            .is_ok()
-    );
-    let measured = cache.allocations;
-    assert!(measured > 0);
-    assert!(Arc::ptr_eq(&cache.entries.front().unwrap().label, &label));
-
-    let (version_before, version_after, faces_before, faces_after) = {
-        let mut fonts = graphics_text::font_system().write().unwrap();
-        let face = fonts
-            .raw()
-            .db()
-            .faces()
-            .find(|face| {
-                face.families
-                    .iter()
-                    .any(|(family, _)| family == "Iced-Icons")
-            })
-            .expect("Iced 0.14 embeds and loads its known Iced-Icons.ttf face")
-            .id;
-        let bytes = fonts
-            .raw()
-            .db()
-            .with_face_data(face, |data, _| data.to_vec())
-            .expect("the built-in binary font has accessible bytes");
-        assert!(!bytes.is_empty());
-        // load_font increments Version even for invalid bytes. Independently
-        // establish actual face admission so this cannot pass with invalid data.
-        let mut probe = fontdb::Database::new();
-        probe.load_font_data(bytes.clone());
-        let admitted = probe
-            .faces()
-            .filter(|face| {
-                face.families
-                    .iter()
-                    .any(|(family, _)| family == "Iced-Icons")
-            })
-            .count();
-        assert!(
-            admitted > 0,
-            "the extracted bytes parse as the expected real font"
-        );
-        let before = fonts.version();
-        assert_eq!(before, session.version);
-        let count = fonts.raw().db().faces().count();
-        // Owned bytes intentionally bypass Borrowed-address deduplication.
-        // This is an actual valid duplicate-face load, not a claim the chosen
-        // face or rendered metrics change; the stale-epoch rule is the oracle.
-        fonts.load_font(Cow::Owned(bytes));
-        (
-            before,
-            fonts.version(),
-            count,
-            fonts.raw().db().faces().count(),
-        )
-    };
-    assert_ne!(version_before, version_after);
-    assert!(
-        faces_after > faces_before,
-        "actual font admission must accompany the version increment"
-    );
-    assert_eq!(
-        label.displayed(&session, 1.).unwrap_err(),
-        Error::FontSetChanged
-    );
-    assert_eq!(
-        label.retained_source(&session, 1.).unwrap_err(),
-        Error::FontSetChanged
-    );
-    assert_eq!(
-        label.retains_any(&session, 1., 0..9).unwrap_err(),
-        Error::FontSetChanged
-    );
-    assert_eq!(
-        label.bounds_at(&session, 1., Point::ORIGIN).unwrap_err(),
-        Error::FontSetChanged
-    );
-    assert_eq!(
-        label
-            .canvas_text(&session, 1., Point::ORIGIN, Color::BLACK)
-            .unwrap_err(),
-        Error::FontSetChanged
-    );
-    assert_eq!(
-        cache
-            .resolve(&session, source, 200., 1., Style::default())
-            .unwrap_err(),
-        Error::FontSetChanged
-    );
-    assert_eq!(
-        cache.allocations, measured,
-        "an invalid session must not remeasure and imply renderer repair"
-    );
-    println!(
-        "Valid Iced-Icons load: faces {faces_before}->{faces_after}, font Version {version_before:?}->{version_after:?}; old label and session rejected"
-    );
-    // Do not create a fresh session or claim dynamic WGPU cache recovery here.
-    // Process exit is the isolation boundary; no other test may run afterward.
-}

crates/oa-desktop/src/behavior/scenario_layout.rs

@@ -1,816 +0,0 @@
-//! Pure complete Scenario geometry. No persistence, gesture or fallback policy.
-//! The only renderer is Scene::sequence_geometry; this module resolves its inputs.
-use super::*;
-use oa_core::{DiagramLayout, ScenarioLayout};
-
-#[cfg(test)]
-mod tests;
-
-pub(crate) mod presentation;
-
-type Candidate = BTreeMap<Id, f32>;
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-enum AnchorRole {
-    MessageSend,
-    MessageReceive,
-    Observation,
-    FrameStart,
-    OperandStart,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub(super) struct Anchor {
-    pub(super) y: f32,
-    role: AnchorRole,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-struct MessageAnchors {
-    send_y: f32,
-    receive_y: f32,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) enum Diagnostic {
-    SourceOrderCrossing { scope: Id, before: Id, after: Id },
-    FrameExtendsPastFollowingAnchor { frame: Id, following: Id },
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) enum GeometryIssue {
-    UnknownAnchor(Id),
-    LifecycleGeometryNotSupported { lifeline: Id, scope: Id },
-    InvalidRepresentation(Id),
-    InvalidCoordinate(Id),
-    DuplicateCoordinate(Id),
-    ExpandedAddressNotSupported(Id),
-    CoincidentDistinctEndpoints(Id),
-    TypedActivationOutsideScope { call: Id, scope: Id },
-    TypedActivationOutsideLifetime { call: Id, receiver: Id },
-    TypedActivationCrossingNotSupported { call: Id, event: Id },
-    NonFinite(Id),
-    CompoundMoveNotImplemented(Id),
-    FixedFrameHeaderWouldMove { frame: Id },
-    OperandScopeOutsideEnclosingInterval { operand: Id, fragment: Id },
-    LifecycleAnchorOutsideRenderScope { occurrence: Id, scope: Id },
-    LifetimeInversionNotSupported { create: Id, delete: Id },
-}
-
-#[derive(Clone, Debug)]
-pub(super) struct Plan {
-    pub(super) anchors: BTreeMap<Id, Anchor>,
-    messages: BTreeMap<Id, MessageAnchors>,
-    pub(super) frames: BTreeMap<Id, Rectangle>,
-    pub(super) scopes: BTreeMap<Id, (f32, f32)>,
-    pub(super) height: f32,
-    pub(super) diagnostics: Vec<Diagnostic>,
-}
-
-pub(super) fn occurrence(p: &Project, id: Id) -> Option<&OccurrenceBody> {
-    match p.elements.get(&id)?.shared()? {
-        SharedBody::Occurrence { body, .. } => Some(body),
-        _ => None,
-    }
-}
-
-fn role(body: &OccurrenceBody) -> AnchorRole {
-    match body {
-        OccurrenceBody::Exchange {
-            message_kind: MessageKind::Create | MessageKind::Delete,
-            ..
-        } => AnchorRole::MessageReceive,
-        OccurrenceBody::Exchange { .. } => AnchorRole::MessageSend,
-        OccurrenceBody::Fragment { .. } => AnchorRole::FrameStart,
-        OccurrenceBody::Branch { .. } => AnchorRole::OperandStart,
-        _ => AnchorRole::Observation,
-    }
-}
-
-fn inside(p: &Project, id: Id, owner: Id) -> bool {
-    let mut current = p.elements.get(&id).and_then(|e| e.parent);
-    for _ in 0..p.elements.len() {
-        match current {
-            Some(parent) if parent == owner => return true,
-            Some(parent) => current = p.elements.get(&parent).and_then(|e| e.parent),
-            None => return false,
-        }
-    }
-    false
-}
-
-fn depth(p: &Project, id: Id) -> usize {
-    let mut current = p.elements.get(&id).and_then(|e| e.parent);
-    let mut result = 0;
-    while let Some(parent) = current {
-        result += 1;
-        if result > p.elements.len() {
-            break;
-        }
-        current = p.elements.get(&parent).and_then(|e| e.parent);
-    }
-    result
-}
-
-pub(in crate::behavior) fn union(a: Rectangle, b: Rectangle) -> Rectangle {
-    let x = a.x.min(b.x);
-    let y = a.y.min(b.y);
-    Rectangle::new(
-        Point::new(x, y),
-        Size::new(
-            (a.x + a.width).max(b.x + b.width) - x,
-            (a.y + a.height).max(b.y + b.height) - y,
-        ),
-    )
-}
-
-/// Actual named shapes/message paths supply footprint measurements; activation
-/// bars are intentionally excluded because current Scene derives them later.
-fn footprints(
-    scene: &Scene,
-    anchors: &BTreeMap<Id, Anchor>,
-    seed: &BTreeMap<Id, Anchor>,
-) -> BTreeMap<Id, Rectangle> {
-    let mut out = BTreeMap::new();
-    for item in scene.boxes.iter().filter(|item| !item.title.is_empty()) {
-        let Some(anchor) = anchors.get(&item.id) else {
-            continue;
-        };
-        let mut rect = item.rect;
-        rect.y += anchor.y - seed[&item.id].y;
-        out.insert(item.id, rect);
-    }
-    for line in &scene.lines {
-        let Some(anchor) = anchors.get(&line.id) else {
-            continue;
-        };
-        let delta = anchor.y - seed[&line.id].y;
-        let mut rect = line.label_bounds();
-        rect.y += delta;
-        for point in &line.points {
-            rect = union(
-                rect,
-                Rectangle::new(Point::new(point.x, point.y + delta), Size::ZERO),
-            );
-        }
-        out.entry(line.id)
-            .and_modify(|old| *old = union(*old, rect))
-            .or_insert(rect);
-    }
-    out
-}
-
-fn include_ancestors(p: &Project, id: Id, rect: Rectangle, covered: &mut BTreeMap<Id, Rectangle>) {
-    let mut current = p.elements.get(&id).and_then(|e| e.parent);
-    for _ in 0..p.elements.len() {
-        let Some(parent) = current else {
-            break;
-        };
-        covered
-            .entry(parent)
-            .and_modify(|old| *old = union(*old, rect))
-            .or_insert(rect);
-        current = p.elements.get(&parent).and_then(|e| e.parent);
-    }
-}
-
-fn coverage(p: &Project, footprints: &BTreeMap<Id, Rectangle>) -> BTreeMap<Id, Rectangle> {
-    let mut covered = BTreeMap::new();
-    for (&id, &rect) in footprints {
-        include_ancestors(p, id, rect, &mut covered);
-    }
-    covered
-}
-
-impl Plan {
-    /// Authored endpoint values are primary inputs, not deltas reconstructed from
-    /// rounded rows. Lifecycle alignment owns x and marker attachment; this final
-    /// y alignment precedes typed activation derivation and preserves send bits.
-    pub(super) fn align_message_anchors(&self, lines: &mut [Line]) {
-        for line in lines {
-            let Some(message) = self.messages.get(&line.id) else {
-                continue;
-            };
-            let previous_send = line.points.first().map_or(message.send_y, |point| point.y);
-            line.label_at.y += message.send_y - previous_send;
-            let last = line.points.len().saturating_sub(1);
-            for (index, point) in line.points.iter_mut().enumerate() {
-                point.y = if index == last || (last == 3 && index == 2) {
-                    message.receive_y
-                } else {
-                    message.send_y
-                };
-            }
-        }
-    }
-
-    fn build(
-        p: &Project,
-        owner: Id,
-        baseline: &Scene,
-        desired: &Candidate,
-    ) -> Result<Self, GeometryIssue> {
-        let mut seed: BTreeMap<_, _> = baseline
-            .rows
-            .iter()
-            .map(|(id, (_, y))| {
-                (
-                    *id,
-                    Anchor {
-                        y: *y,
-                        role: role(occurrence(p, *id).expect("Scene occurrence")),
-                    },
-                )
-            })
-            .collect();
-        // Operand headers are real Scene boxes, but are not entries in rows.
-        for item in &baseline.boxes {
-            if matches!(occurrence(p, item.id), Some(OccurrenceBody::Branch { .. })) {
-                seed.insert(
-                    item.id,
-                    Anchor {
-                        y: item.rect.y,
-                        role: AnchorRole::OperandStart,
-                    },
-                );
-            }
-        }
-        let mut anchors = seed.clone();
-        for (&id, &y) in desired {
-            let anchor = anchors
-                .get_mut(&id)
-                .ok_or(GeometryIssue::UnknownAnchor(id))?;
-            if !y.is_finite() {
-                return Err(GeometryIssue::NonFinite(id));
-            }
-            if matches!(
-                anchor.role,
-                AnchorRole::FrameStart | AnchorRole::OperandStart
-            ) && y != anchor.y
-            {
-                return Err(GeometryIssue::CompoundMoveNotImplemented(id));
-            }
-            anchor.y = y;
-        }
-        let mut messages = BTreeMap::new();
-        for line in &baseline.lines {
-            if let (Some(anchor), Some(first), Some(last)) = (
-                anchors.get(&line.id),
-                line.points.first(),
-                line.points.last(),
-            ) {
-                let message = if desired.contains_key(&line.id) {
-                    let self_message = matches!(occurrence(p, line.id), Some(OccurrenceBody::Exchange {
-                        sender: Some(sender), receiver, message_kind, ..
-                    }) if matches!(message_kind, MessageKind::Timer { .. }) || *receiver == Some(*sender));
-                    let lifecycle = matches!(
-                        occurrence(p, line.id),
-                        Some(OccurrenceBody::Exchange {
-                            message_kind: MessageKind::Create | MessageKind::Delete,
-                            ..
-                        })
-                    );
-                    if self_message && lifecycle {
-                        MessageAnchors {
-                            send_y: anchor.y - 24.,
-                            receive_y: anchor.y,
-                        }
-                    } else {
-                        MessageAnchors {
-                            send_y: anchor.y,
-                            receive_y: if self_message {
-                                anchor.y + 24.
-                            } else {
-                                anchor.y
-                            },
-                        }
-                    }
-                } else {
-                    MessageAnchors {
-                        send_y: first.y,
-                        receive_y: last.y,
-                    }
-                };
-                messages.insert(line.id, message);
-            }
-        }
-        // Track actual semantic lifecycle order per receiver and scope. In particular,
-        // a later recreation must not be compared with an earlier deletion.
-        for element in p
-            .elements
-            .values()
-            .filter(|e| e.id == owner || inside(p, e.id, owner))
-        {
-            let Some(steps) = element.steps() else {
-                continue;
-            };
-            let mut last = BTreeMap::new();
-            for id in steps {
-                if let (
-                    Some(message),
-                    Some(OccurrenceBody::Exchange {
-                        receiver: Some(lane),
-                        message_kind: MessageKind::Create | MessageKind::Delete,
-                        ..
-                    }),
-                ) = (messages.get(id), occurrence(p, *id))
-                    && let Some((previous, previous_y)) =
-                        last.insert(*lane, (*id, message.receive_y))
-                    && previous_y > message.receive_y
-                {
-                    return Err(GeometryIssue::LifetimeInversionNotSupported {
-                        create: previous,
-                        delete: *id,
-                    });
-                }
-            }
-        }
-        let old_footprints = footprints(baseline, &seed, &seed);
-        let mut drawn = footprints(baseline, &anchors, &seed);
-        let old_coverage = coverage(p, &old_footprints);
-        let mut new_coverage = coverage(p, &drawn);
-        let mut frames = BTreeMap::new();
-        let mut containers: Vec<_> = seed
-            .keys()
-            .copied()
-            .filter(|id| matches!(occurrence(p, *id), Some(OccurrenceBody::Fragment { .. })))
-            .collect();
-        containers.sort_by_key(|id| std::cmp::Reverse(depth(p, *id)));
-        for id in containers {
-            let original = old_footprints[&id];
-            let mut rect = original;
-            if let Some(covered) = new_coverage.get(&id).copied() {
-                // Preserve automatic extents and their existing descendant padding.
-                // Upward envelope growth would move the painted frame header
-                // while its fixed FrameStart/row/slot remained at the seed.
-                // Reject that unsupported compound change, not mere overlap.
-                if covered.y < rect.y {
-                    return Err(GeometryIssue::FixedFrameHeaderWouldMove { frame: id });
-                }
-                let old_covered = old_coverage[&id];
-                let padding =
-                    (original.y + original.height - old_covered.y - old_covered.height).max(0.);
-                // Preserve padding before the footprint itself reaches the old
-                // frame edge: operand scopes already retain their own padding.
-                rect.height = rect
-                    .height
-                    .max(covered.y + covered.height + padding - rect.y);
-            }
-            frames.insert(id, rect);
-            drawn.insert(id, rect);
-            include_ancestors(p, id, rect, &mut new_coverage);
-        }
-        let mut scopes = baseline.sequence_bounds.clone();
-        for (&scope, bounds) in &mut scopes {
-            if let (Some(old), Some(new)) = (
-                old_coverage.get(&scope).copied(),
-                new_coverage.get(&scope).copied(),
-            ) {
-                let top_padding = (old.y - bounds.0).max(0.);
-                let bottom_padding = (bounds.1 - old.y - old.height).max(0.);
-                if new.y < bounds.0 {
-                    bounds.0 = new.y - top_padding;
-                }
-                bounds.1 = bounds.1.max(new.y + new.height + bottom_padding);
-            }
-        }
-        let tail = baseline.size.height - baseline.sequence_bounds[&owner].1;
-        let height = baseline.size.height.max(scopes[&owner].1 + tail);
-        for (&operand, &(start, end)) in &scopes {
-            if !matches!(occurrence(p, operand), Some(OccurrenceBody::Branch { .. })) {
-                continue;
-            }
-            let fragment = p.elements[&operand].parent.expect("operand fragment");
-            let caller = p.elements[&fragment]
-                .parent
-                .expect("fragment caller sequence");
-            let enclosing_frame = frames[&fragment];
-            let (caller_start, caller_end) = if caller == owner {
-                (85., height - 20.)
-            } else {
-                let (a, b) = scopes[&caller];
-                (a, if a == b { a + 26. } else { b })
-            };
-            let enclosing_start = anchors[&fragment].y.max(caller_start);
-            let enclosing_end = (enclosing_frame.y + enclosing_frame.height).min(caller_end);
-            let effective_end = if start == end { start + 26. } else { end };
-            // Actual lifecycle traversal cannot enter an operand that escapes
-            // this enclosing interval. This guards bridge feasibility only;
-            // it is not a generic event-spacing or sibling-ordering policy.
-            if start < enclosing_start || effective_end > enclosing_end {
-                return Err(GeometryIssue::OperandScopeOutsideEnclosingInterval {
-                    operand,
-                    fragment,
-                });
-            }
-        }
-        for (&id, message) in &messages {
-            if matches!(
-                occurrence(p, id),
-                Some(OccurrenceBody::Exchange {
-                    message_kind: MessageKind::Create | MessageKind::Delete,
-                    ..
-                })
-            ) {
-                let scope = p.elements[&id].parent.expect("lifecycle sequence owner");
-                // Match Rendering::new's effective scope, not the insertion
-                // scope: it overrides the root span to 85..height-20 and gives
-                // empty non-root scopes the existing 26px lifetime allowance.
-                let (start, end) = if scope == owner {
-                    (85., height - 20.)
-                } else if let Some(&(start, end)) = scopes.get(&scope) {
-                    (start, if start == end { start + 26. } else { end })
-                } else {
-                    return Err(GeometryIssue::LifecycleAnchorOutsideRenderScope {
-                        occurrence: id,
-                        scope,
-                    });
-                };
-                if message.receive_y < start || message.receive_y > end {
-                    return Err(GeometryIssue::LifecycleAnchorOutsideRenderScope {
-                        occurrence: id,
-                        scope,
-                    });
-                }
-            }
-        }
-        let mut diagnostics = Vec::new();
-        for element in p
-            .elements
-            .values()
-            .filter(|e| e.id == owner || inside(p, e.id, owner))
-        {
-            if let Some(steps) = element.steps() {
-                for pair in steps.windows(2) {
-                    if let (Some(a), Some(b)) = (anchors.get(&pair[0]), anchors.get(&pair[1])) {
-                        if a.y > b.y {
-                            diagnostics.push(Diagnostic::SourceOrderCrossing {
-                                scope: element.id,
-                                before: pair[0],
-                                after: pair[1],
-                            });
-                        }
-                        if let Some(frame) = frames.get(&pair[0])
-                            && frame.y + frame.height > b.y
-                        {
-                            diagnostics.push(Diagnostic::FrameExtendsPastFollowingAnchor {
-                                frame: pair[0],
-                                following: pair[1],
-                            });
-                        }
-                    }
-                }
-            }
-        }
-        Ok(Self {
-            anchors,
-            messages,
-            frames,
-            scopes,
-            height,
-            diagnostics,
-        })
-    }
-}
-
-/// An appearance identity, never inferred from selection or from the owner alone.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub(crate) enum Representation {
-    Derived { owner: Id },
-    Saved { diagram: Id },
-}
-
-/// Complete immutable geometry produced from one Project borrow. Scene is retained
-/// with its plan so a caller cannot accidentally render this plan against another
-/// Project or representation. Document/revision freshness belongs to that caller.
-pub(super) struct ResolvedScenarioPlan {
-    pub(super) representation: Representation,
-    pub(super) owner: Id,
-    pub(super) lanes: BTreeMap<Id, f32>,
-    pub(super) plan: Plan,
-    pub(super) latent_messages: Vec<Id>,
-    pub(super) bounds: Rectangle,
-    pub(super) scene: Scene,
-}
-
-pub(super) fn resolve(
-    p: &Project,
-    representation: Representation,
-    selected: Id,
-) -> Result<ResolvedScenarioPlan, Vec<GeometryIssue>> {
-    let (owner, layout) = match representation {
-        Representation::Derived { owner } => (owner, None),
-        Representation::Saved { diagram } => {
-            let view = p
-                .diagrams
-                .get(&diagram)
-                .ok_or_else(|| vec![GeometryIssue::InvalidRepresentation(diagram)])?;
-            let owner = view
-                .projection
-                .scenario()
-                .ok_or_else(|| vec![GeometryIssue::InvalidRepresentation(diagram)])?;
-            if p.elements
-                .get(&owner)
-                .is_none_or(|e| e.layer() != view.layer)
-            {
-                return Err(vec![GeometryIssue::InvalidRepresentation(diagram)]);
-            }
-            let layout = view
-                .layout
-                .as_ref()
-                .map(|DiagramLayout::Scenario(layout)| layout);
-            (owner, layout)
-        }
-    };
-    if p.elements
-        .get(&owner)
-        .is_none_or(|e| e.kind() != Kind::Scenario)
-    {
-        return Err(vec![GeometryIssue::InvalidRepresentation(owner)]);
-    }
-    let empty = ScenarioLayout::default();
-    let layout = layout.unwrap_or(&empty);
-    let mut lanes = BTreeMap::new();
-    let mut issues = Vec::new();
-    for lane in &layout.lanes {
-        if p.elements
-            .get(&lane.lifeline)
-            .is_none_or(|e| e.kind() != Kind::Lifeline || e.parent != Some(owner))
-        {
-            issues.push(GeometryIssue::UnknownAnchor(lane.lifeline));
-        }
-        if !lane.x.is_finite() || lane.x.abs() > oa_core::MAX_COORDINATE {
-            issues.push(GeometryIssue::InvalidCoordinate(lane.lifeline));
-        }
-        if lanes.insert(lane.lifeline, lane.x).is_some() {
-            issues.push(GeometryIssue::DuplicateCoordinate(lane.lifeline));
-        }
-    }
-    if !issues.is_empty() {
-        return Err(issues);
-    }
-    // The actual automatic traversal runs first, with authored lane centers already
-    // applied. It supplies every untouched anchor, shape, insertion scope and label.
-    let baseline = Scene::sequence_geometry(
-        p,
-        owner,
-        selected,
-        (!lanes.is_empty()).then_some(&lanes),
-        None,
-    );
-    let mut desired = BTreeMap::new();
-    let mut seen = std::collections::BTreeSet::new();
-    let mut latent_messages = Vec::new();
-    let line_ids: std::collections::BTreeSet<_> =
-        baseline.lines.iter().map(|line| line.id).collect();
-    for message in &layout.messages {
-        let id = message.address.occurrence;
-        if !seen.insert(id) {
-            issues.push(GeometryIssue::DuplicateCoordinate(id));
-        }
-        if !message.address.references.is_empty() {
-            issues.push(GeometryIssue::ExpandedAddressNotSupported(id));
-        }
-        if !message.send_y.is_finite() || message.send_y.abs() > oa_core::MAX_COORDINATE {
-            issues.push(GeometryIssue::InvalidCoordinate(id));
-        }
-        let Some(OccurrenceBody::Exchange {
-            sender,
-            receiver,
-            message_kind,
-            ..
-        }) = occurrence(p, id)
-        else {
-            issues.push(GeometryIssue::UnknownAnchor(id));
-            continue;
-        };
-        if !baseline.rows.contains_key(&id) {
-            issues.push(GeometryIssue::UnknownAnchor(id));
-            continue;
-        }
-        if !line_ids.contains(&id) {
-            latent_messages.push(id);
-            continue;
-        }
-        // Legacy lifecycle rows denote receipt, whereas the saved field denotes send.
-        let row = if sender.is_some()
-            && sender == receiver
-            && matches!(message_kind, MessageKind::Create | MessageKind::Delete)
-        {
-            message.send_y + 24.
-        } else {
-            message.send_y
-        };
-        desired.insert(id, row);
-    }
-    let actual_lanes = &baseline.render_lanes;
-    // A coincident pair is not a self message. Do not invent an arrow or lane order.
-    for line in &baseline.lines {
-        if let Some(OccurrenceBody::Exchange {
-            sender: Some(sender),
-            receiver,
-            message_kind,
-            ..
-        }) = occurrence(p, line.id)
-        {
-            let target = if matches!(message_kind, MessageKind::Timer { .. }) {
-                Some(*sender)
-            } else {
-                *receiver
-            };
-            if target.is_some_and(|target| target != *sender)
-                && target
-                    .is_some_and(|target| actual_lanes.get(sender) == actual_lanes.get(&target))
-            {
-                issues.push(GeometryIssue::CoincidentDistinctEndpoints(line.id));
-            }
-        }
-    }
-    if !issues.is_empty() {
-        return Err(issues);
-    }
-    let mut plan = Plan::build(p, owner, &baseline, &desired).map_err(|issue| vec![issue])?;
-    // Keep the schema's exact send value; send+24 is performed once. In particular,
-    // a self Create/Delete receive row must never round-trip back into saved send.
-    for message in &layout.messages {
-        let id = message.address.occurrence;
-        if let Some(anchors) = plan.messages.get_mut(&id) {
-            let self_message = matches!(occurrence(p, id), Some(OccurrenceBody::Exchange {
-                sender: Some(sender), receiver, message_kind, ..
-            }) if matches!(message_kind, MessageKind::Timer { .. }) || *receiver == Some(*sender));
-            *anchors = MessageAnchors {
-                send_y: message.send_y,
-                receive_y: if self_message {
-                    message.send_y + 24.
-                } else {
-                    message.send_y
-                },
-            };
-        }
-    }
-    // Typed bars require a positive receiver interval. This is a narrow renderer
-    // limitation, not a global ban on reordered/negative asynchronous anchors.
-    for (&id, message) in &plan.messages {
-        match occurrence(p, id) {
-            Some(OccurrenceBody::Exchange {
-                message_kind: MessageKind::Call,
-                ..
-            }) => {
-                let scope = baseline.rows[&id].0;
-                let (start, end) = if scope == owner {
-                    (85., plan.height - 20.)
-                } else {
-                    plan.scopes[&scope]
-                };
-                if desired.contains_key(&id) && (message.send_y < start || message.receive_y >= end)
-                {
-                    issues.push(GeometryIssue::TypedActivationOutsideScope { call: id, scope });
-                }
-            }
-            Some(OccurrenceBody::Exchange {
-                message_kind: MessageKind::Reply,
-                reply_to: Some(call),
-                ..
-            }) => {
-                if let Some(start) = plan.messages.get(call)
-                    && (desired.contains_key(&id) || desired.contains_key(call))
-                    && message.send_y <= start.receive_y
-                {
-                    issues.push(GeometryIssue::TypedActivationCrossingNotSupported {
-                        call: *call,
-                        event: id,
-                    });
-                }
-            }
-            _ => {}
-        }
-    }
-    if !issues.is_empty() {
-        return Err(issues);
-    }
-    for segment in &baseline.activations {
-        if baseline
-            .rows
-            .get(&segment.call)
-            .is_none_or(|(scope, _)| *scope != segment.scope)
-        {
-            continue;
-        }
-        let Some(start) = plan.messages.get(&segment.call) else {
-            continue;
-        };
-        let event = match segment.finish {
-            scenario_activation::Finish::Reply(event)
-            | scenario_activation::Finish::Terminated(event) => Some(event),
-            _ => None,
-        };
-        if let Some(event) = event
-            && (desired.contains_key(&event) || desired.contains_key(&segment.call))
-            && plan.anchors[&event].y <= start.receive_y
-        {
-            issues.push(GeometryIssue::TypedActivationCrossingNotSupported {
-                call: segment.call,
-                event,
-            });
-        }
-    }
-    if !issues.is_empty() {
-        return Err(issues);
-    }
-    let scene = Scene::sequence_geometry(
-        p,
-        owner,
-        selected,
-        (!lanes.is_empty()).then_some(&lanes),
-        Some(&plan),
-    );
-    // Compare the actual projector, whose cursor rules include sibling scopes and
-    // lifecycle/fragment events. Retain existing incomplete-model uncertainty;
-    // reject only newly missing geometry introduced by this presentation.
-    let previous_missing = baseline.lifecycle.missing_geometry();
-    for (lifeline, scope) in scene
-        .lifecycle
-        .missing_geometry()
-        .difference(&previous_missing)
-    {
-        issues.push(GeometryIssue::LifecycleGeometryNotSupported {
-            lifeline: *lifeline,
-            scope: *scope,
-        });
-    }
-    if !issues.is_empty() {
-        return Err(issues);
-    }
-    for segment in &baseline.activations {
-        let Some(seed) = baseline
-            .lines
-            .iter()
-            .find(|line| line.id == segment.call)
-            .and_then(|line| line.points.last())
-        else {
-            continue;
-        };
-        if segment.rect.y != seed.y || baseline.rows[&segment.call].0 != segment.scope {
-            continue;
-        }
-        let receive = plan.messages[&segment.call].receive_y;
-        if !desired.is_empty()
-            && !scene.activations.iter().any(|current| {
-                current.call == segment.call
-                    && current.scope == segment.scope
-                    && current.rect.y == receive
-            })
-        {
-            issues.push(GeometryIssue::TypedActivationOutsideLifetime {
-                call: segment.call,
-                receiver: segment.receiver,
-            });
-        }
-    }
-    if !issues.is_empty() {
-        return Err(issues);
-    }
-    let bounds = structural_bounds(&scene);
-    let all_lanes = scene.render_lanes.clone();
-    Ok(ResolvedScenarioPlan {
-        representation,
-        owner,
-        lanes: all_lanes,
-        plan,
-        latent_messages,
-        bounds,
-        scene,
-    })
-}
-
-fn structural_bounds(scene: &Scene) -> Rectangle {
-    let mut bounds = Rectangle::new(scene.layout_origin, scene.size);
-    for item in &scene.boxes {
-        bounds = union(bounds, item.rect);
-    }
-    for line in &scene.lines {
-        if !line.label.is_empty() {
-            bounds = union(bounds, line.label_bounds());
-        }
-        for point in &line.points {
-            // Arrow wings extend beyond the centerline in either direction.
-            bounds = union(
-                bounds,
-                Rectangle::new(Point::new(point.x - 8., point.y - 8.), Size::new(16., 16.)),
-            );
-        }
-    }
-    for segment in &scene.activations {
-        bounds = union(bounds, segment.rect);
-    }
-    for point in &scene.open_calls {
-        bounds = union(
-            bounds,
-            Rectangle::new(Point::new(point.x - 8., point.y - 8.), Size::new(16., 16.)),
-        );
-    }
-    if let Some(lifetime) = scene.lifecycle.bounds() {
-        bounds = union(bounds, lifetime);
-    }
-    bounds
-}

crates/oa-desktop/src/behavior/scenario_layout/presentation.rs

@@ -1,234 +0,0 @@
-//! Display policy for one requested Scenario representation, without authoring.
-//! The resolver remains the sole renderer. Freshness and editor admission belong
-//! to the caller; a capability here never bypasses those guards.
-use super::{Diagnostic, GeometryIssue, Representation, ResolvedScenarioPlan, resolve};
-use crate::behavior::Scene;
-use iced::Rectangle;
-use oa_core::{DiagramLayout, Id, Kind, OccurrenceBody, Project, SharedBody};
-use std::collections::BTreeSet;
-
-#[cfg(test)]
-mod tests;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) enum PresentationStatus {
-    Ready,
-    Fallback {
-        requested_issues: Vec<GeometryIssue>,
-    },
-    Unavailable {
-        requested_issues: Vec<GeometryIssue>,
-        automatic_issues: Vec<GeometryIssue>,
-    },
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub(crate) struct PresentationCapabilities {
-    /// Actual geometry exists for inspection, Fit and geometry-based navigation.
-    pub(crate) geometry_navigation: bool,
-    /// Still subject to document, gesture, editor and view-visit admission.
-    pub(crate) coordinate_input: bool,
-}
-
-pub(crate) struct ScenarioPresentation {
-    requested: Representation,
-    owner: Option<Id>,
-    status: PresentationStatus,
-    geometry: Option<ResolvedScenarioPlan>,
-    // Saved metadata must survive a complete automatic fallback.
-    latent_messages: Vec<Id>,
-}
-
-impl ScenarioPresentation {
-    pub(crate) fn requested(&self) -> Representation {
-        self.requested
-    }
-    pub(crate) fn owner(&self) -> Option<Id> {
-        self.owner
-    }
-    pub(crate) fn status(&self) -> &PresentationStatus {
-        &self.status
-    }
-    pub(crate) fn geometry_representation(&self) -> Option<Representation> {
-        self.geometry
-            .as_ref()
-            .map(|geometry| geometry.representation)
-    }
-    pub(crate) fn bounds(&self) -> Option<Rectangle> {
-        self.geometry.as_ref().map(|geometry| geometry.bounds)
-    }
-    /// Diagnostics describe the actual displayed geometry. Requested hard failures
-    /// are retained separately in status(), never presented as automatic warnings.
-    pub(crate) fn diagnostics(&self) -> &[Diagnostic] {
-        self.geometry
-            .as_ref()
-            .map_or(&[], |geometry| &geometry.plan.diagnostics)
-    }
-    pub(crate) fn latent_messages(&self) -> &[Id] {
-        &self.latent_messages
-    }
-    pub(crate) fn capabilities(&self) -> PresentationCapabilities {
-        PresentationCapabilities {
-            geometry_navigation: self.geometry.is_some(),
-            coordinate_input: matches!(self.status, PresentationStatus::Ready),
-        }
-    }
-    pub(in crate::behavior) fn scene(&self) -> Option<&Scene> {
-        self.geometry.as_ref().map(|geometry| &geometry.scene)
-    }
-    pub(in crate::behavior) fn into_scene(self) -> Option<Scene> {
-        self.geometry.map(|geometry| geometry.scene)
-    }
-}
-
-/// Resolve a structurally accepted Project for passive display. This is not a
-/// second model validator: identity and resolver-reported structural failures
-/// cannot be converted into a more permissive automatic representation.
-pub(crate) fn present(
-    project: &Project,
-    requested: Representation,
-    selected: Id,
-) -> ScenarioPresentation {
-    let owner = checked_owner(project, requested);
-    let Some(owner_id) = owner else {
-        let id = match requested {
-            Representation::Derived { owner } => owner,
-            Representation::Saved { diagram } => diagram,
-        };
-        return ScenarioPresentation {
-            requested,
-            owner: None,
-            geometry: None,
-            latent_messages: vec![],
-            status: PresentationStatus::Unavailable {
-                requested_issues: vec![GeometryIssue::InvalidRepresentation(id)],
-                automatic_issues: vec![],
-            },
-        };
-    };
-    match resolve(project, requested, selected) {
-        Ok(geometry) => ScenarioPresentation {
-            requested,
-            owner,
-            status: PresentationStatus::Ready,
-            latent_messages: geometry.latent_messages.clone(),
-            geometry: Some(geometry),
-        },
-        Err(requested_issues) => {
-            if matches!(requested, Representation::Derived { .. })
-                || requested_issues.iter().any(structural_failure)
-            {
-                return ScenarioPresentation {
-                    requested,
-                    owner,
-                    geometry: None,
-                    latent_messages: vec![],
-                    status: PresentationStatus::Unavailable {
-                        requested_issues,
-                        automatic_issues: vec![],
-                    },
-                };
-            }
-            match resolve(
-                project,
-                Representation::Derived { owner: owner_id },
-                selected,
-            ) {
-                Ok(geometry) => {
-                    let latent_messages =
-                        saved_latent_messages(project, requested, &geometry.scene);
-                    ScenarioPresentation {
-                        requested,
-                        owner,
-                        status: PresentationStatus::Fallback { requested_issues },
-                        geometry: Some(geometry),
-                        latent_messages,
-                    }
-                }
-                Err(automatic_issues) => ScenarioPresentation {
-                    requested,
-                    owner,
-                    geometry: None,
-                    latent_messages: vec![],
-                    status: PresentationStatus::Unavailable {
-                        requested_issues,
-                        automatic_issues,
-                    },
-                },
-            }
-        }
-    }
-}
-
-pub(crate) fn checked_owner(project: &Project, requested: Representation) -> Option<Id> {
-    let owner = match requested {
-        Representation::Derived { owner } => owner,
-        Representation::Saved { diagram } => {
-            let view = project.diagrams.get(&diagram)?;
-            let owner = view.projection.scenario()?;
-            if view.id != diagram || project.elements.get(&owner)?.layer() != view.layer {
-                return None;
-            }
-            owner
-        }
-    };
-    project
-        .elements
-        .get(&owner)
-        .is_some_and(|element| element.kind() == Kind::Scenario)
-        .then_some(owner)
-}
-
-fn structural_failure(issue: &GeometryIssue) -> bool {
-    // These violate the existing identity/address/finite-coordinate admission
-    // contract. Geometry support failures below do not invalidate stored intent.
-    match issue {
-        GeometryIssue::InvalidRepresentation(_)
-        | GeometryIssue::UnknownAnchor(_)
-        | GeometryIssue::InvalidCoordinate(_)
-        | GeometryIssue::DuplicateCoordinate(_)
-        | GeometryIssue::ExpandedAddressNotSupported(_)
-        | GeometryIssue::NonFinite(_) => true,
-        GeometryIssue::LifecycleGeometryNotSupported { .. }
-        | GeometryIssue::CoincidentDistinctEndpoints(_)
-        | GeometryIssue::TypedActivationOutsideScope { .. }
-        | GeometryIssue::TypedActivationOutsideLifetime { .. }
-        | GeometryIssue::TypedActivationCrossingNotSupported { .. }
-        | GeometryIssue::CompoundMoveNotImplemented(_)
-        | GeometryIssue::FixedFrameHeaderWouldMove { .. }
-        | GeometryIssue::OperandScopeOutsideEnclosingInterval { .. }
-        | GeometryIssue::LifecycleAnchorOutsideRenderScope { .. }
-        | GeometryIssue::LifetimeInversionNotSupported { .. } => false,
-    }
-}
-
-fn saved_latent_messages(project: &Project, requested: Representation, scene: &Scene) -> Vec<Id> {
-    let Representation::Saved { diagram } = requested else {
-        return vec![];
-    };
-    let Some(DiagramLayout::Scenario(layout)) = project.diagrams[&diagram].layout.as_ref() else {
-        return vec![];
-    };
-    let lines: BTreeSet<_> = scene.lines.iter().map(|line| line.id).collect();
-    layout
-        .messages
-        .iter()
-        .filter_map(|message| {
-            let id = message.address.occurrence;
-            (message.address.references.is_empty()
-                && scene.rows.contains_key(&id)
-                && !lines.contains(&id)
-                && matches!(
-                    project
-                        .elements
-                        .get(&id)
-                        .and_then(|element| element.shared()),
-                    Some(SharedBody::Occurrence {
-                        body: OccurrenceBody::Exchange { .. },
-                        ..
-                    })
-                ))
-            .then_some(id)
-        })
-        .collect()
-}

crates/oa-desktop/src/behavior/scenario_layout/presentation/tests.rs

@@ -1,351 +0,0 @@
-use super::*;
-use crate::document::Document;
-use oa_core::{
-    Command, Diagram, OccurrenceEndpoint, ProjectionKind, ScenarioLanePosition, ScenarioLayout,
-    ScenarioMessagePosition, language, validation,
-};
-
-fn fixture() -> (Project, Id) {
-    let project = language::parse(FIXTURE).unwrap();
-    assert_admitted(&project);
-    let owner = named(&project, "conversation");
-    (project, owner)
-}
-fn named(project: &Project, alias: &str) -> Id {
-    project
-        .identities()
-        .into_iter()
-        .find(|(_, name)| *name == alias)
-        .unwrap()
-        .0
-}
-fn assert_admitted(project: &Project) {
-    let errors: Vec<_> = validation::validate(project)
-        .into_iter()
-        .filter(|issue| issue.severity == validation::Severity::Error)
-        .collect();
-    assert!(errors.is_empty(), "{errors:?}");
-}
-fn save(project: &mut Project, owner: Id, layout: Option<ScenarioLayout>) -> Id {
-    let id = Id::new_v4();
-    project.diagrams.insert(
-        id,
-        Diagram {
-            id,
-            alias: format!("view_{}", project.diagrams.len()),
-            name: "Saved conversation".into(),
-            description: String::new(),
-            layer: project.elements[&owner].layer(),
-            projection: ProjectionKind::Scenario { scenario: owner },
-            view_options: Default::default(),
-            nodes: Default::default(),
-            routes: vec![],
-            layout: layout.map(DiagramLayout::Scenario),
-        },
-    );
-    id
-}
-fn layout(messages: &[(Id, f32)], lanes: &[(Id, f32)]) -> ScenarioLayout {
-    ScenarioLayout {
-        lanes: lanes
-            .iter()
-            .map(|&(lifeline, x)| ScenarioLanePosition { lifeline, x })
-            .collect(),
-        messages: messages
-            .iter()
-            .map(|&(occurrence, send_y)| ScenarioMessagePosition {
-                address: OccurrenceEndpoint {
-                    occurrence,
-                    references: vec![],
-                },
-                send_y,
-            })
-            .collect(),
-    }
-}
-fn same_geometry(a: &Scene, b: &Scene) {
-    assert!(
-        !a.activations.is_empty(),
-        "fallback must include real typed executions"
-    );
-    assert_eq!(a.activations, b.activations);
-    assert_eq!(a.lifecycle, b.lifecycle);
-    assert_eq!(a.rows, b.rows);
-    assert_eq!(a.sequence_bounds, b.sequence_bounds);
-    assert_eq!(a.render_lanes, b.render_lanes);
-    assert_eq!(a.lanes, b.lanes);
-    assert_eq!(a.open_calls, b.open_calls);
-    assert_eq!((a.size, a.layout_origin), (b.size, b.layout_origin));
-    let boxes = |scene: &Scene| {
-        scene
-            .boxes
-            .iter()
-            .map(|item| {
-                (
-                    item.id,
-                    item.rect,
-                    item.title.clone(),
-                    item.detail.clone(),
-                    item.marker,
-                )
-            })
-            .collect::<Vec<_>>()
-    };
-    let lines = |scene: &Scene| {
-        scene
-            .lines
-            .iter()
-            .map(|line| {
-                (
-                    line.id,
-                    line.points.clone(),
-                    line.label.clone(),
-                    line.label_at,
-                    line.dashed,
-                )
-            })
-            .collect::<Vec<_>>()
-    };
-    let slots = |scene: &Scene| {
-        scene
-            .slots
-            .iter()
-            .map(|slot| {
-                (
-                    slot.slot.parent,
-                    slot.slot.before,
-                    slot.y,
-                    slot.label.clone(),
-                )
-            })
-            .collect::<Vec<_>>()
-    };
-    assert_eq!(boxes(a), boxes(b));
-    assert_eq!(lines(a), lines(b));
-    assert_eq!(slots(a), slots(b));
-}
-
-#[test]
-fn absent_and_empty_saved_layouts_remain_saved_ready_representations() {
-    let (mut project, owner) = fixture();
-    let absent = save(&mut project, owner, None);
-    let empty = save(&mut project, owner, Some(ScenarioLayout::default()));
-    assert_admitted(&project);
-    let automatic = present(&project, Representation::Derived { owner }, owner);
-    assert_eq!(automatic.status(), &PresentationStatus::Ready);
-    for diagram in [absent, empty] {
-        let requested = Representation::Saved { diagram };
-        let displayed = present(&project, requested, owner);
-        assert_eq!(displayed.requested(), requested);
-        assert_eq!(displayed.geometry_representation(), Some(requested));
-        assert_eq!(displayed.owner(), Some(owner));
-        assert_eq!(displayed.status(), &PresentationStatus::Ready);
-        assert!(displayed.capabilities().coordinate_input);
-        assert_eq!(displayed.bounds(), automatic.bounds());
-        same_geometry(displayed.scene().unwrap(), automatic.scene().unwrap());
-    }
-}
-
-#[test]
-fn successful_crossing_diagnostic_keeps_authored_geometry_and_latent_identity() {
-    let (mut project, owner) = fixture();
-    let first = named(&project, "first");
-    let second = named(&project, "second");
-    let left = named(&project, "left");
-    let unfinished = named(&project, "unfinished");
-    let diagram = save(
-        &mut project,
-        owner,
-        Some(layout(
-            &[(first, 1000.), (unfinished, 2000.)],
-            &[(left, 900.)],
-        )),
-    );
-    assert_admitted(&project);
-    let shown = present(&project, Representation::Saved { diagram }, first);
-    assert_eq!(shown.status(), &PresentationStatus::Ready);
-    assert_eq!(shown.scene().unwrap().rows[&first].1, 1000.);
-    assert_eq!(shown.scene().unwrap().rows[&second].1, 240.);
-    assert_eq!(shown.scene().unwrap().render_lanes[&left], 900.);
-    assert!(
-        shown
-            .diagnostics()
-            .contains(&Diagnostic::SourceOrderCrossing {
-                scope: owner,
-                before: first,
-                after: second
-            })
-    );
-    assert_eq!(shown.latent_messages(), &[unfinished]);
-    assert_eq!(shown.scene().unwrap().rows[&unfinished].1, 516.);
-}
-
-#[test]
-fn hard_failure_uses_complete_automatic_geometry_but_retains_each_saved_request_and_latent_notice()
-{
-    let (mut project, owner) = fixture();
-    let call = named(&project, "call");
-    let reply = named(&project, "reply");
-    let unfinished = named(&project, "unfinished");
-    let left = named(&project, "left");
-    let right = named(&project, "right");
-    let authored = layout(
-        &[(reply, 300.), (unfinished, 2000.)],
-        &[(left, 900.), (right, -500.)],
-    );
-    let a = save(&mut project, owner, Some(authored.clone()));
-    let b = save(&mut project, owner, Some(authored));
-    assert_admitted(&project);
-    let before = project.clone();
-    let automatic = present(&project, Representation::Derived { owner }, call);
-    let control = automatic.scene().unwrap();
-    assert_eq!(control.render_lanes[&left], 160.);
-    assert_eq!(control.render_lanes[&right], 400.);
-    assert_eq!(control.rows[&reply].1, 424.);
-    assert_eq!(control.activations.len(), 1);
-    assert_eq!(
-        (
-            control.activations[0].rect.y,
-            control.activations[0].rect.height
-        ),
-        (356., 68.)
-    );
-    for diagram in [a, b] {
-        let request = Representation::Saved { diagram };
-        let shown = present(&project, request, call);
-        assert_eq!(shown.requested(), request);
-        assert_eq!(
-            shown.geometry_representation(),
-            Some(Representation::Derived { owner })
-        );
-        assert_eq!(
-            shown.status(),
-            &PresentationStatus::Fallback {
-                requested_issues: vec![GeometryIssue::TypedActivationCrossingNotSupported {
-                    call,
-                    event: reply
-                }],
-            }
-        );
-        assert_eq!(
-            shown.capabilities(),
-            PresentationCapabilities {
-                geometry_navigation: true,
-                coordinate_input: false
-            }
-        );
-        assert_eq!(shown.latent_messages(), &[unfinished]);
-        assert!(shown.diagnostics().is_empty());
-        assert_eq!(shown.bounds(), automatic.bounds());
-        same_geometry(shown.scene().unwrap(), control);
-    }
-    assert_eq!(project, before);
-}
-
-#[test]
-fn missing_or_incompatible_identity_and_structural_coordinate_errors_are_unavailable() {
-    let (mut project, owner) = fixture();
-    let left = named(&project, "left");
-    let diagram = save(&mut project, owner, None);
-    let missing = Id::new_v4();
-    for request in [
-        Representation::Saved { diagram: missing },
-        Representation::Derived { owner: left },
-    ] {
-        let shown = present(&project, request, owner);
-        assert_eq!(shown.requested(), request);
-        assert_eq!(shown.owner(), None);
-        assert!(
-            matches!(shown.status(), PresentationStatus::Unavailable { automatic_issues, .. } if automatic_issues.is_empty())
-        );
-        assert!(shown.scene().is_none() && shown.bounds().is_none());
-        assert_eq!(
-            shown.capabilities(),
-            PresentationCapabilities {
-                geometry_navigation: false,
-                coordinate_input: false
-            }
-        );
-    }
-    project.diagrams.get_mut(&diagram).unwrap().projection =
-        ProjectionKind::Scenario { scenario: missing };
-    assert!(matches!(
-        present(&project, Representation::Saved { diagram }, owner).status(),
-        PresentationStatus::Unavailable { .. }
-    ));
-    // Deliberately invalid-model control, not a warning-admitted geometry failure.
-    project.diagrams.get_mut(&diagram).unwrap().projection =
-        ProjectionKind::Scenario { scenario: owner };
-    project.diagrams.get_mut(&diagram).unwrap().layout = Some(DiagramLayout::Scenario(layout(
-        &[],
-        &[(left, oa_core::MAX_COORDINATE + 1.)],
-    )));
-    assert!(
-        validation::validate(&project)
-            .iter()
-            .any(|issue| issue.severity == validation::Severity::Error)
-    );
-    let before = project.clone();
-    let shown = present(&project, Representation::Saved { diagram }, owner);
-    assert!(
-        matches!(shown.status(), PresentationStatus::Unavailable { requested_issues, automatic_issues }
-        if requested_issues == &[GeometryIssue::InvalidCoordinate(left)] && automatic_issues.is_empty())
-    );
-    assert!(shown.scene().is_none());
-    assert_eq!(project, before);
-}
-
-#[test]
-fn passive_fallback_preserves_exact_document_source_and_one_step_undo_redo() {
-    let (mut project, owner) = fixture();
-    let first = named(&project, "first");
-    let reply = named(&project, "reply");
-    let view = save(&mut project, owner, Some(layout(&[(reply, 300.)], &[])));
-    assert_admitted(&project);
-    let mut document = Document::from_project(project, Default::default()).unwrap();
-    let initial_project = document.project().clone();
-    let initial_source = document.bundle().clone();
-    document
-        .execute(Command::Rename(first, "An intentional prior edit".into()))
-        .unwrap();
-    let accepted_project = document.project().clone();
-    let accepted_source = document.bundle().clone();
-    let revision = document.revision();
-    {
-        let shown = present(
-            document.project(),
-            Representation::Saved { diagram: view },
-            first,
-        );
-        assert!(matches!(
-            shown.status(),
-            PresentationStatus::Fallback { .. }
-        ));
-        assert!(shown.scene().is_some());
-    }
-    assert_eq!(document.project(), &accepted_project);
-    assert_eq!(document.bundle(), &accepted_source);
-    assert_eq!(document.revision(), revision);
-    assert!(document.undo());
-    assert_eq!(document.project(), &initial_project);
-    assert_eq!(document.bundle(), &initial_source);
-    assert!(document.redo());
-    assert_eq!(document.project(), &accepted_project);
-    assert_eq!(document.bundle(), &accepted_source);
-}
-
-const FIXTURE: &str = r#"arcadia 7;
-project display_probe "Scenario display probe" id "70000000-0000-4000-8000-000000000001" {
- oa_activity source "Source" id "70000000-0000-4000-8000-000000000002" {}
- oa_activity target "Target" id "70000000-0000-4000-8000-000000000003" {}
- interaction exchange "Repeated exchange" id "70000000-0000-4000-8000-000000000004" { source @source; target @target; }
- oa_scenario conversation "Conversation" id "70000000-0000-4000-8000-000000000005" { viewpoint OperationalActivity; steps [@first, @second, @call, @reply, @unfinished]; }
- oa_lifeline left "Left" id "70000000-0000-4000-8000-000000000006" { parent @conversation; represented @source; }
- oa_lifeline right "Right" id "70000000-0000-4000-8000-000000000007" { parent @conversation; represented @target; }
- oa_occurrence first "First" id "70000000-0000-4000-8000-000000000008" { parent @conversation; body { Exchange { exchange @exchange; sender @left; receiver @right; message_kind Asynchronous; }; }; }
- oa_occurrence second "Second" id "70000000-0000-4000-8000-000000000009" { parent @conversation; body { Exchange { exchange @exchange; sender @left; receiver @right; message_kind Asynchronous; }; }; }
- oa_occurrence call "Call" id "70000000-0000-4000-8000-00000000000a" { parent @conversation; body { Exchange { exchange none; sender @right; receiver @right; message_kind Call; }; }; }
- oa_occurrence reply "Reply" id "70000000-0000-4000-8000-00000000000b" { parent @conversation; body { Exchange { exchange none; sender @right; receiver @right; message_kind Reply; reply_to @call; }; }; }
- oa_occurrence unfinished "Unfinished" id "70000000-0000-4000-8000-00000000000c" { parent @conversation; body { Exchange { exchange @exchange; sender @left; receiver none; message_kind Asynchronous; }; }; }
-}
-"#;

crates/oa-desktop/src/behavior/scenario_lifecycle/render.rs

@@ -8,21 +8,6 @@ use iced::{
 use oa_core::{Id, OccurrenceBody, Project, SharedBody};
 use std::collections::BTreeMap;
 
-// Test-only geometry input, deliberately upstream of rows, scopes, lifecycle
-// and activations. This is not an authored placement or drag policy.
-#[cfg(test)]
-thread_local! {
-    static TEST_ROW_OFFSETS: std::cell::RefCell<BTreeMap<Id, f32>> = Default::default();
-}
-#[cfg(test)]
-pub(in crate::behavior) fn apply_test_row_offset(id: Id, y: &mut f32) {
-    TEST_ROW_OFFSETS.with(|offsets| {
-        if let Some(offset) = offsets.borrow().get(&id) {
-            *y += offset;
-        }
-    });
-}
-
 #[derive(Debug, Clone, PartialEq)]
 struct EventMarker {
     event: Marker,
@@ -31,7 +16,6 @@ struct EventMarker {
     capsule: Rectangle,
     name: String,
     sender_x: Option<f32>,
-    self_message: bool,
 }
 
 #[derive(Debug, Default, Clone, PartialEq)]
@@ -90,7 +74,7 @@ impl Rendering {
                 continue;
             };
             for event in &lane.markers {
-                let sender_id = project
+                let sender_x = project
                     .elements
                     .get(&event.occurrence)
                     .and_then(|e| e.shared())
@@ -102,7 +86,7 @@ impl Rendering {
                                     ..
                                 },
                             ..
-                        } => Some(*sender),
+                        } => lanes.get(sender).copied(),
                         _ => None,
                     });
                 markers.push(EventMarker {
@@ -114,8 +98,7 @@ impl Rendering {
                         Size::new(140., 28.),
                     ),
                     name: project.named(lane.lifeline).to_owned(),
-                    sender_x: sender_id.and_then(|id| lanes.get(&id).copied()),
-                    self_message: sender_id == Some(lane.lifeline),
+                    sender_x,
                 });
             }
         }
@@ -140,7 +123,7 @@ impl Rendering {
             };
             let x = marker.center.x;
             let y = marker.center.y;
-            let self_message = marker.self_message;
+            let self_message = sender == x;
             let end_x = match marker.event.kind {
                 MarkerKind::Birth if sender < x => marker.capsule.x,
                 MarkerKind::Birth => marker.capsule.x + marker.capsule.width,
@@ -168,48 +151,6 @@ impl Rendering {
         }
     }
 
-    /// Geometry loss is distinct from warning-admitted semantic uncertainty.
-    /// The saved bridge compares these exact projector diagnostics with baseline.
-    pub(in crate::behavior) fn missing_geometry(&self) -> std::collections::BTreeSet<(Id, Id)> {
-        self.lifetimes
-            .iter()
-            .flat_map(|lane| {
-                lane.uncertainties
-                    .iter()
-                    .filter(|issue| issue.reason == super::UncertaintyReason::MissingGeometry)
-                    .map(|issue| (lane.lifeline, issue.scope))
-            })
-            .collect()
-    }
-
-    /// Complete structural lifetime bounds, including the birth capsule and death mark.
-    pub(in crate::behavior) fn bounds(&self) -> Option<Rectangle> {
-        let mut bounds = self.span.and_then(|span| {
-            self.lanes
-                .values()
-                .map(|x| {
-                    Rectangle::new(
-                        Point::new(*x, span.start),
-                        Size::new(0., span.end - span.start),
-                    )
-                })
-                .reduce(crate::behavior::scenario_layout::union)
-        });
-        for marker in &self.markers {
-            let rect = match marker.event.kind {
-                MarkerKind::Birth => marker.capsule,
-                MarkerKind::Death => Rectangle::new(
-                    Point::new(marker.center.x - 10., marker.center.y - 10.),
-                    Size::new(20., 20.),
-                ),
-            };
-            bounds = Some(bounds.map_or(rect, |old| {
-                crate::behavior::scenario_layout::union(old, rect)
-            }));
-        }
-        bounds
-    }
-
     pub(in crate::behavior) fn alive_spans(
         &self,
         lifeline: Id,

crates/oa-desktop/src/behavior/scenario_lifecycle/render_tests.rs

@@ -3,9 +3,6 @@ use crate::{behavior::Scene, document::Document};
 use iced::Size;
 use oa_core::*;
 
-#[path = "union_tests.rs"]
-mod union_tests;
-
 struct Fixture {
     project: Project,
     owner: Id,
@@ -103,21 +100,6 @@ impl Fixture {
             },
         )
     }
-    fn reply(&mut self, parent: Id, call: Id) -> Id {
-        self.occurrence(
-            parent,
-            "Reply",
-            OccurrenceBody::Exchange {
-                exchange: Some(self.exchange),
-                sender: Some(self.receiver),
-                receiver: Some(self.sender),
-                message_kind: MessageKind::Reply,
-                operation: None,
-                reply_to: Some(call),
-                values: vec![],
-            },
-        )
-    }
     fn fragment(&mut self, parent: Id, operator: FragmentOperator) -> Id {
         self.occurrence(
             parent,
@@ -506,9 +488,9 @@ fn real_scene_branch_delete_clips_only_its_activation_and_keeps_unanswered_call_
         let (left_start, left_end) = scene.sequence_bounds[&left];
         let (right_start, _) = scene.sequence_bounds[&right];
         let bars: Vec<_> = scene
-            .activations
+            .boxes
             .iter()
-            .filter(|b| b.call == call && b.receiver == f.receiver)
+            .filter(|b| b.id == call && b.rect.width == 8.)
             .map(|b| b.rect)
             .collect();
         assert!(

crates/oa-desktop/src/behavior/scenario_lifecycle/union_tests.rs

@@ -1,497 +0,0 @@
-use super::*;
-use crate::behavior::scenario_activation::{Finish, Segment};
-
-fn line(scene: &Scene, id: Id) -> &crate::behavior::Line {
-    scene.lines.iter().find(|line| line.id == id).unwrap()
-}
-fn segments(scene: &Scene, call: Id) -> Vec<&Segment> {
-    scene
-        .activations
-        .iter()
-        .filter(|a| a.call == call)
-        .collect()
-}
-fn assert_visible_lifetime(scene: &Scene) {
-    for a in &scene.activations {
-        assert_eq!(
-            scene
-                .lifecycle
-                .alive_spans(a.receiver, a.scope, a.rect.y, a.rect.y + a.rect.height),
-            vec![Span {
-                start: a.rect.y,
-                end: a.rect.y + a.rect.height
-            }]
-        );
-        if let Finish::Reply(reply) = a.finish {
-            assert_eq!(a.rect.y + a.rect.height, line(scene, reply).points[0].y);
-        }
-    }
-}
-
-#[test]
-fn admitted_delayed_create_nested_calls_replies_delete_share_one_geometry_pipeline() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = Fixture::new(layer);
-        let birth = f.message(f.owner, MessageKind::Create);
-        let c1 = f.message(f.owner, MessageKind::Call);
-        let c2 = f.message(f.owner, MessageKind::Call);
-        let r2 = f.reply(f.owner, c2);
-        let r1 = f.reply(f.owner, c1);
-        let death = f.message(f.owner, MessageKind::Delete);
-        let scene = f.scene();
-        assert_eq!(scene.activations.len(), 2);
-        for (call, reply, column) in [(c1, r1, 0), (c2, r2, 1)] {
-            let a = segments(&scene, call)[0];
-            assert_eq!(
-                (a.receiver, a.scope, a.column, a.finish),
-                (f.receiver, f.owner, column, Finish::Reply(reply))
-            );
-            let received = *line(&scene, call).points.last().unwrap();
-            let sent = line(&scene, reply).points[0];
-            assert_eq!((a.rect.y, a.rect.y + a.rect.height), (received.y, sent.y));
-            assert_eq!(received.x, sent.x);
-            assert!(
-                a.rect.y > scene.rows[&birth].1 && a.rect.y + a.rect.height < scene.rows[&death].1
-            );
-        }
-        assert_visible_lifetime(&scene);
-        assert!(scene.open_calls.is_empty());
-        for event in [birth, death] {
-            assert_eq!(
-                scene.hit(Point::new(scene.lanes[&f.receiver], scene.rows[&event].1)),
-                Some(event)
-            );
-        }
-    }
-}
-
-#[test]
-fn admitted_death_and_incomplete_later_reply_do_not_fabricate_an_answered_execution() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = Fixture::new(layer);
-        let call = f.message(f.owner, MessageKind::Call);
-        let death = f.message(f.owner, MessageKind::Delete);
-        let reply = f.reply(f.owner, call);
-        if let SharedBody::Occurrence {
-            body: OccurrenceBody::Exchange {
-                sender, exchange, ..
-            },
-            ..
-        } = f
-            .project
-            .elements
-            .get_mut(&reply)
-            .unwrap()
-            .shared_mut()
-            .unwrap()
-        {
-            *sender = None;
-            *exchange = None;
-        }
-        let scene = f.scene();
-        let a = segments(&scene, call)[0];
-        assert_eq!(a.finish, Finish::Terminated(death));
-        assert_eq!(a.rect.y + a.rect.height, scene.rows[&death].1);
-        assert!(
-            scene.boxes.iter().any(|b| b.id == reply),
-            "The incomplete reply remains a repairable card"
-        );
-        assert_eq!(scene.open_calls.len(), 1);
-        assert_visible_lifetime(&scene);
-    }
-}
-
-#[test]
-fn admitted_self_lifecycle_and_self_call_keep_distinct_send_receive_rows() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = Fixture::new(layer);
-        let action = f.occurrence(
-            f.owner,
-            "Sender preparation",
-            OccurrenceBody::Action {
-                action: None,
-                lifeline: Some(f.sender),
-            },
-        );
-        let birth = f.message(f.owner, MessageKind::Create);
-        let call = f.message(f.owner, MessageKind::Call);
-        let reply = f.reply(f.owner, call);
-        let death = f.message(f.owner, MessageKind::Delete);
-        for event in [birth, call, reply, death] {
-            if let SharedBody::Occurrence {
-                body:
-                    OccurrenceBody::Exchange {
-                        sender,
-                        receiver,
-                        exchange,
-                        ..
-                    },
-                ..
-            } = f
-                .project
-                .elements
-                .get_mut(&event)
-                .unwrap()
-                .shared_mut()
-                .unwrap()
-            {
-                *sender = Some(f.receiver);
-                *receiver = Some(f.receiver);
-                *exchange = None;
-            }
-        }
-        let scene = f.scene();
-        let preparation = scene.boxes.iter().find(|b| b.id == action).unwrap();
-        assert!(line(&scene, birth).label_at.y > preparation.rect.y + preparation.rect.height);
-        for event in [birth, death] {
-            let message = line(&scene, event);
-            assert_eq!(message.points[0].y, scene.rows[&event].1 - 24.);
-            assert_eq!(message.points.last().unwrap().y, scene.rows[&event].1);
-            assert_eq!(
-                scene.hit(Point::new(scene.lanes[&f.receiver], scene.rows[&event].1)),
-                Some(event)
-            );
-        }
-        let activation = segments(&scene, call)[0];
-        assert_eq!(activation.rect.y, scene.rows[&call].1 + 24.);
-        assert_eq!(
-            activation.rect.y,
-            line(&scene, call).points.last().unwrap().y
-        );
-        assert_eq!(
-            activation.rect.y + activation.rect.height,
-            line(&scene, reply).points[0].y
-        );
-        assert_eq!(activation.finish, Finish::Reply(reply));
-        assert_visible_lifetime(&scene);
-    }
-}
-
-#[test]
-fn admitted_unresolved_operand_keeps_unanswered_cue_without_any_visible_segment() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = Fixture::new(layer);
-        let fragment = f.fragment(f.owner, FragmentOperator::Alternative);
-        let left = f.branch(fragment);
-        f.message(left, MessageKind::Create);
-        let right = f.branch(fragment);
-        let call = f.message(right, MessageKind::Call);
-        let scene = f.scene();
-        assert!(segments(&scene, call).is_empty());
-        assert!(
-            intervals(&scene, f.receiver, right)
-                .iter()
-                .all(|i| i.2 == Life::Unresolved)
-        );
-        assert_eq!(scene.open_calls.len(), 1);
-        assert!(scene.open_calls[0].y > scene.rows[&call].1);
-        assert_eq!(
-            line(&scene, call).points.last().unwrap().x,
-            scene.lanes[&f.receiver]
-        );
-    }
-}
-
-#[test]
-fn admitted_calls_without_sender_polylines_still_have_logical_correlation_metadata() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = Fixture::new(layer);
-        let c1 = f.message(f.owner, MessageKind::Call);
-        let c2 = f.message(f.owner, MessageKind::Call);
-        for call in [c1, c2] {
-            if let SharedBody::Occurrence {
-                body:
-                    OccurrenceBody::Exchange {
-                        sender, exchange, ..
-                    },
-                ..
-            } = f
-                .project
-                .elements
-                .get_mut(&call)
-                .unwrap()
-                .shared_mut()
-                .unwrap()
-            {
-                *sender = None;
-                *exchange = None;
-            }
-        }
-        let outgoing = f.occurrence(
-            f.owner,
-            "Outgoing",
-            OccurrenceBody::Exchange {
-                exchange: None,
-                sender: Some(f.receiver),
-                receiver: Some(f.sender),
-                message_kind: MessageKind::Asynchronous,
-                operation: None,
-                reply_to: None,
-                values: vec![],
-            },
-        );
-        f.reply(f.owner, c2);
-        f.reply(f.owner, c1);
-        let scene = f.scene();
-        assert!(scene.boxes.iter().any(|b| b.id == c1));
-        assert!(scene.boxes.iter().any(|b| b.id == c2));
-        let inner = segments(&scene, c2)[0];
-        let expected = if scene.lanes[&f.sender] > scene.lanes[&f.receiver] {
-            inner.rect.x + inner.rect.width
-        } else {
-            inner.rect.x
-        };
-        assert_eq!(line(&scene, outgoing).points[0].x, expected);
-    }
-}
-
-fn lifetime_rejected(f: &Fixture) {
-    assert!(validate_candidate(&f.project).is_err());
-    assert!(
-        validation::validate(&f.project)
-            .iter()
-            .any(|issue| issue.severity == validation::Severity::Error
-                && issue.code == "lifeline_lifetime")
-    );
-}
-
-#[test]
-fn invalid_prebirth_call_and_postdeath_reply_remain_rejected_with_defensive_scene_clipping() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        for later_birth in [false, true] {
-            let mut f = Fixture::new(layer);
-            let call = f.message(f.owner, MessageKind::Call);
-            let death = f.message(f.owner, MessageKind::Delete);
-            if later_birth {
-                f.message(f.owner, MessageKind::Create);
-            }
-            let reply = f.reply(f.owner, call);
-            lifetime_rejected(&f);
-            // Deliberately bypass Document only for defensive renderer coverage
-            // of rejected data. This is not an admitted editing workflow.
-            let scene = Scene::sequence(&f.project, f.owner, f.owner);
-            assert!(
-                scene
-                    .activations
-                    .iter()
-                    .all(|a| a.rect.y + a.rect.height <= scene.rows[&death].1)
-            );
-            assert!(
-                scene
-                    .activations
-                    .iter()
-                    .all(|a| a.finish != Finish::Reply(reply))
-            );
-            assert_eq!(line(&scene, reply).points[0].x, scene.lanes[&f.receiver]);
-            assert!(!scene.open_calls.is_empty());
-            assert_visible_lifetime(&scene);
-        }
-        let mut f = Fixture::new(layer);
-        let call = f.message(f.owner, MessageKind::Call);
-        let birth = f.message(f.owner, MessageKind::Create);
-        let reply = f.reply(f.owner, call);
-        lifetime_rejected(&f);
-        let scene = Scene::sequence(&f.project, f.owner, f.owner);
-        assert_eq!(segments(&scene, call)[0].rect.y, scene.rows[&birth].1);
-        assert_eq!(segments(&scene, call)[0].finish, Finish::Reply(reply));
-        assert_eq!(
-            line(&scene, call).points.last().unwrap().x,
-            scene.lanes[&f.receiver]
-        );
-        assert_visible_lifetime(&scene);
-    }
-}
-
-#[test]
-fn conditional_death_then_recreate_never_revives_call_but_keeps_open_sibling() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = Fixture::new(layer);
-        f.message(f.owner, MessageKind::Create);
-        let call = f.message(f.owner, MessageKind::Call);
-        let fragment = f.fragment(f.owner, FragmentOperator::Alternative);
-        let left = f.branch(fragment);
-        let death = f.message(left, MessageKind::Delete);
-        let right = f.branch(fragment);
-        let rebirth = f.message(f.owner, MessageKind::Create);
-        let reply = f.reply(f.owner, call);
-        lifetime_rejected(&f);
-        let scene = Scene::sequence(&f.project, f.owner, f.owner);
-        let bars = segments(&scene, call);
-        assert!(
-            bars.iter()
-                .any(|a| a.scope == left && a.finish == Finish::Terminated(death))
-        );
-        assert!(
-            bars.iter().any(|a| a.scope == right
-                && a.rect.height == 26.
-                && a.finish == Finish::Continuation)
-        );
-        assert!(
-            bars.iter()
-                .all(|a| a.rect.y + a.rect.height < scene.rows[&rebirth].1)
-        );
-        assert!(!bars.iter().any(|a| a.finish == Finish::Reply(reply)));
-        assert_eq!(line(&scene, reply).points[0].x, scene.lanes[&f.receiver]);
-        assert_eq!(
-            scene.open_calls.len(),
-            3,
-            "Terminated, open sibling and uncertain parent cues survive"
-        );
-        assert_visible_lifetime(&scene);
-    }
-}
-
-#[test]
-fn clipped_operand_preserves_original_nested_or_crossed_correlation_distinction() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        for nested in [false, true] {
-            let mut f = Fixture::new(layer);
-            f.message(f.owner, MessageKind::Create);
-            let c1 = f.message(f.owner, MessageKind::Call);
-            let c2 = f.message(f.owner, MessageKind::Call);
-            let fragment = f.fragment(f.owner, FragmentOperator::Alternative);
-            let left = f.branch(fragment);
-            f.message(left, MessageKind::Delete);
-            let right = f.branch(fragment);
-            let outgoing = f.occurrence(
-                right,
-                "Outgoing",
-                OccurrenceBody::Exchange {
-                    exchange: None,
-                    sender: Some(f.receiver),
-                    receiver: Some(f.sender),
-                    message_kind: MessageKind::Asynchronous,
-                    operation: None,
-                    reply_to: None,
-                    values: vec![],
-                },
-            );
-            let r1 = f.reply(f.owner, if nested { c2 } else { c1 });
-            let r2 = f.reply(f.owner, if nested { c1 } else { c2 });
-            lifetime_rejected(&f);
-            let scene = Scene::sequence(&f.project, f.owner, f.owner);
-            let send = line(&scene, outgoing).points[0];
-            let expected = if nested {
-                let inner = segments(&scene, c2)
-                    .into_iter()
-                    .find(|a| a.scope == right)
-                    .unwrap();
-                if scene.lanes[&f.sender] > scene.lanes[&f.receiver] {
-                    inner.rect.x + inner.rect.width
-                } else {
-                    inner.rect.x
-                }
-            } else {
-                scene.lanes[&f.receiver]
-            };
-            assert_eq!(send.x, expected);
-            for call in [c1, c2] {
-                assert!(segments(&scene, call).iter().any(|a| a.scope == right
-                    && a.rect.y <= send.y
-                    && send.y < a.rect.y + a.rect.height));
-            }
-            assert!(scene.rows[&r1].1 < scene.rows[&r2].1);
-            assert_visible_lifetime(&scene);
-        }
-    }
-}
-
-fn with_offset<T>(id: Id, offset: f32, f: impl FnOnce() -> T) -> T {
-    struct Restore(BTreeMap<Id, f32>);
-    impl Drop for Restore {
-        fn drop(&mut self) {
-            TEST_ROW_OFFSETS.with(|current| *current.borrow_mut() = std::mem::take(&mut self.0));
-        }
-    }
-    let _restore =
-        Restore(TEST_ROW_OFFSETS.with(|current| current.replace(BTreeMap::from([(id, offset)]))));
-    f()
-}
-fn snapshot(scene: &Scene) -> String {
-    format!(
-        "{:?}",
-        (
-            &scene.lifecycle,
-            &scene.activations,
-            &scene.open_calls,
-            &scene.rows,
-            &scene.sequence_bounds,
-            scene
-                .lines
-                .iter()
-                .map(|l| (l.id, &l.points, &l.label, l.label_at, l.dashed))
-                .collect::<Vec<_>>(),
-            scene
-                .boxes
-                .iter()
-                .map(|b| (b.id, b.rect, &b.title, &b.detail, b.marker))
-                .collect::<Vec<_>>(),
-            scene
-                .slots
-                .iter()
-                .map(|s| (s.slot, s.y, &s.label))
-                .collect::<Vec<_>>(),
-            scene.size,
-        )
-    )
-}
-
-#[test]
-fn test_only_upstream_row_offsets_update_lifetime_segments_and_endpoints_without_authoring() {
-    for layer in [Layer::Oa, Layer::Sa] {
-        let mut f = Fixture::new(layer);
-        let birth = f.message(f.owner, MessageKind::Create);
-        let c1 = f.message(f.owner, MessageKind::Call);
-        let c2 = f.message(f.owner, MessageKind::Call);
-        let r2 = f.reply(f.owner, c2);
-        let r1 = f.reply(f.owner, c1);
-        let death = f.message(f.owner, MessageKind::Delete);
-        let document = f.document();
-        let before = document.snapshot();
-        let baseline = Scene::sequence(document.project(), f.owner, c1);
-        let moved = with_offset(birth, 60., || {
-            Scene::sequence(document.project(), f.owner, c1)
-        });
-        assert_eq!(moved.rows[&birth].1, baseline.rows[&birth].1 + 60.);
-        assert_eq!(moved.rows[&death].1, baseline.rows[&death].1 + 60.);
-        for scene in [&baseline, &moved] {
-            assert_eq!(scene.activations.len(), 2);
-            for (call, reply) in [(c1, r1), (c2, r2)] {
-                assert!(scene.activations.iter().any(|segment| {
-                    segment.call == call && segment.finish == Finish::Reply(reply)
-                }));
-            }
-        }
-        for (a, b) in baseline.activations.iter().zip(&moved.activations) {
-            assert_eq!(
-                (a.call, a.receiver, a.scope, a.column, a.finish),
-                (b.call, b.receiver, b.scope, b.column, b.finish)
-            );
-            assert_eq!(
-                b.rect,
-                Rectangle::new(
-                    a.rect.position() + iced::Vector::new(0., 60.),
-                    a.rect.size()
-                )
-            );
-        }
-        assert_eq!(baseline.activations.len(), moved.activations.len());
-        assert_visible_lifetime(&moved);
-        let reparsed = language::parse(&language::format(document.project())).unwrap();
-        assert_eq!(reparsed, *document.project());
-        assert_eq!(
-            snapshot(&moved),
-            with_offset(birth, 60., || snapshot(&Scene::sequence(
-                &reparsed, f.owner, c1
-            )))
-        );
-        assert_eq!(
-            snapshot(&baseline),
-            snapshot(&Scene::sequence(document.project(), f.owner, c1))
-        );
-        assert_eq!(document.project(), &before.decoded.project);
-        assert_eq!(document.bundle(), &before.bundle);
-        assert_eq!(document.revision(), 0);
-        assert!(!document.dirty() && !document.can_undo() && !document.can_redo());
-    }
-}

crates/oa-desktop/src/behavior/state_canvas.rs

@@ -1712,7 +1712,6 @@ mod tests {
                 layer: Layer::Sa,
                 projection: ProjectionKind::StateMachine { machine },
                 nodes: BTreeMap::new(),
-                layout: None,
                 routes: vec![],
                 view_options: Default::default(),
             },

crates/oa-desktop/src/behavior/state_edit.rs

@@ -292,7 +292,6 @@ pub fn create_view(project: &Project, machine: Id) -> Result<Plan, ModelError> {
             layer: owner.layer(),
             projection: ProjectionKind::StateMachine { machine },
             nodes: BTreeMap::new(),
-            layout: None,
             routes: vec![],
             view_options: Default::default(),
         },

crates/oa-desktop/src/behavior/topology/view.rs

@@ -219,7 +219,6 @@ pub(super) fn view<'a>(app: &'a App, owner: Id, out: Column<'a, Message>) -> Ele
     graph.interaction = Some((context, state.tool, clean));
     let scale = graph.scale;
     let scope = super::super::canvas_workspace::Scope {
-        scenario_view: None,
         document: context.document,
         owner,
         revision: context.revision,

crates/oa-desktop/src/diagram.rs

@@ -1594,32 +1594,11 @@ fn hex(c: Color) -> String {
         (c.b * 255.) as u8
     )
 }
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ExportError {
-    MissingDiagram(Id),
-    UnsupportedScenario(Id),
-}
-impl std::fmt::Display for ExportError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::MissingDiagram(id) => write!(f, "Cannot export: diagram {id} no longer exists."),
-            Self::UnsupportedScenario(_) => {
-                f.write_str("SVG export of saved Scenario views is not available yet.")
-            }
-        }
-    }
-}
-impl std::error::Error for ExportError {}
-
-pub fn export_svg(p: &Project, diagram: Id) -> Result<String, ExportError> {
-    let d = p
-        .diagrams
-        .get(&diagram)
-        .ok_or(ExportError::MissingDiagram(diagram))?;
-    if d.projection.scenario().is_some() {
-        return Err(ExportError::UnsupportedScenario(diagram));
-    }
+pub fn export_svg(p: &Project, diagram: Id) -> String {
     let view = project_view(p, diagram);
+    let Some(d) = p.diagrams.get(&diagram) else {
+        return String::new();
+    };
     let routed = route_diagram(p, d, &view);
     let left = routed.bounds.position.x - 30.;
     let top = routed.bounds.position.y - 30.;
@@ -1758,7 +1737,7 @@ pub fn export_svg(p: &Project, diagram: Id) -> Result<String, ExportError> {
         svg.push_str("</g>");
     }
     svg.push_str("</svg>");
-    Ok(svg)
+    svg
 }
 
 #[cfg(test)]
@@ -1768,83 +1747,6 @@ mod pointer_tests;
 #[cfg(test)]
 mod tests {
     use super::*;
-
-    #[test]
-    fn svg_rejects_saved_scenario_with_absent_or_authored_layout_without_mutation() {
-        let f = crate::behavior::scenario::direct_tests::fixture();
-        let mut p = f.project;
-        let diagram = p.ensure_diagram(Layer::Oa);
-        let d = p.diagrams.get_mut(&diagram).unwrap();
-        d.projection = ProjectionKind::Scenario { scenario: f.owner };
-        d.nodes.clear();
-        d.routes.clear();
-        for layout in [
-            None,
-            Some(DiagramLayout::Scenario(ScenarioLayout {
-                lanes: vec![ScenarioLanePosition {
-                    lifeline: f.sender,
-                    x: 240.,
-                }],
-                messages: vec![ScenarioMessagePosition {
-                    address: OccurrenceEndpoint {
-                        references: vec![],
-                        occurrence: f.call,
-                    },
-                    send_y: 180.,
-                }],
-            })),
-        ] {
-            p.diagrams.get_mut(&diagram).unwrap().layout = layout;
-            let admitted = execute_batch(&p, &[]).expect("valid saved Scenario fixture");
-            assert_eq!(admitted, p);
-            let before = p.clone();
-            assert_eq!(
-                export_svg(&p, diagram),
-                Err(ExportError::UnsupportedScenario(diagram))
-            );
-            assert_eq!(p, before);
-        }
-    }
-
-    #[test]
-    fn svg_rejects_missing_diagram_without_mutation() {
-        let p = Project::demo();
-        let missing = Id::new_v4();
-        let before = p.clone();
-        assert_eq!(
-            export_svg(&p, missing),
-            Err(ExportError::MissingDiagram(missing))
-        );
-        assert_eq!(p, before);
-    }
-
-    #[test]
-    fn svg_accepts_populated_and_empty_architecture_views() {
-        let mut p = Project::demo();
-        let diagram = p
-            .diagrams
-            .values()
-            .find(|d| d.projection.is_architecture() && !d.nodes.is_empty())
-            .unwrap()
-            .id;
-        let before = p.clone();
-        let svg = export_svg(&p, diagram).expect("populated architecture");
-        assert!(svg.starts_with("<svg "));
-        assert!(svg.contains("<text "));
-        assert!(svg.ends_with("</svg>"));
-        assert_eq!(p, before);
-        let d = p.diagrams.get_mut(&diagram).unwrap();
-        d.projection = ProjectionKind::Overview;
-        d.nodes.clear();
-        d.routes.clear();
-        assert_eq!(execute_batch(&p, &[]).expect("valid empty architecture"), p);
-        let before = p.clone();
-        let svg = export_svg(&p, diagram).expect("empty architecture is supported");
-        assert!(svg.contains("viewBox=\"-30 -30 60 60\""));
-        assert!(svg.ends_with("</svg>"));
-        assert_eq!(p, before);
-    }
-
     #[test]
     fn typed_function_glyphs_and_unoriented_standard_connections_have_distinct_svg() {
         let p = Project::demo();
@@ -1878,7 +1780,7 @@ mod tests {
             .find(|d| d.layer == Layer::Sa && d.projection == ProjectionKind::Allocation)
             .unwrap()
             .id;
-        let svg = export_svg(&p, diagram).expect("supported diagram");
+        let svg = export_svg(&p, diagram);
         let title = format!("<title>{}</title>", escape(&boundary.name));
         let edge_path = svg
             .split(&title)
@@ -1952,7 +1854,7 @@ mod tests {
                 p.place(diagram, id, Position { x: 60., y: 60. });
             }
             let p = execute_batch(&p, &[Command::Layout(diagram)]).unwrap();
-            let svg = export_svg(&p, diagram).expect("supported diagram");
+            let svg = export_svg(&p, diagram);
             let group = svg
                 .split("<g>")
                 .find(|g| g.contains(">Grouped work</text>"))
@@ -2042,7 +1944,7 @@ mod tests {
             .unwrap()
             .id;
         let view = project_view(&p, diagram);
-        let svg = export_svg(&p, diagram).expect("supported diagram");
+        let svg = export_svg(&p, diagram);
         for edge in &view.edges {
             assert!(svg.contains(&format!(">{}</text>", escape(&short(p.named(edge.id), 32)))));
         }
@@ -2057,7 +1959,7 @@ mod tests {
         p.place(d, a, Position { x: 0., y: 0. });
         p.place(d, b, Position { x: 400., y: 0. });
         p.relate(RelationKind::CapabilityInclude, "Uses", a, b);
-        let svg = export_svg(&p, d).expect("supported diagram");
+        let svg = export_svg(&p, d);
         assert!(svg.contains("«include»</text>"));
         assert!(svg.contains("stroke-dasharray=\"6 4\""));
     }
@@ -2144,7 +2046,7 @@ mod tests {
             .unwrap();
         assert_eq!(moved.position.x, port.position.x + 100.);
         assert_eq!(moved.position.y, port.position.y + 70.);
-        let svg = export_svg(&p, diagram).expect("supported diagram");
+        let svg = export_svg(&p, diagram);
         for port in &view.ports {
             assert!(svg.contains(&format!("<title>{}</title>", escape(p.named(port.element)))));
         }
@@ -2601,7 +2503,7 @@ mod tests {
         });
         let view = project_view(&p, diagram);
         let geometry = route_diagram(&p, &p.diagrams[&diagram], &view);
-        let svg = export_svg(&p, diagram).expect("supported diagram");
+        let svg = export_svg(&p, diagram);
         let route = &geometry.edges[&edge];
         let path = route
             .points
@@ -2661,7 +2563,7 @@ mod tests {
             let routed = route_diagram(&p, &p.diagrams[&diagram], &projected);
             let ends = routing::association_end_geometry(&p.relations[&edge], &routed.edges[&edge]);
             assert_eq!(ends.len(), 2);
-            let svg = export_svg(&p, diagram).expect("supported diagram");
+            let svg = export_svg(&p, diagram);
             assert!(svg.contains("parent [0..1]</text>"));
             assert!(svg.contains("children [0..*]</text>"));
             assert!(!svg.contains("data-navigation=\"source\""));

crates/oa-desktop/src/diagram/view_options_tests.rs

@@ -27,7 +27,7 @@ fn communication_svg_uses_saved_visibility_labels_and_direction() {
     validate_candidate(&p).unwrap();
     let initial = p.clone();
     let path_key = format!("<path data-edge=\"{edge}\"");
-    let svg = export_svg(&p, diagram).expect("supported diagram");
+    let svg = export_svg(&p, diagram);
     let edge_path = svg
         .split(&path_key)
         .nth(1)
@@ -46,7 +46,7 @@ fn communication_svg_uses_saved_visibility_labels_and_direction() {
         .unwrap()
         .view_options
         .exchange_labels = ExchangeLabels::Items;
-    let items_svg = export_svg(&p, diagram).expect("supported diagram");
+    let items_svg = export_svg(&p, diagram);
     assert!(items_svg.contains("Data &amp; status"));
     let RelationBody::CommunicationMean { oriented, .. } =
         &mut p.relations.get_mut(&edge).unwrap().body
@@ -54,7 +54,7 @@ fn communication_svg_uses_saved_visibility_labels_and_direction() {
         unreachable!()
     };
     *oriented = true;
-    let svg = export_svg(&p, diagram).expect("supported diagram");
+    let svg = export_svg(&p, diagram);
     assert!(
         svg.split(&path_key)
             .nth(1)
@@ -71,11 +71,7 @@ fn communication_svg_uses_saved_visibility_labels_and_direction() {
         .view_options
         .hidden_edges
         .push(edge);
-    assert!(
-        !export_svg(&p, diagram)
-            .expect("supported diagram")
-            .contains(&path_key)
-    );
+    assert!(!export_svg(&p, diagram).contains(&path_key));
     p.diagrams
         .get_mut(&diagram)
         .unwrap()
@@ -87,11 +83,7 @@ fn communication_svg_uses_saved_visibility_labels_and_direction() {
         .unwrap()
         .view_options
         .relation_kinds = RelationKinds::Only(vec![]);
-    assert!(
-        !export_svg(&p, diagram)
-            .expect("supported diagram")
-            .contains(&path_key)
-    );
+    assert!(!export_svg(&p, diagram).contains(&path_key));
     assert_eq!(p.diagrams[&diagram].nodes, placements);
     assert_eq!(language::parse(&language::format(&p)).unwrap(), p);
 }

crates/oa-desktop/src/diagram_usage.rs

@@ -170,13 +170,6 @@ impl Surface {
             {
                 "State views"
             }
-            Self::Saved(id)
-                if p.diagrams
-                    .get(&id)
-                    .is_some_and(|d| d.projection.scenario().is_some()) =>
-            {
-                "Scenarios"
-            }
             Self::Saved(_) => "Architecture",
             Self::Process(_) => "Processes and chains",
             Self::Scenario(_) => "Scenarios",
@@ -283,18 +276,6 @@ pub(crate) fn saved_usages_for(p: &Project, subject: Id, only_diagram: Option<Id
     if only_diagram.is_some_and(|id| !p.diagrams.contains_key(&id)) {
         return Vec::new();
     }
-    if let Some(diagram) = only_diagram
-        .and_then(|id| p.diagrams.get(&id))
-        .filter(|d| d.projection.scenario().is_some())
-    {
-        return crate::behavior::scenario::State::default().representation_usages(
-            p,
-            crate::behavior::scenario_layout::Representation::Saved {
-                diagram: diagram.id,
-            },
-            subject,
-        );
-    }
     let index = ViewIndex::new(p);
     let mut usages = Vec::new();
     for diagram in p
@@ -302,18 +283,6 @@ pub(crate) fn saved_usages_for(p: &Project, subject: Id, only_diagram: Option<Id
         .values()
         .filter(|diagram| only_diagram.is_none_or(|id| diagram.id == id))
     {
-        if diagram.projection.scenario().is_some() {
-            usages.extend(
-                crate::behavior::scenario::State::default().representation_usages(
-                    p,
-                    crate::behavior::scenario_layout::Representation::Saved {
-                        diagram: diagram.id,
-                    },
-                    subject,
-                ),
-            );
-            continue;
-        }
         let view = projection::project_diagram_with_index(p, diagram, &index);
         let surface = Surface::Saved(diagram.id);
         if subject == diagram.id || diagram.projection.state_machine() == Some(subject) {

crates/oa-desktop/src/document.rs

@@ -10,10 +10,6 @@ use std::{fmt, sync::Arc};
 const HISTORY_LIMIT: usize = 100;
 const HISTORY_BYTES: usize = 32 * 1024 * 1024;
 
-#[path = "document_alias_rename.rs"]
-mod alias_rename;
-pub use alias_rename::PreparedAliasRename;
-
 struct HistoryEntry {
     snapshot: Arc<CompiledSourceProject>,
     bytes: usize,
@@ -95,8 +91,6 @@ impl From<Vec<SourceDiagnostic>> for DocumentError {
 }
 
 pub struct Document {
-    // Distinguishes equal accepted snapshots belonging to different documents.
-    alias_owner: Arc<()>,
     current: Arc<CompiledSourceProject>,
     past: Vec<HistoryEntry>,
     future: Vec<HistoryEntry>,
@@ -127,7 +121,6 @@ impl Document {
         let current = Arc::new(source_project::compile_bundle(&bundle, limits)?);
         let current_bytes = estimated_bytes(&current);
         Ok(Self {
-            alias_owner: Arc::new(()),
             current,
             current_bytes,
             past: Vec::new(),
@@ -401,17 +394,8 @@ impl Document {
             return false;
         }
         let bytes = estimated_bytes(&compiled);
-        self.commit_snapshot(Arc::new(compiled), bytes)
-    }
-
-    // Only validated internal paths supply a changed snapshot and its exact
-    // estimate. The ordinary commit wrapper checks bundle inequality; the alias
-    // path checks its private changed flag and exact accepted-snapshot authority.
-    // Alias preparation shares this algorithm while retaining the live save and
-    // history state, and does not clone/recompile the candidate on adoption.
-    fn commit_snapshot(&mut self, compiled: Arc<CompiledSourceProject>, bytes: usize) -> bool {
         self.past.push(HistoryEntry {
-            snapshot: std::mem::replace(&mut self.current, compiled),
+            snapshot: std::mem::replace(&mut self.current, Arc::new(compiled)),
             bytes: std::mem::replace(&mut self.current_bytes, bytes),
         });
         self.future.clear();

crates/oa-desktop/src/document_alias_rename.rs

@@ -1,233 +0,0 @@
-//! Alias-only worker preparation and guarded adoption. Public compiled DTOs do
-//! not authorize adoption; only this module can mint a prepared rename.
-use super::*;
-use std::collections::BTreeMap;
-
-/// A pinned intent minted by its owning Document. Move it to a worker and call
-/// `prepare`; preparation has no access to the live Document or its histories.
-#[derive(Debug)]
-pub struct AliasRenameRequest {
-    owner: Arc<()>,
-    before: Arc<CompiledSourceProject>,
-    revision: u64,
-    limits: ProjectLimits,
-    target: Id,
-    old_alias: String,
-    new_alias: String,
-}
-
-#[derive(Debug)]
-struct PreparedData {
-    request: AliasRenameRequest,
-    after: Arc<CompiledSourceProject>,
-    before_bytes: usize,
-    after_bytes: usize,
-    changed: bool,
-}
-
-/// Immutable, Clone-compatible transport for preview and approval. Neither
-/// mutable candidate access nor deserialization can manufacture this authority.
-#[derive(Debug, Clone)]
-pub struct PreparedAliasRename(Arc<PreparedData>);
-
-impl PreparedAliasRename {
-    pub fn before(&self) -> &CompiledSourceProject {
-        &self.0.request.before
-    }
-
-    pub fn after(&self) -> &CompiledSourceProject {
-        &self.0.after
-    }
-
-    pub fn target(&self) -> Id {
-        self.0.request.target
-    }
-
-    pub fn old_alias(&self) -> &str {
-        &self.0.request.old_alias
-    }
-
-    pub fn new_alias(&self) -> &str {
-        &self.0.request.new_alias
-    }
-
-    pub fn revision(&self) -> u64 {
-        self.0.request.revision
-    }
-
-    pub fn changed(&self) -> bool {
-        self.0.changed
-    }
-}
-
-fn refusal(message: &str) -> DocumentError {
-    ModelError(message.into()).into()
-}
-
-fn check_history_capacity(before_bytes: usize, after_bytes: usize) -> Result<(), DocumentError> {
-    if before_bytes.saturating_add(after_bytes) > HISTORY_BYTES {
-        return Err(refusal(
-            "This rename exceeds the model Undo budget. No rename was applied.",
-        ));
-    }
-    Ok(())
-}
-
-impl Document {
-    pub fn alias_rename_request(
-        &self,
-        target: Id,
-        replacement: String,
-    ) -> Result<AliasRenameRequest, DocumentError> {
-        if self.revision == u64::MAX {
-            return Err(refusal(
-                "The document revision is exhausted. Reopen before renaming.",
-            ));
-        }
-        let old_alias = self
-            .project()
-            .identities()
-            .into_iter()
-            .find_map(|(id, alias)| (id == target).then(|| alias.to_owned()))
-            .ok_or_else(|| refusal("The alias target is no longer present."))?;
-        // A candidate has a nonzero estimate. Avoid expensive preparation when
-        // even the current snapshot leaves no room for its immediate Undo.
-        if old_alias != replacement && self.current_bytes >= HISTORY_BYTES {
-            return Err(refusal(
-                "This rename exceeds the model Undo budget. No rename was applied.",
-            ));
-        }
-        Ok(AliasRenameRequest {
-            owner: self.alias_owner.clone(),
-            before: self.current.clone(),
-            revision: self.revision,
-            limits: self.limits,
-            target,
-            old_alias,
-            new_alias: replacement,
-        })
-    }
-
-    /// App must separately consume its current approval and check workspace,
-    /// invocation and draft freshness. This checks accepted Document authority.
-    pub fn commit_alias_rename(
-        &mut self,
-        prepared: &PreparedAliasRename,
-    ) -> Result<bool, DocumentError> {
-        let data = &prepared.0;
-        let request = &data.request;
-        if self.revision == u64::MAX
-            || self.revision != request.revision
-            || !Arc::ptr_eq(&self.alias_owner, &request.owner)
-            || !Arc::ptr_eq(&self.current, &request.before)
-        {
-            return Err(refusal(
-                "This rename preview is stale. Preview the current alias again.",
-            ));
-        }
-        if !data.changed {
-            return Ok(false);
-        }
-        if self.current_bytes != data.before_bytes {
-            return Err(refusal(
-                "The rename history estimate is stale. Preview again.",
-            ));
-        }
-        check_history_capacity(self.current_bytes, data.after_bytes)?;
-        Ok(self.commit_snapshot(data.after.clone(), data.after_bytes))
-    }
-}
-
-impl AliasRenameRequest {
-    /// Run on the preparation worker. The typed command and source updater are
-    /// the only candidate construction path, followed by alias-only invariants.
-    pub fn prepare(self) -> Result<PreparedAliasRename, DocumentError> {
-        let before_project = &self.before.decoded.project;
-        let candidate = prepare_command(
-            before_project,
-            &Command::SetAlias(self.target, self.new_alias.clone()),
-        )?;
-        let mut expected = before_project.clone();
-        assign_expected_alias(&mut expected, self.target, &self.new_alias)?;
-        let identities: BTreeMap<_, _> = before_project
-            .identities()
-            .into_iter()
-            .map(|(id, _)| (id, id))
-            .collect();
-        if candidate.project != expected || candidate.identity_map != identities {
-            return Err(refusal(
-                "Alias preparation changed unrelated model data or identities.",
-            ));
-        }
-        let after = source_project::update_bundle_with_identity_map(
-            &self.before,
-            &candidate.project,
-            &candidate.identity_map,
-            self.limits,
-        )?;
-        let before = &self.before;
-        if after.decoded.project != expected
-            || before.bundle.entry != after.bundle.entry
-            || !before.bundle.files.keys().eq(after.bundle.files.keys())
-            || before.index.lexical_owners != after.index.lexical_owners
-            || !before
-                .index
-                .declarations
-                .iter()
-                .map(|(id, loc)| (id, &loc.path))
-                .eq(after
-                    .index
-                    .declarations
-                    .iter()
-                    .map(|(id, loc)| (id, &loc.path)))
-        {
-            return Err(refusal(
-                "Alias preparation changed source membership or ownership.",
-            ));
-        }
-        let changed = before.bundle != after.bundle;
-        let before_bytes = estimated_bytes(before);
-        let after_bytes = estimated_bytes(&after);
-        if changed {
-            check_history_capacity(before_bytes, after_bytes)?;
-        }
-        Ok(PreparedAliasRename(Arc::new(PreparedData {
-            request: self,
-            after: Arc::new(after),
-            before_bytes,
-            after_bytes,
-            changed,
-        })))
-    }
-}
-
-// Independent full-model expectation: SetAlias may change exactly one header
-// field, across every supported identity family. Do not reuse command execution
-// to derive the expected result, which would hide collateral command changes.
-fn assign_expected_alias(project: &mut Project, id: Id, alias: &str) -> Result<(), DocumentError> {
-    if project.id == id {
-        project.alias = alias.to_owned();
-    } else if let Some(record) = project.elements.get_mut(&id) {
-        record.alias = alias.to_owned();
-    } else if let Some(record) = project.relations.get_mut(&id) {
-        record.alias = alias.to_owned();
-    } else if let Some(record) = project.diagrams.get_mut(&id) {
-        record.alias = alias.to_owned();
-    } else if let Some(record) = project.artifact_links.get_mut(&id) {
-        record.alias = alias.to_owned();
-    } else if let Some(record) = project.traces.get_mut(&id) {
-        record.alias = alias.to_owned();
-    } else {
-        project
-            .diagrams
-            .values_mut()
-            .find_map(|diagram| diagram.nodes.get_mut(&id))
-            .ok_or_else(|| refusal("The alias target is no longer present."))?
-            .alias = alias.to_owned();
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-#[path = "document_alias_rename_tests.rs"]
-mod tests;

crates/oa-desktop/src/document_alias_rename_tests.rs

@@ -1,459 +0,0 @@
-use super::*;
-
-fn fixture() -> Document {
-    let bundle = SourceBundle {
-        entry: "project.arcadia".into(),
-        files: BTreeMap::from([
-            ("project.arcadia".into(), r#"arcadia 7;
-project mission "Испытание" id "10000000-0000-4000-8000-000000000001" {
- include "work.arcadia"; include "views.arcadia";
-}
-"#.replace('\n', "\r\n")),
-            ("work.arcadia".into(), r#"// @assess and assess are explanatory prose.
-oa_activity assess "Оценка\u0020ущерба" id "10000000-0000-4000-8000-000000000002" { description "Keep @assess and assess"; }
-oa_activity assist "Оценка\u0020ущерба" id "10000000-0000-4000-8000-000000000003" { parent @ // owner evidence
- assess; }
-sa_function service "Service" id "10000000-0000-4000-8000-000000000004" {}
-interaction transfer "Transfer" id "10000000-0000-4000-8000-000000000005" { source @assess; target @assist; }
-trace review "Reviewed correspondence" id "10000000-0000-4000-8000-000000000006" { oa @assess; sa @service; kind Refinement; baseline { oa { name "Old assess"; description "@assess"; }; sa { name "Old service"; description "Kept"; }; }; }
-artifact evidence "Evidence" id "10000000-0000-4000-8000-000000000007" { owner @review; uri "docs/assess.md"; }
-"#.replace('\n', "\r\n")),
-            ("views.arcadia".into(), r#"diagram overview "Overview" id "10000000-0000-4000-8000-000000000008" { layer Oa; routes [{ edge @ // routed identity
- transfer; waypoints [{ x 4.20e2; y -16; }]; }]; }
-node placement id "10000000-0000-4000-8000-000000000009" { diagram @overview; element @assess; position { x -0.0; y 12.375; }; size { width 260; height 94; }; }
-"#.replace('\n', "\r\n")),
-        ]),
-    };
-    let document = Document::from_bundle(bundle.clone(), ProjectLimits::default()).unwrap();
-    assert_eq!(
-        document.bundle(),
-        &bundle,
-        "fixture must need no migration or ID insertion"
-    );
-    document
-}
-
-fn id(number: u8) -> Id {
-    Id::parse_str(&format!("10000000-0000-4000-8000-{number:012}")).unwrap()
-}
-
-fn prepare(document: &Document, target: Id, replacement: &str) -> PreparedAliasRename {
-    document
-        .alias_rename_request(target, replacement.into())
-        .unwrap()
-        .prepare()
-        .unwrap()
-}
-
-// Capture every live Document state relevant to refusal/no-op. Arc identity also
-// catches replacing an equal snapshot or saved marker behind the user's back.
-struct Unchanged {
-    current: Arc<CompiledSourceProject>,
-    saved: Option<Arc<SourceBundle>>,
-    past: Vec<(Arc<CompiledSourceProject>, usize)>,
-    future: Vec<(Arc<CompiledSourceProject>, usize)>,
-    revision: u64,
-    current_bytes: usize,
-    recovered: bool,
-}
-
-impl Unchanged {
-    fn capture(document: &Document) -> Self {
-        Self {
-            current: document.snapshot(),
-            saved: document.saved.clone(),
-            past: document
-                .past
-                .iter()
-                .map(|h| (h.snapshot.clone(), h.bytes))
-                .collect(),
-            future: document
-                .future
-                .iter()
-                .map(|h| (h.snapshot.clone(), h.bytes))
-                .collect(),
-            revision: document.revision,
-            current_bytes: document.current_bytes,
-            recovered: document.recovered_unsaved,
-        }
-    }
-
-    fn assert(&self, document: &Document) {
-        assert!(Arc::ptr_eq(&self.current, &document.current));
-        match (&self.saved, &document.saved) {
-            (Some(before), Some(after)) => assert!(Arc::ptr_eq(before, after)),
-            (None, None) => {}
-            _ => panic!("saved baseline changed"),
-        }
-        for (before, after) in [
-            (&self.past, &document.past),
-            (&self.future, &document.future),
-        ] {
-            assert_eq!(before.len(), after.len());
-            for ((snapshot, bytes), entry) in before.iter().zip(after) {
-                assert!(Arc::ptr_eq(snapshot, &entry.snapshot));
-                assert_eq!(*bytes, entry.bytes);
-            }
-        }
-        assert_eq!(self.revision, document.revision);
-        assert_eq!(self.current_bytes, document.current_bytes);
-        assert_eq!(self.recovered, document.recovered_unsaved);
-    }
-}
-
-#[test]
-fn each_identity_family_changes_only_authored_alias_roles_and_one_history_entry() {
-    // Literal role-specific replacements are independent of the updater/tokenizer.
-    // They deliberately exclude prose, historical review text and URI spelling.
-    type AliasCase<'a> = (u8, &'a str, &'a str, &'a [(&'a str, &'a str)]);
-    let cases: &[AliasCase<'_>] = &[
-        (
-            1,
-            "mission",
-            "renamed",
-            &[("project mission ", "project renamed ")],
-        ),
-        (
-            2,
-            "assess",
-            "renamed",
-            &[
-                ("oa_activity assess ", "oa_activity renamed "),
-                ("\r\n assess;", "\r\n renamed;"),
-                ("@assess;", "@renamed;"),
-            ],
-        ),
-        (
-            5,
-            "transfer",
-            "renamed",
-            &[
-                ("interaction transfer ", "interaction renamed "),
-                ("\r\n transfer;", "\r\n renamed;"),
-            ],
-        ),
-        (
-            6,
-            "review",
-            "renamed",
-            &[
-                ("trace review ", "trace renamed "),
-                ("owner @review;", "owner @renamed;"),
-            ],
-        ),
-        (
-            7,
-            "evidence",
-            "renamed",
-            &[("artifact evidence ", "artifact renamed ")],
-        ),
-        (
-            8,
-            "overview",
-            "renamed",
-            &[
-                ("diagram overview ", "diagram renamed "),
-                ("diagram @overview;", "diagram @renamed;"),
-            ],
-        ),
-        (
-            9,
-            "placement",
-            "renamed",
-            &[("node placement ", "node renamed ")],
-        ),
-    ];
-    for &(number, old, new, replacements) in cases {
-        let mut document = fixture();
-        let original = document.snapshot();
-        let mut expected_model = document.project().clone();
-        // Explicit per-family oracle, separate from production expectation helper.
-        match number {
-            1 => expected_model.alias = new.into(),
-            2 => expected_model.elements.get_mut(&id(2)).unwrap().alias = new.into(),
-            5 => expected_model.relations.get_mut(&id(5)).unwrap().alias = new.into(),
-            6 => expected_model.traces.get_mut(&id(6)).unwrap().alias = new.into(),
-            7 => expected_model.artifact_links.get_mut(&id(7)).unwrap().alias = new.into(),
-            8 => expected_model.diagrams.get_mut(&id(8)).unwrap().alias = new.into(),
-            9 => {
-                expected_model
-                    .diagrams
-                    .get_mut(&id(8))
-                    .unwrap()
-                    .nodes
-                    .get_mut(&id(9))
-                    .unwrap()
-                    .alias = new.into()
-            }
-            _ => unreachable!(),
-        }
-        let mut expected_bundle = document.bundle().clone();
-        for source in expected_bundle.files.values_mut() {
-            for &(before, after) in replacements {
-                *source = source.replace(before, after);
-            }
-        }
-        let state = Unchanged::capture(&document);
-        let prepared = prepare(&document, id(number), new);
-        state.assert(&document);
-        assert!(prepared.changed());
-        assert_eq!(prepared.old_alias(), old);
-        assert_eq!(prepared.new_alias(), new);
-        assert_eq!(prepared.target(), id(number));
-        assert_eq!(prepared.revision(), 0);
-        assert_eq!(prepared.before().bundle, original.bundle);
-        assert_eq!(prepared.after().bundle, expected_bundle);
-        assert_eq!(prepared.after().decoded.project, expected_model);
-        assert!(document.commit_alias_rename(&prepared).unwrap());
-        assert!(
-            Arc::ptr_eq(&document.current, &prepared.0.after),
-            "adopt the exact prepared Arc"
-        );
-        assert_eq!(document.past.len(), 1);
-        assert!(document.dirty());
-        let after = Unchanged::capture(&document);
-        assert!(document.commit_alias_rename(&prepared.clone()).is_err());
-        after.assert(&document);
-        assert!(document.undo());
-        assert!(Arc::ptr_eq(&document.current, &original));
-        assert!(!document.dirty());
-        assert!(!document.can_undo());
-        assert!(document.redo());
-        assert_eq!(document.bundle(), &expected_bundle);
-        assert_eq!(document.project(), &expected_model);
-        document.mark_saved(document.snapshot());
-        let reopened =
-            Document::from_bundle(document.bundle().clone(), ProjectLimits::default()).unwrap();
-        assert_eq!(reopened.project(), &expected_model);
-        assert_eq!(reopened.bundle(), &expected_bundle);
-        assert!(!reopened.dirty());
-    }
-}
-
-#[test]
-fn highlighted_keyword_alias_is_valid_without_normalizing_input() {
-    assert!(matches!(
-        language::tokenize("oa_activity")[0].class,
-        language::TokenClass::Keyword
-    ));
-    let mut document = fixture();
-    let prepared = prepare(&document, id(2), "oa_activity");
-    document.commit_alias_rename(&prepared).unwrap();
-    assert_eq!(document.project().elements[&id(2)].alias, "oa_activity");
-    assert_eq!(document.project().elements[&id(2)].name, "Оценка ущерба");
-}
-
-#[test]
-fn invalid_and_identical_aliases_preserve_live_state_and_redo() {
-    let mut document = fixture();
-    let first = prepare(&document, id(2), "changed");
-    document.commit_alias_rename(&first).unwrap();
-    assert!(document.undo());
-    document.invalidate_saved_baseline();
-    document.mark_recovered();
-    let state = Unchanged::capture(&document);
-    for replacement in ["", "has space", "project", "assist", " assess", "assess "] {
-        assert!(
-            document
-                .alias_rename_request(id(2), replacement.into())
-                .unwrap()
-                .prepare()
-                .is_err()
-        );
-        state.assert(&document);
-    }
-    assert!(
-        document
-            .alias_rename_request(Id::nil(), "new".into())
-            .is_err()
-    );
-    let no_op = prepare(&document, id(2), "assess");
-    assert!(!no_op.changed());
-    assert!(!document.commit_alias_rename(&no_op).unwrap());
-    state.assert(&document);
-    assert!(document.redo());
-    assert_eq!(document.project().elements[&id(2)].alias, "changed");
-}
-
-#[test]
-fn equal_bytes_undo_replay_cross_document_and_exhausted_revision_refuse() {
-    let mut document = fixture();
-    let old = prepare(&document, id(2), "renamed");
-    let mut second = fixture();
-    let second_state = Unchanged::capture(&second);
-    assert!(second.commit_alias_rename(&old).is_err());
-    second_state.assert(&second);
-    // Even an identical shared accepted Arc cannot confer this Document's owner.
-    second.current = document.current.clone();
-    let second_state = Unchanged::capture(&second);
-    assert!(second.commit_alias_rename(&old).is_err());
-    second_state.assert(&second);
-    document
-        .execute(Command::Rename(id(2), "Later name".into()))
-        .unwrap();
-    let edited = Unchanged::capture(&document);
-    assert!(document.commit_alias_rename(&old).is_err());
-    edited.assert(&document);
-    assert!(document.undo());
-    assert!(Arc::ptr_eq(&document.current, &old.0.request.before));
-    let undone = Unchanged::capture(&document);
-    assert!(document.commit_alias_rename(&old).is_err());
-    undone.assert(&document);
-    document.revision = u64::MAX - 1;
-    let last = prepare(&document, id(2), "renamed");
-    document
-        .execute(Command::Rename(id(2), "Exhaust revision".into()))
-        .unwrap();
-    document.undo();
-    assert!(Arc::ptr_eq(&document.current, &last.0.request.before));
-    let exhausted = Unchanged::capture(&document);
-    assert!(document.commit_alias_rename(&last).is_err());
-    assert!(
-        document
-            .alias_rename_request(id(2), "renamed".into())
-            .is_err()
-    );
-    assert!(
-        document
-            .alias_rename_request(id(2), "assess".into())
-            .is_err()
-    );
-    exhausted.assert(&document);
-}
-
-#[test]
-fn preview_retains_latest_saved_baseline_and_recovery_state() {
-    for baseline in ["saved_before", "unknown", "raw_repair", "recovered"] {
-        let mut document = fixture();
-        let prepared = prepare(&document, id(2), "renamed");
-        let original = document.snapshot();
-        match baseline {
-            "saved_before" => document.mark_saved(original.clone()),
-            "unknown" => document.invalidate_saved_baseline(),
-            "raw_repair" => {
-                let mut raw = document.bundle().clone();
-                raw.files
-                    .insert("project.arcadia".into(), "invalid repair source".into());
-                document.bind_repair_baseline(raw);
-            }
-            "recovered" => document.mark_recovered(),
-            _ => unreachable!(),
-        }
-        let saved = document.saved.clone();
-        let recovered = document.recovered_unsaved;
-        assert!(document.commit_alias_rename(&prepared).unwrap());
-        assert_eq!(document.saved, saved);
-        assert_eq!(document.recovered_unsaved, recovered);
-        assert!(document.dirty());
-        assert!(document.undo());
-        assert_eq!(document.saved, saved);
-        assert_eq!(document.recovered_unsaved, recovered);
-        assert_eq!(document.dirty(), baseline != "saved_before");
-    }
-    // A completed save after Preview remains authoritative, including when it
-    // clears recovery; a worker must not restore its earlier state on Confirm.
-    let mut document = fixture();
-    document.mark_recovered();
-    document.invalidate_saved_baseline();
-    let prepared = prepare(&document, id(2), "renamed");
-    document.mark_saved(document.snapshot());
-    document.commit_alias_rename(&prepared).unwrap();
-    assert!(!document.recovered_unsaved);
-    document.undo();
-    assert!(!document.dirty());
-    // Undo from saved C to B, then a new B->C rename can correctly finish clean.
-    document.redo();
-    document.mark_saved(document.snapshot());
-    document.undo();
-    let return_to_saved = prepare(&document, id(2), "renamed");
-    document.commit_alias_rename(&return_to_saved).unwrap();
-    assert!(!document.dirty());
-    assert!(!document.can_redo());
-}
-
-#[test]
-fn mutable_public_preview_copies_cannot_change_prepared_authority() {
-    let mut document = fixture();
-    let prepared = prepare(&document, id(2), "renamed");
-    let exact = prepared.after().clone();
-    let mut counterfeit = prepared.after().clone();
-    counterfeit.decoded.project.name = "Injected unrelated edit".into();
-    counterfeit.index.declarations.clear();
-    let unchanged = Unchanged::capture(&document);
-    assert!(document.apply_compiled(counterfeit).is_err());
-    unchanged.assert(&document);
-    let mut unrelated = exact.decoded.project.clone();
-    unrelated.name = "A self-consistent unrelated candidate".into();
-    let forged_dto = source_project::compile_bundle(
-        &source_project::format_bundle(&unrelated),
-        ProjectLimits::default(),
-    )
-    .unwrap();
-    assert_ne!(forged_dto.decoded.project, prepared.after().decoded.project);
-    // No API converts either DTO to PreparedAliasRename. Mutating owned copies
-    // leaves the opaque capability and its exact adopted model/source intact.
-    document.commit_alias_rename(&prepared).unwrap();
-    assert_eq!(document.project(), &exact.decoded.project);
-    assert_eq!(document.bundle(), &exact.bundle);
-}
-
-#[test]
-fn exact_history_capacity_admits_immediate_undo_and_rejects_larger_candidate() {
-    let mut document = fixture();
-    let mut bundle = document.bundle().clone();
-    let padding = HISTORY_BYTES / 2 - document.current_bytes;
-    bundle
-        .files
-        .get_mut("views.arcadia")
-        .unwrap()
-        .push_str(&format!("//{}\r\n", "x".repeat(padding - 4)));
-    document.apply_bundle(bundle).unwrap();
-    assert_eq!(document.current_bytes, HISTORY_BYTES / 2);
-    // A same-length alias retains the exact estimate; older history is evictable.
-    let boundary = prepare(&document, id(2), "rating");
-    assert_eq!(
-        boundary.0.before_bytes + boundary.0.after_bytes,
-        HISTORY_BYTES
-    );
-    let unchanged = Unchanged::capture(&document);
-    assert!(
-        document
-            .alias_rename_request(id(2), "longer_alias".into())
-            .unwrap()
-            .prepare()
-            .is_err()
-    );
-    unchanged.assert(&document);
-    document.commit_alias_rename(&boundary).unwrap();
-    assert_eq!(document.past.len(), 1);
-    assert!(document.undo());
-    assert!(Arc::ptr_eq(&document.current, &boundary.0.request.before));
-    assert!(!document.can_undo());
-    assert!(document.redo());
-    assert!(Arc::ptr_eq(&document.current, &boundary.0.after));
-    assert!(check_history_capacity(usize::MAX, 1).is_err());
-    assert!(check_history_capacity(HISTORY_BYTES, 1).is_err());
-}
-
-#[test]
-fn mint_and_commit_refuse_exhausted_or_inconsistent_live_history_estimate() {
-    let mut document = fixture();
-    let prepared = prepare(&document, id(2), "renamed");
-    // Inject cache corruption to falsify the commit-side check independently of
-    // the preparation admission. Normal edits also change revision and Arc.
-    document.current_bytes = HISTORY_BYTES;
-    let unchanged = Unchanged::capture(&document);
-    assert!(
-        document
-            .alias_rename_request(id(2), "renamed".into())
-            .is_err()
-    );
-    assert!(document.commit_alias_rename(&prepared).is_err());
-    // No-op intent needs no Undo reservation even at the admission boundary.
-    assert!(
-        document
-            .alias_rename_request(id(2), "assess".into())
-            .is_ok()
-    );
-    unchanged.assert(&document);
-}

crates/oa-desktop/src/forms.rs

@@ -1535,8 +1535,7 @@ fn group_label(path: &str) -> Option<&'static str> {
 }
 
 fn placement_allowed(project: &Project, diagram: &Diagram, element: &Element, current: Id) -> bool {
-    diagram.projection.scenario().is_none()
-        && (diagram.projection == ProjectionKind::Traceability || diagram.layer == element.layer())
+    (diagram.projection == ProjectionKind::Traceability || diagram.layer == element.layer())
         && diagram
             .projection
             .state_machine()
@@ -2684,7 +2683,6 @@ mod tests {
                 description: String::new(),
                 layer: Layer::Oa,
                 projection: ProjectionKind::Overview,
-                layout: None,
                 routes: Vec::new(),
                 view_options: Default::default(),
                 nodes: BTreeMap::new(),

crates/oa-desktop/src/guide.rs

@@ -805,7 +805,7 @@ fn article(topic: Topic) -> Article {
             const {
                 Article {
                     summary: "The text editor and graphical forms edit the same model. Source projects preserve file organization and comments for human review, automation and version control.",
-                    keywords: "text textual source language syntax highlighting lint parser git aliases uuid identity rename F2 preview diff merge restructuredtext spec canonical parity definition references lexical navigation F12 back",
+                    keywords: "text textual source language syntax highlighting lint parser git aliases uuid identity rename diff merge restructuredtext spec canonical parity definition references lexical navigation F12 back",
                     sections: &[
                         walkthrough(
                             "Edit and review source",
@@ -834,15 +834,6 @@ fn article(topic: Topic) -> Article {
                             "Names, aliases and IDs serve different purposes",
                             "The displayed name is engineering prose. A stable @alias is the readable source reference and need not change when the name changes. UUID identity distinguishes the persistent record. Preserve IDs when revising the same engineering object; changing identity is a deliberate operation that affects references.",
                         ),
-                        walkthrough(
-                            "Rename a source alias",
-                            &[
-                                "Place the caret on a declaration alias or live @reference, then choose Rename alias or press F2 in the source editor. First finish or revert pending source, property and behavior drafts; close or reattach any extra loaded detached files. Accepted edits do not need to be saved first.",
-                                "Edit Source alias and choose Preview (Enter also previews). Pasting line breaks, tabs or other control characters is rejected without changing the field; choose Preview again after correcting the paste. Review the changed files, hunks and lines; long lines have additional segments. The engineering name and UUID stay unchanged. Comments and quoted prose keep their original spelling. This preview covers the rename; a later Save can include earlier accepted edits too.",
-                                "Choose Rename alias to accept the complete preview, or Cancel/Escape to leave everything unchanged. An invalid, unchanged, stale or oversized preview cannot be confirmed. After editing the replacement, choose Preview again. If the source context changes, close the form and invoke Rename again on the current alias.",
-                                "Use Undo rename immediately, or the model Undo/Redo controls, to restore the complete source/model snapshot. Ctrl+Z in Text still undoes source drafting. Save all and reopen use the normal project workflow; an unconfirmed preview is not saved.",
-                            ],
-                        ),
                         example(
                             "Readable references",
                             "For example, renaming an activity does not require renaming @assess_incident. A related record can still refer to that alias.",

crates/oa-desktop/src/main.rs

@@ -25,7 +25,6 @@ mod recovery;
 mod route_edit;
 mod semantic_review;
 mod source_navigation;
-mod source_rename;
 mod source_tree;
 mod source_workspace;
 mod style;

crates/oa-desktop/src/port_workflow.rs

@@ -813,7 +813,6 @@ mod tests {
                     description: String::new(),
                     layer: Layer::Sa,
                     projection: ProjectionKind::Overview,
-                    layout: None,
                     routes: Vec::new(),
                     view_options: Default::default(),
                     nodes: Default::default(),

crates/oa-desktop/src/source_navigation/query.rs

@@ -220,22 +220,12 @@ pub struct ReferenceRow {
     pub evidence: Evidence,
 }
 
-/// Exact lexical occurrence that answered the query, independent of row limits.
-/// The optional @ marker is separate from the alias; comments between them do
-/// not become part of either hit.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct Origin {
-    pub span: Span,
-    pub marker: Option<Span>,
-}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Results {
     pub stamp: QueryStamp,
     pub action: Action,
     pub origin_path: String,
     pub origin_offset: usize,
-    pub origin: Option<Origin>,
     pub alias: Option<String>,
     pub scope: Scope,
     pub disposition: Disposition,
@@ -833,28 +823,10 @@ impl Snapshot {
             .ok_or(QueryError::MissingFile)?;
         let index = self.index()?;
         let hit = index.hit(file, query.byte_offset)?;
-        let (alias, origin) = match hit {
-            Some(symbols::Hit::Definition(handle)) => {
-                let definition = index.definition(handle)?;
-                (
-                    Some(definition.alias),
-                    Some(Origin {
-                        span: definition.alias_location.span,
-                        marker: None,
-                    }),
-                )
-            }
-            Some(symbols::Hit::Reference(handle)) => {
-                let reference = index.reference(handle)?;
-                (
-                    Some(reference.alias),
-                    Some(Origin {
-                        span: reference.alias_location.span,
-                        marker: Some(reference.at.span),
-                    }),
-                )
-            }
-            None => (None, None),
+        let alias = match hit {
+            Some(symbols::Hit::Definition(handle)) => Some(index.definition(handle)?.alias),
+            Some(symbols::Hit::Reference(handle)) => Some(index.reference(handle)?.alias),
+            None => None,
         };
         let mut budget = RowBudget {
             rows: self.limits.result_rows,
@@ -868,7 +840,6 @@ impl Snapshot {
             action: query.action,
             origin_path: query.path.to_owned(),
             origin_offset: query.byte_offset,
-            origin,
             alias: alias.map(str::to_owned),
             scope: self.scope.clone(),
             disposition: Disposition::NoSymbol,

crates/oa-desktop/src/source_navigation/query_tests.rs

@@ -107,65 +107,6 @@ fn reference_offset(fixture: &Fixture) -> usize {
     fixture.text("links.arcadia").find("source @").unwrap() + "source ".len()
 }
 
-#[test]
-fn origin_keeps_exact_hit_when_display_rows_are_omitted() {
-    let mut fixture = Fixture::standard();
-    fixture
-        .text_mut("links.arcadia")
-        .push_str("// no @pump hit\r\n@pump @pump @ // intervening @pump\r\n pump");
-    let source = fixture.text("links.arcadia");
-    let start = source.rfind("pump").unwrap();
-    let marker = source.rfind("@ // intervening").unwrap();
-    let limits = Limits {
-        result_rows: 0,
-        ..Limits::default()
-    };
-    let snapshot = fixture.snapshot(None, false, limits);
-    let expected = Some(Origin {
-        span: Span {
-            start,
-            end: start + 4,
-        },
-        marker: Some(Span {
-            start: marker,
-            end: marker + 1,
-        }),
-    });
-    for offset in [start, start + 3, marker] {
-        let result = query(&snapshot, "links.arcadia", offset, Action::References);
-        assert_eq!(result.origin, expected);
-        assert!(result.references.is_empty());
-        assert!(result.omitted_references > 2);
-    }
-    let comment = source.rfind("intervening @pump").unwrap() + "intervening @".len();
-    assert_eq!(
-        query(&snapshot, "links.arcadia", comment, Action::Definition).origin,
-        None
-    );
-    assert_eq!(
-        query(&snapshot, "links.arcadia", start + 4, Action::Definition).origin,
-        None
-    );
-    let definition_source = fixture.text("模块/活動.arcadia");
-    let definition_start = definition_source.find("pump").unwrap();
-    assert_eq!(
-        query(
-            &snapshot,
-            "模块/活動.arcadia",
-            definition_start,
-            Action::Definition
-        )
-        .origin,
-        Some(Origin {
-            span: Span {
-                start: definition_start,
-                end: definition_start + 4
-            },
-            marker: None
-        })
-    );
-}
-
 #[test]
 fn exact_multifile_unicode_crlf_definition_and_repeated_lexical_references() {
     let fixture = Fixture::standard();

crates/oa-desktop/src/source_rename.rs

@@ -1,3 +0,0 @@
-//! Pure preview and exact origin mapping for the guarded alias-rename controller.
-pub mod origin;
-pub mod preview;

crates/oa-desktop/src/source_rename/origin.rs

@@ -1,278 +0,0 @@
-//! Map a role-proven alias occurrence through the exact prepared source change.
-//! This is cursor restoration, not target resolution or commit authority.
-use oa_core::language::{self, Outline, OutlineLimits, Span, TokenClass};
-use std::fmt;
-
-const LIMITS: OutlineLimits = OutlineLimits {
-    max_source_bytes: 64 * 1024 * 1024,
-    max_tokens: 1_000_000,
-    max_declarations: 250_000,
-};
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum OriginError {
-    Budget,
-    InvalidSource,
-    MissingOrigin,
-    ChangedStructure,
-}
-
-impl fmt::Display for OriginError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(match self {
-            Self::Budget => "The alias cursor preview exceeds its source scan budget. No rename was applied.",
-            Self::InvalidSource => "The alias cursor could not be verified in this source. No rename was applied.",
-            Self::MissingOrigin => "The original alias occurrence no longer matches. Preview again; no rename was applied.",
-            Self::ChangedStructure => "The preview changed source outside the expected alias tokens. No rename was applied.",
-        })
-    }
-}
-
-impl std::error::Error for OriginError {}
-
-fn word(class: TokenClass) -> bool {
-    matches!(class, TokenClass::Identifier | TokenClass::Keyword)
-}
-
-/// The controller passes the exact alias span returned by the admitted symbol
-/// hit. `marker` is Some only for a reference (its separate @ span), including
-/// invocation with the caret on @. A declaration passes None.
-pub fn map(
-    before: &str,
-    after: &str,
-    old_alias: &str,
-    new_alias: &str,
-    origin: Span,
-    marker: Option<Span>,
-) -> Result<Span, OriginError> {
-    let old = language::outline(before, LIMITS).map_err(|_| OriginError::Budget)?;
-    let new = language::outline(after, LIMITS).map_err(|_| OriginError::Budget)?;
-    if old.has_lexical_errors || new.has_lexical_errors {
-        return Err(OriginError::InvalidSource);
-    }
-    if old.tokens.len() != new.tokens.len() {
-        return Err(OriginError::ChangedStructure);
-    }
-    let roles_before = roles(&old);
-    let roles_after = roles(&new);
-    let mut mapped = None;
-    for (index, (a, b)) in old.tokens.iter().zip(&new.tokens).enumerate() {
-        let left = &before[a.span.start..a.span.end];
-        let right = &after[b.span.start..b.span.end];
-        let alias_pair = word(a.class)
-            && word(b.class)
-            && left == old_alias
-            && right == new_alias
-            && roles_before[index].is_some()
-            && roles_after[index].is_some()
-            && roles_before[index].map(|role| role.is_some())
-                == roles_after[index].map(|role| role.is_some());
-        if a.span == origin {
-            if !alias_pair || roles_before[index] != Some(marker) {
-                return Err(OriginError::MissingOrigin);
-            }
-            mapped = Some(b.span);
-        }
-        if !alias_pair && (left != right || a.class != b.class) {
-            return Err(OriginError::ChangedStructure);
-        }
-    }
-    mapped.ok_or(OriginError::MissingOrigin)
-}
-
-/// Outer None is not an alias role; Some(None) is a declaration alias;
-/// Some(Some(span)) is a live @ reference with its exact separate marker.
-/// Scan sorted declaration spans and tokens together, without repeated searches.
-fn roles(outline: &Outline<'_>) -> Vec<Option<Option<Span>>> {
-    let mut result = vec![None; outline.tokens.len()];
-    let mut declarations = outline.declarations.iter().peekable();
-    let mut significant = None;
-    for (index, token) in outline.tokens.iter().enumerate() {
-        while declarations
-            .peek()
-            .is_some_and(|d| d.alias_span.start < token.span.start)
-        {
-            declarations.next();
-        }
-        if word(token.class) {
-            if declarations
-                .peek()
-                .is_some_and(|d| d.alias_span == token.span)
-            {
-                result[index] = Some(None);
-            } else if let Some(previous) = significant {
-                let span: Span = previous;
-                if &outline.source[span.start..span.end] == "@" {
-                    result[index] = Some(Some(span));
-                }
-            }
-        }
-        if !matches!(token.class, TokenClass::Whitespace | TokenClass::Comment) {
-            significant = Some(token.span);
-        }
-    }
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn occurrence(source: &str, needle: &str, which: usize) -> Span {
-        let start = source.match_indices(needle).nth(which).unwrap().0;
-        Span {
-            start,
-            end: start + needle.len(),
-        }
-    }
-
-    #[test]
-    fn maps_last_repeated_reference_with_unicode_crlf_and_comment_separator() {
-        let before =
-            "oa_activity a \"救援\" {}\r\n// @a is prose\r\nsource @a; target @ // a\r\n a;\r\n";
-        let after = "oa_activity renamed \"救援\" {}\r\n// @a is prose\r\nsource @renamed; target @ // a\r\n renamed;\r\n";
-        let start = before.rfind(" a;").unwrap() + 1;
-        let marker = before.rfind("@ //").unwrap();
-        let mapped = map(
-            before,
-            after,
-            "a",
-            "renamed",
-            Span {
-                start,
-                end: start + 1,
-            },
-            Some(Span {
-                start: marker,
-                end: marker + 1,
-            }),
-        )
-        .unwrap();
-        assert_eq!(&after[mapped.start..mapped.end], "renamed");
-        assert_eq!(mapped.start, after.rfind(" renamed;").unwrap() + 1);
-        assert_eq!(
-            before[..start].bytes().filter(|b| *b == b'\n').count(),
-            after[..mapped.start]
-                .bytes()
-                .filter(|b| *b == b'\n')
-                .count()
-        );
-    }
-
-    #[test]
-    fn preserves_final_same_line_occurrence_not_first_or_prose() {
-        let before = "oa_activity a \"a @a\" {} source @a; target @a;";
-        let after = "oa_activity longer \"a @a\" {} source @longer; target @longer;";
-        let start = before.rfind("@a").unwrap();
-        let result = map(
-            before,
-            after,
-            "a",
-            "longer",
-            Span {
-                start: start + 1,
-                end: start + 2,
-            },
-            Some(Span {
-                start,
-                end: start + 1,
-            }),
-        )
-        .unwrap();
-        assert_eq!(result.start, after.rfind("@longer").unwrap() + 1);
-        let prose = occurrence(before, "a @a", 0);
-        assert!(
-            map(
-                before,
-                after,
-                "a",
-                "longer",
-                Span {
-                    start: prose.start,
-                    end: prose.start + 1
-                },
-                None
-            )
-            .is_err()
-        );
-    }
-
-    #[test]
-    fn permits_identifier_keyword_transitions_in_alias_roles() {
-        let before = "oa_activity a \"Name\" {} source @a;";
-        let alias = occurrence(before, "a \"Name", 0);
-        let origin = Span {
-            start: alias.start,
-            end: alias.start + 1,
-        };
-        for replacement in ["none", "include", "oa_activity"] {
-            assert!(oa_core::valid_alias(replacement));
-            assert_eq!(
-                language::tokenize(replacement)[0].class,
-                TokenClass::Keyword
-            );
-            let after = format!("oa_activity {replacement} \"Name\" {{}} source @{replacement};");
-            let mapped = map(before, &after, "a", replacement, origin, None).unwrap();
-            assert_eq!(&after[mapped.start..mapped.end], replacement);
-            assert_eq!(
-                map(&after, before, replacement, "a", mapped, None).unwrap(),
-                origin
-            );
-        }
-    }
-
-    #[test]
-    fn rejects_changed_trivia_non_alias_words_and_wrong_marker() {
-        let before = "oa_activity a \"Name\" {} source @a;";
-        let after = "oa_activity b \"Name\" {} source @b;";
-        let start = before.rfind("@a").unwrap();
-        let span = Span {
-            start: start + 1,
-            end: start + 2,
-        };
-        let marker = Some(Span {
-            start,
-            end: start + 1,
-        });
-        assert_eq!(
-            map(
-                before,
-                &after.replace("Name", "Other"),
-                "a",
-                "b",
-                span,
-                marker
-            ),
-            Err(OriginError::ChangedStructure)
-        );
-        assert_eq!(
-            map(
-                before,
-                &after.replace(" source", "  source"),
-                "a",
-                "b",
-                span,
-                marker
-            ),
-            Err(OriginError::ChangedStructure)
-        );
-        assert_eq!(
-            map(before, after, "a", "b", span, None),
-            Err(OriginError::MissingOrigin)
-        );
-        assert!(
-            map(
-                before,
-                after,
-                "a",
-                "b",
-                Span {
-                    start: 0,
-                    end: usize::MAX
-                },
-                marker
-            )
-            .is_err()
-        );
-    }
-}

crates/oa-desktop/src/source_rename/preview.rs

@@ -1,578 +0,0 @@
-//! Complete, bounded line-ordinal previews of an already prepared alias rename.
-//!
-//! Source text remains in the caller's immutable before/after snapshots. This
-//! module owns only paths and indexes; it is not rename or commit authority.
-use oa_core::source_project::SourceBundle;
-use std::{fmt, ops::Range};
-
-const CONTEXT: usize = 3;
-// A byte-grid boundary can move back by at most three UTF-8 continuation bytes,
-// so a 252-byte grid yields fragments of at most 255 bytes, independent of input.
-const SEGMENT_GRID: usize = 252;
-
-/// Count all bounded fragments of exact source text; an empty line has one
-/// empty fragment. Page these as well as lines, never mount an unbounded line.
-pub fn segment_count(text: &str) -> usize {
-    text.len().div_ceil(SEGMENT_GRID).max(1)
-}
-
-/// Constant-time UTF-8-safe page lookup. Concatenating every fragment gives the
-/// original bytes, including CRLF. No ellipsis or truncation replaces content.
-pub fn text_segment(text: &str, index: usize) -> Option<&str> {
-    if index >= segment_count(text) {
-        return None;
-    }
-    let mut start = index.checked_mul(SEGMENT_GRID)?;
-    let mut end = start.saturating_add(SEGMENT_GRID).min(text.len());
-    while !text.is_char_boundary(start) {
-        start -= 1;
-    }
-    while !text.is_char_boundary(end) {
-        end -= 1;
-    }
-    text.get(start..end)
-}
-const LIMITS: Limits = Limits {
-    files: 256,
-    changed_lines: 50_000,
-    display_bytes: 8 * 1024 * 1024,
-};
-
-#[derive(Clone, Copy)]
-struct Limits {
-    files: usize,
-    changed_lines: usize,
-    display_bytes: usize,
-}
-
-#[derive(Debug)]
-pub struct Preview {
-    files: Vec<File>,
-    changed_lines: usize,
-    display_bytes: usize,
-}
-
-#[derive(Debug)]
-pub struct File {
-    path: String,
-    hunks: Vec<Hunk>,
-}
-
-#[derive(Debug)]
-pub struct Hunk {
-    lines: Vec<Line>,
-}
-
-#[derive(Debug)]
-pub struct Line {
-    number: usize,
-    before: Range<usize>,
-    after: Range<usize>,
-    changed: bool,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum PreviewError {
-    MembershipChanged,
-    LineCountChanged(String),
-    LineEndingChanged { path: String, line: usize },
-    TooManyFiles { limit: usize },
-    TooManyChangedLines { limit: usize },
-    TooManyDisplayBytes { limit: usize },
-}
-
-impl fmt::Display for PreviewError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::MembershipChanged => write!(
-                f,
-                "Rename preview refused: the entry or source file membership changed. No rename was applied."
-            ),
-            Self::LineCountChanged(path) => write!(
-                f,
-                "Rename preview refused: the line count changed in {path}. No rename was applied."
-            ),
-            Self::LineEndingChanged { path, line } => write!(
-                f,
-                "Rename preview refused: the line ending changed in {path}:{line}. No rename was applied."
-            ),
-            Self::TooManyFiles { limit } => write!(
-                f,
-                "Rename preview exceeds {limit} changed files. A complete preview is required; no rename was applied."
-            ),
-            Self::TooManyChangedLines { limit } => write!(
-                f,
-                "Rename preview exceeds {limit} changed source lines. A complete preview is required; no rename was applied."
-            ),
-            Self::TooManyDisplayBytes { limit } => write!(
-                f,
-                "Rename preview exceeds {limit} display bytes (paths and both versions of changed/context lines). A complete preview is required; no rename was applied."
-            ),
-        }
-    }
-}
-
-impl std::error::Error for PreviewError {}
-
-impl Preview {
-    pub fn build(before: &SourceBundle, after: &SourceBundle) -> Result<Self, PreviewError> {
-        Self::with_limits(before, after, LIMITS)
-    }
-
-    fn with_limits(
-        before: &SourceBundle,
-        after: &SourceBundle,
-        limits: Limits,
-    ) -> Result<Self, PreviewError> {
-        if before.entry != after.entry
-            || !before.files.contains_key(&before.entry)
-            || !before.files.keys().eq(after.files.keys())
-        {
-            return Err(PreviewError::MembershipChanged);
-        }
-        let mut preview = Self {
-            files: Vec::new(),
-            changed_lines: 0,
-            display_bytes: 0,
-        };
-        for ((path, old), (_, new)) in before.files.iter().zip(&after.files) {
-            if old == new {
-                continue;
-            }
-            if preview.files.len() == limits.files {
-                return Err(PreviewError::TooManyFiles {
-                    limit: limits.files,
-                });
-            }
-            // A changed source line can contain arbitrarily many renamed tokens.
-            // Count the line once; this count is never a semantic-reference count.
-            let mut changed = Vec::new();
-            let mut old_lines = Lines::new(old);
-            let mut new_lines = Lines::new(new);
-            let mut count = 0;
-            loop {
-                match (old_lines.next(), new_lines.next()) {
-                    (None, None) => break,
-                    (Some(a), Some(b)) => {
-                        count += 1;
-                        if old[a.content_end..a.end] != new[b.content_end..b.end] {
-                            return Err(PreviewError::LineEndingChanged {
-                                path: path.clone(),
-                                line: count,
-                            });
-                        }
-                        if old[a.start..a.end] != new[b.start..b.end] {
-                            if preview.changed_lines == limits.changed_lines {
-                                return Err(PreviewError::TooManyChangedLines {
-                                    limit: limits.changed_lines,
-                                });
-                            }
-                            preview.changed_lines += 1;
-                            changed.push(count - 1);
-                        }
-                    }
-                    _ => return Err(PreviewError::LineCountChanged(path.clone())),
-                }
-            }
-
-            // Merge touching context intervals in order, without pairwise diff.
-            // At most 7 indexed lines per changed line are retained; unchanged
-            // lines outside these intervals are scanned but never indexed.
-            let mut ranges: Vec<Range<usize>> = Vec::new();
-            for line in changed {
-                let range =
-                    line.saturating_sub(CONTEXT)..line.saturating_add(CONTEXT + 1).min(count);
-                if let Some(previous) = ranges.last_mut()
-                    && range.start <= previous.end
-                {
-                    previous.end = previous.end.max(range.end);
-                    continue;
-                }
-                ranges.push(range);
-            }
-            preview.charge(path.len(), limits)?;
-            let mut file = File {
-                path: path.clone(),
-                hunks: Vec::new(),
-            };
-            let mut pairs = Lines::new(old).zip(Lines::new(new)).enumerate();
-            for range in ranges {
-                let mut hunk = Hunk { lines: Vec::new() };
-                for (ordinal, (a, b)) in pairs.by_ref() {
-                    if ordinal < range.start {
-                        continue;
-                    }
-                    // Charge exact UTF-8 bytes, including preserved endings and
-                    // both copies of shared context, before adding the index.
-                    // No render-time omission or shortening grants admission.
-                    preview.charge(a.end - a.start, limits)?;
-                    preview.charge(b.end - b.start, limits)?;
-                    hunk.lines.push(Line {
-                        number: ordinal + 1,
-                        changed: old[a.start..a.end] != new[b.start..b.end],
-                        before: a.start..a.end,
-                        after: b.start..b.end,
-                    });
-                    if ordinal + 1 == range.end {
-                        break;
-                    }
-                }
-                file.hunks.push(hunk);
-            }
-            preview.files.push(file);
-        }
-        Ok(preview)
-    }
-
-    fn charge(&mut self, bytes: usize, limits: Limits) -> Result<(), PreviewError> {
-        let Some(total) = self.display_bytes.checked_add(bytes) else {
-            return Err(PreviewError::TooManyDisplayBytes {
-                limit: limits.display_bytes,
-            });
-        };
-        if total > limits.display_bytes {
-            return Err(PreviewError::TooManyDisplayBytes {
-                limit: limits.display_bytes,
-            });
-        }
-        self.display_bytes = total;
-        Ok(())
-    }
-
-    /// All admitted files in source path order; suitable for a file picker/search.
-    pub fn files(&self) -> &[File] {
-        &self.files
-    }
-
-    /// Changed source lines, not occurrences, declarations or semantic uses.
-    pub fn changed_line_count(&self) -> usize {
-        self.changed_lines
-    }
-
-    /// Exact displayed source bytes for both sides plus each stored path once.
-    /// Index metadata is separately bounded by 7 lines per changed line.
-    pub fn display_bytes(&self) -> usize {
-        self.display_bytes
-    }
-
-    #[cfg(test)]
-    pub fn is_empty(&self) -> bool {
-        self.files.is_empty()
-    }
-}
-
-impl File {
-    pub fn path(&self) -> &str {
-        &self.path
-    }
-
-    /// Every hunk is present; the caller may page these indexes, never truncate.
-    pub fn hunks(&self) -> &[Hunk] {
-        &self.hunks
-    }
-}
-
-impl Hunk {
-    /// The complete ordered line slice supports paging even a large single hunk.
-    pub fn lines(&self) -> &[Line] {
-        &self.lines
-    }
-}
-
-impl Line {
-    /// One-based source line number, identical on both sides.
-    pub fn number(&self) -> usize {
-        self.number
-    }
-
-    pub fn changed(&self) -> bool {
-        self.changed
-    }
-
-    /// Borrow from the immutable original file; includes its exact line ending.
-    pub fn before_text<'a>(&self, original: &'a str) -> Option<&'a str> {
-        original.get(self.before.clone())
-    }
-
-    /// Borrow from the immutable candidate file; includes its exact line ending.
-    pub fn after_text<'a>(&self, candidate: &'a str) -> Option<&'a str> {
-        candidate.get(self.after.clone())
-    }
-}
-
-struct RawLine {
-    start: usize,
-    content_end: usize,
-    end: usize,
-}
-
-struct Lines<'a> {
-    bytes: &'a [u8],
-    offset: usize,
-}
-
-impl<'a> Lines<'a> {
-    fn new(text: &'a str) -> Self {
-        Self {
-            bytes: text.as_bytes(),
-            offset: 0,
-        }
-    }
-}
-
-impl Iterator for Lines<'_> {
-    type Item = RawLine;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.offset == self.bytes.len() {
-            return None;
-        }
-        let start = self.offset;
-        // The compiler and source navigation count LF, not bare CR, as a line
-        // boundary. Preserve CRLF as an ending and bare CR as source content.
-        while self.offset < self.bytes.len() && self.bytes[self.offset] != b'\n' {
-            self.offset += 1;
-        }
-        let mut content_end = self.offset;
-        if self.offset < self.bytes.len() {
-            if self.offset > start && self.bytes[self.offset - 1] == b'\r' {
-                content_end -= 1;
-            }
-            self.offset += 1;
-        }
-        Some(RawLine {
-            start,
-            content_end,
-            end: self.offset,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn bundle(source: &str) -> SourceBundle {
-        SourceBundle {
-            entry: "救援.arcadia".into(),
-            files: [("救援.arcadia".into(), source.into())].into(),
-        }
-    }
-
-    #[test]
-    fn long_unicode_lines_are_fully_reachable_as_bounded_fragments() {
-        let text = format!("{}救援🙂{}\r\n", "a".repeat(251), "🙂".repeat(200));
-        let pieces: Vec<_> = (0..segment_count(&text))
-            .map(|i| text_segment(&text, i).unwrap())
-            .collect();
-        assert!(pieces.len() > 2);
-        assert!(pieces.iter().all(|part| part.len() <= 255));
-        assert_eq!(pieces.concat(), text);
-        assert_eq!(text_segment(&text, segment_count(&text)), None);
-        assert_eq!(text_segment(&text, usize::MAX), None);
-        assert_eq!(segment_count(""), 1);
-        assert_eq!(text_segment("", 0), Some(""));
-    }
-
-    #[test]
-    fn preserves_unicode_mixed_endings_and_counts_lines_not_repeated_uses() {
-        let old = bundle("// 救援\r\n@a @a\ncontext\r@a");
-        let new = bundle("// 救援\r\n@long @long\ncontext\r@long");
-        let preview = Preview::build(&old, &new).unwrap();
-        assert_eq!(preview.changed_line_count(), 2);
-        let file = &preview.files()[0];
-        assert_eq!(file.path(), "救援.arcadia");
-        assert_eq!(file.hunks().len(), 1);
-        let lines = file.hunks()[0].lines();
-        assert_eq!(
-            lines.iter().map(Line::number).collect::<Vec<_>>(),
-            [1, 2, 3]
-        );
-        assert_eq!(
-            lines[0].before_text(&old.files[&old.entry]),
-            Some("// 救援\r\n")
-        );
-        assert_eq!(
-            lines[1].after_text(&new.files[&new.entry]),
-            Some("@long @long\n")
-        );
-        assert_eq!(
-            lines[2].after_text(&new.files[&new.entry]),
-            Some("context\r@long")
-        );
-        assert!(lines[1].changed() && lines[2].changed());
-        assert!(!lines[0].changed());
-        assert_eq!(
-            preview.display_bytes(),
-            old.entry.len() + old.files[&old.entry].len() + new.files[&new.entry].len()
-        );
-    }
-
-    #[test]
-    fn first_and_last_lines_form_complete_separate_hunks_and_pages() {
-        let old = bundle("a\n1\n2\n3\n4\n5\n6\n7\n8\n9\na");
-        let new = bundle("long\n1\n2\n3\n4\n5\n6\n7\n8\n9\nlong");
-        let preview = Preview::build(&old, &new).unwrap();
-        let hunks = preview.files()[0].hunks();
-        assert_eq!(hunks.len(), 2);
-        let page_numbers: Vec<_> = hunks
-            .iter()
-            .flat_map(|h| h.lines().chunks(2))
-            .flat_map(|page| page.iter().map(Line::number))
-            .collect();
-        assert_eq!(page_numbers, [1, 2, 3, 4, 8, 9, 10, 11]);
-        assert_eq!(
-            hunks[1].lines()[3].after_text(&new.files[&new.entry]),
-            Some("long")
-        );
-    }
-
-    #[test]
-    fn nearby_changes_merge_and_all_changed_files_are_reachable() {
-        let mut old = bundle("a\n1\n2\n3\n4\n5\na\n");
-        let mut new = bundle("b\n1\n2\n3\n4\n5\nb\n");
-        old.files.insert("other.arcadia".into(), "a a a".into());
-        new.files.insert("other.arcadia".into(), "b b b".into());
-        let preview = Preview::build(&old, &new).unwrap();
-        assert_eq!(preview.changed_line_count(), 3);
-        assert_eq!(preview.files().len(), 2);
-        assert_eq!(preview.files()[0].path(), "other.arcadia");
-        assert_eq!(preview.files()[0].hunks()[0].lines().len(), 1);
-        assert_eq!(preview.files()[1].hunks().len(), 1);
-        assert_eq!(preview.files()[1].hunks()[0].lines().len(), 7);
-    }
-
-    #[test]
-    fn unchanged_and_empty_sources_have_no_preview() {
-        for source in ["", "a\r\nb\n", "a"] {
-            let original = bundle(source);
-            let preview = Preview::build(&original, &original).unwrap();
-            assert!(preview.is_empty());
-            assert_eq!(preview.changed_line_count(), 0);
-            assert_eq!(preview.display_bytes(), 0);
-        }
-    }
-
-    #[test]
-    fn refuses_membership_entry_line_count_and_line_ending_changes() {
-        let old = bundle("a\nb");
-        let mut new = old.clone();
-        new.files.insert("extra.arcadia".into(), "".into());
-        assert_eq!(
-            Preview::build(&old, &new).unwrap_err(),
-            PreviewError::MembershipChanged
-        );
-        let mut new = old.clone();
-        new.entry = "missing.arcadia".into();
-        assert_eq!(
-            Preview::build(&old, &new).unwrap_err(),
-            PreviewError::MembershipChanged
-        );
-        assert!(matches!(
-            Preview::build(&old, &bundle("a\nb\nc")),
-            Err(PreviewError::LineEndingChanged { .. }) | Err(PreviewError::LineCountChanged(_))
-        ));
-        assert!(matches!(
-            Preview::build(&bundle("a\nb\n"), &bundle("a\n")),
-            Err(PreviewError::LineCountChanged(_))
-        ));
-        for (a, b) in [("a\r\n", "a\n"), ("a\r", "a\n"), ("a", "a\n")] {
-            assert_eq!(
-                Preview::build(&bundle(a), &bundle(b)).unwrap_err(),
-                PreviewError::LineEndingChanged {
-                    path: old.entry.clone(),
-                    line: 1
-                }
-            );
-        }
-    }
-
-    #[test]
-    fn each_bound_is_exact_and_overflow_never_returns_a_partial_preview() {
-        let old = bundle("a\ncontext\na");
-        let new = bundle("bbb\ncontext\nbbb");
-        let exact = old.entry.len() + old.files[&old.entry].len() + new.files[&new.entry].len();
-        let limits = Limits {
-            files: 1,
-            changed_lines: 2,
-            display_bytes: exact,
-        };
-        assert!(Preview::with_limits(&old, &new, limits).is_ok());
-        assert_eq!(
-            Preview::with_limits(&old, &new, Limits { files: 0, ..limits }).unwrap_err(),
-            PreviewError::TooManyFiles { limit: 0 }
-        );
-        assert_eq!(
-            Preview::with_limits(
-                &old,
-                &new,
-                Limits {
-                    changed_lines: 1,
-                    ..limits
-                }
-            )
-            .unwrap_err(),
-            PreviewError::TooManyChangedLines { limit: 1 }
-        );
-        assert_eq!(
-            Preview::with_limits(
-                &old,
-                &new,
-                Limits {
-                    display_bytes: exact - 1,
-                    ..limits
-                }
-            )
-            .unwrap_err(),
-            PreviewError::TooManyDisplayBytes { limit: exact - 1 }
-        );
-        let long = bundle(&"a".repeat(LIMITS.display_bytes));
-        assert!(matches!(
-            Preview::build(&bundle("b"), &long),
-            Err(PreviewError::TooManyDisplayBytes { .. })
-        ));
-    }
-
-    #[test]
-    fn limits_apply_to_the_whole_preview_not_each_file() {
-        let mut old = bundle("a");
-        let mut new = bundle("b");
-        old.files.insert("second.arcadia".into(), "a".into());
-        new.files.insert("second.arcadia".into(), "b".into());
-        let limits = Limits {
-            files: 2,
-            changed_lines: 2,
-            display_bytes: old.entry.len() + "second.arcadia".len() + 4,
-        };
-        let complete = Preview::with_limits(&old, &new, limits).unwrap();
-        assert_eq!(complete.files().len(), 2);
-        assert_eq!(complete.changed_line_count(), 2);
-        assert_eq!(complete.display_bytes(), limits.display_bytes);
-        assert!(matches!(
-            Preview::with_limits(&old, &new, Limits { files: 1, ..limits }),
-            Err(PreviewError::TooManyFiles { limit: 1 })
-        ));
-        assert!(matches!(
-            Preview::with_limits(
-                &old,
-                &new,
-                Limits {
-                    changed_lines: 1,
-                    ..limits
-                }
-            ),
-            Err(PreviewError::TooManyChangedLines { limit: 1 })
-        ));
-        assert!(matches!(
-            Preview::with_limits(
-                &old,
-                &new,
-                Limits {
-                    display_bytes: limits.display_bytes - 1,
-                    ..limits
-                }
-            ),
-            Err(PreviewError::TooManyDisplayBytes { .. })
-        ));
-    }
-}

crates/oa-desktop/src/views.rs

@@ -353,13 +353,6 @@ pub fn view(app: &App) -> View<'_, Message> {
     if app.pending.is_some() {
         return modal(root,column![text("Keep your changes?").size(21),text("Save the model and pending edits before continuing. Invalid drafts stay available for correction.").size(13),row![action("Cancel",Message::Cancel),action("Discard changes",Message::Discard),button("Save & continue").padding(10).on_press(Message::SaveAndContinue)].spacing(8)].spacing(16).into());
     }
-    if app.source_rename.open() {
-        return modal_width(
-            root,
-            crate::app::source_rename::dialog(app),
-            (app.window_size.width - 32.).clamp(120., 760.),
-        );
-    }
     root
 }
 fn modal<'a>(base: View<'a, Message>, content: View<'a, Message>) -> View<'a, Message> {
@@ -389,24 +382,11 @@ fn modal_width<'a>(
     .into()
 }
 fn diagram(app: &App) -> View<'_, Message> {
-    if app
-        .active_diagram
-        .and_then(|id| app.project().diagrams.get(&id))
-        .is_some_and(|d| d.projection.scenario().is_some())
-    {
-        return heading(
-            "Saved Scenario view",
-            crate::app::SAVED_SCENARIO_UNAVAILABLE,
-        );
-    }
     let mut diagrams = app
         .project()
         .diagrams
         .values()
-        .filter(|d| {
-            d.projection.scenario().is_none()
-                && (d.layer == app.layer || d.projection == ProjectionKind::Traceability)
-        })
+        .filter(|d| d.layer == app.layer || d.projection == ProjectionKind::Traceability)
         .map(|d| Choice {
             id: d.id,
             label: d.name.clone(),
@@ -804,27 +784,22 @@ fn inspector(app: &App) -> View<'_, Message> {
             );
         }
     }
-    let actions = row![
-        button(text("Apply changes").size(12))
-            .padding([9, 12])
-            .on_press(Message::Apply)
-            .width(Fill),
-        action("Revert", Message::RevertProperties)
-    ]
-    .spacing(5);
+    body = body.push(
+        row![
+            button(text("Apply changes").size(12))
+                .padding([9, 12])
+                .on_press(Message::Apply)
+                .width(Fill),
+            action("Revert", Message::RevertProperties)
+        ]
+        .spacing(5),
+    );
     if let Some(d) = &app.draft {
         body = body.push(forms::view(d, p));
     }
     container(
         column![
-            column![
-                tabs,
-                container(actions).padding(iced::Padding {
-                    right: 14.,
-                    ..Default::default()
-                })
-            ]
-            .spacing(12),
+            tabs,
             scrollable(body.padding(iced::Padding {
                 right: 14.,
                 ..Default::default()
@@ -1042,13 +1017,6 @@ fn source_files(app: &App) -> View<'_, Message> {
 
 fn source(app: &App) -> View<'_, Message> {
     use crate::source_navigation::Event as SourceEvent;
-    let (undo_label, undo_message) = match app.source_rename_undo_message() {
-        Some(message) => ("Undo rename", Some(message)),
-        None => (
-            "Undo model",
-            (app.document.can_undo() && !app.source_dirty()).then_some(Message::Undo),
-        ),
-    };
     let navigation: View<'_, Message> = if app.source_navigation.open {
         column![
             row![
@@ -1163,8 +1131,7 @@ fn source(app: &App) -> View<'_, Message> {
         .on_action(Message::SourceEdit)
         .key_binding({
             let context = app.source_symbol_context();
-            let rename = app.source_rename_begin();
-            move |press| source_binding(press, &context, Some(&rename))
+            move |press| source_binding(press, &context)
         })
         .font(Font::MONOSPACE)
         .size(14)
@@ -1192,8 +1159,8 @@ fn source(app: &App) -> View<'_, Message> {
                 row![
                     action("Undo text", Message::SourceUndo),
                     action("Redo text", Message::SourceRedo),
-                    button(text(undo_label).size(12)).padding([8,10]).style(style::nav)
-                        .on_press_maybe(undo_message),
+                    button(text("Undo model").size(12)).padding([8,10]).style(style::nav)
+                        .on_press_maybe((app.document.can_undo() && !app.source_dirty()).then_some(Message::Undo)),
                     button(text("Redo model").size(12)).padding([8,10]).style(style::nav)
                         .on_press_maybe((app.document.can_redo() && !app.source_dirty()).then_some(Message::Redo)),
                     action("Find / go to…", Message::SourceNavigation(SourceEvent::Open(false))),
@@ -1220,7 +1187,6 @@ fn source(app: &App) -> View<'_, Message> {
                 row![
                     action("Definition · F12", app.source_symbol_message(crate::source_navigation::SymbolEvent::Query(crate::source_navigation::query::Action::Definition))),
                     action("References · Shift F12", app.source_symbol_message(crate::source_navigation::SymbolEvent::Query(crate::source_navigation::query::Action::References))),
-                    action("Rename alias · F2", app.source_rename_message()),
                     action("Show in diagrams…", app.source_symbol_message(crate::source_navigation::SymbolEvent::DiagramUsages)),
                     button(text("Back · Alt ←").size(12)).padding([8, 10]).style(style::nav)
                         .on_press_maybe((app.source_symbols.back.iter().any(|entry| entry.session == app.source_workspace.session())).then(|| app.source_symbol_message(crate::source_navigation::SymbolEvent::Back))),
@@ -1273,23 +1239,13 @@ fn source_layout<'a, Renderer: iced::advanced::text::Renderer + 'a>(
     .height(Fill)
     .into()
 }
-pub(crate) fn source_binding(
+fn source_binding(
     press: widget::text_editor::KeyPress,
     context: &crate::source_navigation::SymbolContext,
-    rename: Option<&crate::app::source_rename::Begin>,
 ) -> Option<widget::text_editor::Binding<Message>> {
     use crate::source_navigation::{SymbolEvent, query::Action};
     use iced::keyboard::{Key, key::Named};
     use widget::text_editor::{Binding, Status};
-    if matches!(press.status, Status::Focused { .. })
-        && press.modifiers.is_empty()
-        && press.key == Key::Named(Named::F2)
-        && let Some(begin) = rename
-    {
-        return Some(Binding::Custom(Message::SourceRename(
-            crate::app::source_rename::Event::Begin(begin.clone()),
-        )));
-    }
     // Windows owns Alt+Space for its window menu. Iced's default binding would
     // otherwise insert a supplied space payload, even after that menu closes.
     // Keep Ctrl+Alt (AltGr), shifted input, and ordinary Space unchanged.
@@ -1331,7 +1287,7 @@ pub(crate) fn source_binding(
 }
 
 #[cfg(all(test, debug_assertions))]
-pub(crate) mod source_tests {
+mod source_tests {
     use super::*;
     use iced::advanced::{
         Layout, Shell, graphics, layout, renderer, text as shaped, widget as core_widget,
@@ -1340,7 +1296,7 @@ pub(crate) mod source_tests {
     use iced::{Background, Color, Pixels, Point, Rectangle, Size, Transformation, Vector};
 
     // Measure real Iced paragraphs/editor text without constructing a window or GPU.
-    pub(crate) struct FontLayout;
+    struct FontLayout;
     impl renderer::Renderer for FontLayout {
         fn start_layer(&mut self, _: Rectangle) {}
         fn end_layer(&mut self) {}
@@ -1670,7 +1626,7 @@ pub(crate) mod source_tests {
                         .size(14)
                         .padding(16)
                         .height(Fill)
-                        .key_binding(|press| source_binding(press, &context, None))
+                        .key_binding(|press| source_binding(press, &context))
                         .into();
                 let mut tree = core_widget::Tree::new(editor.as_widget());
                 let size = Size::new(600., 240.);

crates/oa-desktop/src/workflow.rs

@@ -352,8 +352,7 @@ impl Transition {
 }
 
 fn result_view_compatible(p: &Project, diagram: &Diagram, targets: &[Id], layer: Layer) -> bool {
-    (diagram.projection.is_architecture() || diagram.projection.state_machine().is_some())
-        && (diagram.layer == layer || diagram.projection == ProjectionKind::Traceability)
+    (diagram.layer == layer || diagram.projection == ProjectionKind::Traceability)
         && (diagram.projection.state_machine().is_none() || !targets.is_empty())
         && targets.iter().all(|id| {
             p.elements.get(id).is_some_and(|e| {
@@ -1973,37 +1972,3 @@ mod port_authoring_tests {
         }
     }
 }
-
-#[cfg(test)]
-mod saved_scenario_destination_tests {
-    use super::*;
-
-    #[test]
-    fn empty_transition_results_do_not_make_a_scenario_an_architecture_destination() {
-        let mut p = Project::empty();
-        let owner = p
-            .add_element(Kind::Scenario, Layer::Oa, "Scenario", None)
-            .unwrap();
-        let mut diagram = Diagram {
-            id: Id::new_v4(),
-            alias: "target_view".into(),
-            name: "Target".into(),
-            description: String::new(),
-            layer: Layer::Oa,
-            projection: ProjectionKind::Scenario { scenario: owner },
-            view_options: Default::default(),
-            nodes: Default::default(),
-            routes: vec![],
-            layout: None,
-        };
-        assert!(!result_view_compatible(&p, &diagram, &[], Layer::Oa));
-        let machine = p
-            .add_element(Kind::StateMachine, Layer::Oa, "Machine", None)
-            .unwrap();
-        diagram.projection = ProjectionKind::StateMachine { machine };
-        assert!(result_view_compatible(&p, &diagram, &[machine], Layer::Oa));
-        assert!(!result_view_compatible(&p, &diagram, &[], Layer::Oa));
-        diagram.projection = ProjectionKind::Overview;
-        assert!(result_view_compatible(&p, &diagram, &[], Layer::Oa));
-    }
-}

crates/oa-desktop/src/workflow/transition_tests.rs

@@ -13,7 +13,6 @@ fn view(p: &mut Project, number: u128, projection: ProjectionKind) -> Id {
             projection,
             view_options: Default::default(),
             nodes: Default::default(),
-            layout: None,
             routes: vec![],
         },
     );