Distinguish connection tools with semantic palette icons

crates/oa-desktop/src/app/allocation_drag_tests/group.rs

@@ -1,6 +1,7 @@
 use super::*;
 use crate::app::multiselect::{self, Choice};
 use crate::diagram_usage::Target as SelectionTarget;
+use iced::widget::text_editor;
 
 #[path = "group/connection_lifetime.rs"]
 mod connection_lifetime;

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

@@ -1,5 +1,6 @@
 //! Compact neutral tool palette. Tool state never changes its allocated width.
 use super::*;
+use crate::connection_tool::Tool;
 use iced::{
     Point, Rectangle, Size, Theme, mouse,
     widget::{
@@ -11,7 +12,7 @@ use iced::{
 #[derive(Clone, Copy)]
 enum Icon {
     Element(Kind),
-    Arrow,
+    Connection(Tool),
     Existing,
     Select,
     Collapse(bool),
@@ -76,10 +77,63 @@ impl canvas::Program<Message> for Icon {
                     );
                 }
             }
-            Self::Arrow => {
-                f.stroke(&line(&[(1., 8.), (14., 8.), (10., 4.)]), stroke);
-                f.stroke(&line(&[(14., 8.), (10., 12.)]), stroke);
-            }
+            Self::Connection(connection) => match connection {
+                // The OA and SA work-flow tools share a visual family; they
+                // never coexist in a palette. Keep their small glyph legible.
+                Tool::Interaction | Tool::FunctionalExchange => {
+                    for x in [1., 11.] {
+                        f.stroke(
+                            &Path::rounded_rectangle(
+                                Point::new(x, 5.),
+                                Size::new(4., 6.),
+                                1.5.into(),
+                            ),
+                            stroke,
+                        );
+                    }
+                    f.stroke(&line(&[(5., 8.), (10., 8.)]), stroke);
+                    f.stroke(&line(&[(7.5, 5.5), (10., 8.), (7.5, 10.5)]), stroke);
+                }
+                Tool::CommunicationMean => {
+                    // Participant endpoints, without implying a fixed direction.
+                    for x in [1., 11.] {
+                        f.stroke(
+                            &Path::rectangle(Point::new(x, 4.), Size::new(4., 8.)),
+                            stroke,
+                        );
+                    }
+                    f.stroke(&line(&[(5., 8.), (11., 8.)]), stroke);
+                }
+                Tool::BoundaryExchange => {
+                    // Ports on facing participant boundaries. Standard exchanges
+                    // are unoriented, so the generic tool has no arrowhead.
+                    for x in [2., 14.] {
+                        f.stroke(&line(&[(x, 2.), (x, 14.)]), stroke);
+                    }
+                    for x in [1., 12.] {
+                        f.stroke(
+                            &Path::rectangle(Point::new(x, 6.), Size::new(3., 4.)),
+                            stroke,
+                        );
+                    }
+                    f.stroke(&line(&[(4., 8.), (12., 8.)]), stroke);
+                }
+                Tool::Allocation => {
+                    // Work enters a performer: allocation can appear as nesting
+                    // rather than a relationship line in allocated-work views.
+                    f.stroke(&line(&[(1., 2.), (1., 14.), (15., 14.), (15., 2.)]), stroke);
+                    f.stroke(
+                        &Path::rounded_rectangle(
+                            Point::new(5., 9.),
+                            Size::new(6., 3.),
+                            1.into(),
+                        ),
+                        stroke,
+                    );
+                    f.stroke(&line(&[(8., 1.), (8., 7.)]), stroke);
+                    f.stroke(&line(&[(5., 4.), (8., 7.), (11., 4.)]), stroke);
+                }
+            },
             Self::Existing => {
                 f.stroke(
                     &Path::rectangle(Point::new(1., 1.), Size::new(10., 10.)),
@@ -234,7 +288,7 @@ pub fn view(app: &App) -> Element<'_, Message> {
         }
         content = content.push(tool(
             app,
-            Icon::Arrow,
+            Icon::Connection(*connection),
             connection.label(),
             Message::Connection(crate::connection_edit::Event::Choose(Some(*connection))),
             app.connection

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

@@ -10,6 +10,11 @@ async fn press_escape(mounted: &mut Mounted, app: &mut App) -> Vec<Message> {
         std::slice::from_ref(&input),
         mouse::Cursor::Unavailable,
     );
+    assert_eq!(
+        statuses,
+        [iced::event::Status::Captured],
+        "the mounted picker must capture Escape before App subscriptions"
+    );
     crate::app::escape::tests::subscriptions(app, input, statuses[0], &mut messages);
     for message in messages.iter().cloned() {
         let task = app.update(message);
@@ -41,17 +46,11 @@ async fn mounted_state_missing_picker_escape_preserves_exact_document_then_reope
     send(&mut app, Message::BehaviorDiagram(choice));
     let mut mounted = Mounted::new(&mut app).await;
     assert_eq!(state_edit::unplaced(app.project(), diagram), vec![f.b]);
-    let focus_id = iced::advanced::widget::Id::from("diagram-keyboard-owner");
-    let (_, canvas, _) = mounted
-        .geometry(&app)
-        .focused
-        .into_iter()
-        .find(|(id, _, _)| id.as_ref() == Some(&focus_id))
-        .unwrap();
-    // The existing picker is immediately above the measured canvas, separated
-    // by 8px. Its 12px text and 8px padding give a 31.6px row.
-    let picker = iced::Point::new(canvas.center_x(), canvas.y - 24.);
-    let option = iced::Point::new(picker.x, canvas.y + 8.);
+    // Locate the stable picker slot itself: selection controls may sit between
+    // it and the canvas. The single menu option opens below this slot.
+    let bounds = mounted.geometry(&app).bounds("state-missing-picker");
+    let picker = bounds.center();
+    let option = iced::Point::new(picker.x, bounds.y + bounds.height * 1.5);
     let before = app.document.snapshot();
     let original = app.project().clone();
     let source = app.document.bundle().clone();

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

@@ -187,7 +187,7 @@ pub fn view<'a>(app: &'a App, machine: Id, mut out: Column<'a, Message>) -> Elem
     .into();
     out = out.push(
         column![
-            missing_controls,
+            container(missing_controls).id("state-missing-picker"),
             selection_controls(app),
             crate::diagram::focus::wrap(
                 canvas.map(event),

harness/STATE.md

@@ -9,7 +9,8 @@ excluded by the user's explicit request, including after networking recovers.**
 
 ## Assembled source and acceptance boundary
 
-Combined code **4deced53b98cd4d7649ba7aa60fa4b9b30d2f3b8** adds the reviewed
+Combined code through **4deced53b98cd4d7649ba7aa60fa4b9b30d2f3b8**, plus the
+test-only import correction from **7c2b06b63f8a0fe14b3f001996bdf965b36a4e85**, adds the reviewed
 Connection/Route early-admission correction to the assembled Scenario/Text,
 ordinary/State/Process/Allocation selection, direct drawing, Traceability and
 picker changes. The [source handoff](prerelease-integrated-source-20260924.md)
@@ -21,7 +22,16 @@ claim combined Cargo, native, packaged or release acceptance. The independent
 further material source defect in its stated scope. A subsequent peer compile
 found a missing `projection::` qualification in the new Route test helper;
 the current code includes that one-line correction. The original compile failed
-before running tests. Combined execution remains pending.
+before running tests. The first combined compile at `897d9f04` subsequently
+found a missing `text_editor` import in the Allocation Text Apply regression;
+the current source includes that one-line correction too. Both failures remain
+recorded in the source handoff. The subsequent full test run at `8ddfadf4`
+failed the mounted State picker fixture: added selection controls invalidated
+its canvas-relative clicks. Source successor `a9cd364eacbbffa0693bab05b5a2b65f9d105535`
+measures an identified fixed-height picker slot and checks Escape capture,
+retaining the exact preservation/reopen/Place/Undo assertions. The source
+handoff links the preserved failed and interrupted attempts. Corrected combined
+Windows execution and package acceptance remain pending.
 
 Live build, final-source and publication results belong in
 [issue37](http://217.177.34.108:3000/sorokin.oleg.edu/ARCADIA-Studio/issues/37).

harness/connection-icons-20260925.md

@@ -0,0 +1,11 @@
+# Connection tool icons
+
+Branch candidate for [#41](http://217.177.34.108:3000/sorokin.oleg.edu/ARCADIA-Studio/issues/41), based on published Windows preview source `715036e132677dd2bc2fb37ed316d93dc9987aec`. This is not integrated or native acceptance.
+
+The reported collapsed palette repeats one arrow for three different tools. Extend the existing Rust/Iced canvas glyphs at their actual 16×16 size: work endpoints plus an arrow for Interaction/Functional exchange, neutral participant endpoints for Communication means, facing component ports for Boundary exchange, and work entering a performer for Allocation. The first pair never coexist in one perspective. Unoriented generic tools must not imply a fixed direction.
+
+Letter badges were rejected as language-dependent and cramped. Different arrow/dash styles risk confusing tool identity with relation direction. Native endpoint/container shapes fit the existing icon system without font or asset dependencies. Preserve button dimensions, explicit labels/tooltips, ordering, messages, availability and selection rules.
+
+Independent source critique found no blocker and confirmed the tool semantics and Iced API use. Actual-size legibility remains unverified, particularly the exchange arrow, port details and possible download/import interpretation of Allocation. Verify enabled, disabled, hovered and selected palettes in both perspectives, expansion/collapse, tool activation, representative relation creation and cancellation. Existing keyboard/accessibility behavior must be checked, not inferred from hover labels. Reuse semantic connection tests; geometry hashes alone are not an identification or usability evaluator.
+
+Linux remains excluded by the existing user pause. Live ownership and integration status belong to the linked issue.

harness/prerelease-integrated-source-20260924.md

@@ -80,6 +80,30 @@ actionable defect in the stated boundary. These do not substitute for the final
 combined execution. The vendor patch-description correction is incorporated at
 `17eaa03fd69741dff746f21d150dc04c341411b3`.
 
+## Mounted State picker correction
+
+The combined Windows test run at `8ddfadf440b5c208b1adb6b211a97ba0c99cff04`
+failed the mounted State missing-picker Escape regression. The test located the
+picker relative to the canvas, but the integrated selection toolbar adds 56px
+plus an 8px gap between them. Both the opening and option clicks were stale.
+Parent and independent source inspection agreed on this fixture defect; they
+found no reason to change the production Escape policy from this failure.
+
+Successor `a9cd364eacbbffa0693bab05b5a2b65f9d105535` adds a zero-padding
+identified container around the existing fixed-height picker slot. The fixture
+measures that slot, checks Escape capture before App subscriptions, and retains
+zero messages, exact document/source/selection/camera/revision/history,
+reopen-and-Place, and exact source Undo checks. The option coordinate assumes
+this fixture's single downward-opening menu at 1800 by 1100; it is not a general
+overlay geometry evaluator. No production Escape handler changes.
+
+The peer records 2,199 passes, one failure and eight ignores for that failed
+full run, with lint and product builds not run. The earlier final-02 attempt
+was interrupted during harness listing before test bodies; neither attempt is
+a passed gate. [Preserved attempts and v2 recipe](http://217.177.34.108:3000/sorokin.oleg.edu/ARCADIA-Studio/src/commit/184c1307d1ae3d49007480020fa1c080c94ececa/harness/prerelease37-windows-gates-20260924/attempts-8dd)
+retain their distinct boundaries. The corrected source requires current
+combined Windows gates and packaged native acceptance.
+
 ## Combined gates and package handoff
 
 The first peer compilation exposed E0425 in the new Route fixture: its
@@ -90,6 +114,16 @@ single test line. Production code is unchanged. This concrete finding supersedes
 the earlier `9e99618c` build handoff; the failed compile ran no tests and remains
 part of the peer's evidence. Source review and formatting did not catch it.
 
+The first combined Windows attempt on `897d9f04` then found E0433 in the
+Allocation Text Apply test added at `542b10ac`: the test's module lacked
+`iced::widget::text_editor`. The current successor incorporates peer
+`7c2b06b63f8a0fe14b3f001996bdf965b36a4e85`, adding that import only. Production
+code remains unchanged. The failed combined compile ran no tests, lint or
+product build; its 3,709 source inputs stayed unchanged and formatting passed.
+[Preserved failure evidence](http://217.177.34.108:3000/sorokin.oleg.edu/ARCADIA-Studio/src/commit/2bd0e615204be728b5c2b77cc7e28504c18a2277/harness/prerelease37-windows-gates-20260924/README.md)
+records that distinct failure. The corrected successor requires fresh combined
+execution; no earlier pass is substituted.
+
 Codex-ytr83r owns the exact-candidate Windows build/package on its separate
 machine. Codex-9e8r6t owns independent source/seam review and a downloaded-package
 check. Codex-956atf remains the sole integration, tag and release publication owner.