flowproof 0.23.3__tar.gz → 0.23.4__tar.gz

{flowproof-0.23.3 → flowproof-0.23.4}/Cargo.lock

@@ -930,7 +930,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-adapters"
-version = "0.23.3"
+version = "0.23.4"
 dependencies = [
  "anyhow",
  "flowproof-driver",
@@ -949,7 +949,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-agent"
-version = "0.23.3"
+version = "0.23.4"
 dependencies = [
  "chrono",
  "flowproof-driver",
@@ -967,7 +967,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-cli"
-version = "0.23.3"
+version = "0.23.4"
 dependencies = [
  "ab_glyph",
  "chrono",
@@ -992,7 +992,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-driver"
-version = "0.23.3"
+version = "0.23.4"
 dependencies = [
  "calamine",
  "flowproof-trace",
@@ -1008,7 +1008,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-python"
-version = "0.23.3"
+version = "0.23.4"
 dependencies = [
  "flowproof-agent",
  "flowproof-cli",
@@ -1020,7 +1020,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-replay"
-version = "0.23.3"
+version = "0.23.4"
 dependencies = [
  "chrono",
  "flowproof-agent",
@@ -1034,7 +1034,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-trace"
-version = "0.23.3"
+version = "0.23.4"
 dependencies = [
  "jsonschema",
  "regex",

{flowproof-0.23.3 → flowproof-0.23.4}/Cargo.toml

@@ -22,7 +22,7 @@ members = ["crates/flowproof-driver", "crates/flowproof-trace", "crates/flowproo
 exclude = ["spike/windows-containment"]
 
 [workspace.package]
-version = "0.23.3"
+version = "0.23.4"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/automators-com/flowproof"

{flowproof-0.23.3 → flowproof-0.23.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowproof
-Version: 0.23.3
+Version: 0.23.4
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3

{flowproof-0.23.3 → flowproof-0.23.4}/crates/flowproof-adapters/src/web.rs

@@ -4917,7 +4917,7 @@ impl AppDriver for WebAppDriver {
                 standInHosts.add(host);
               }
               const interactive = el => el.matches(
-                'input, button, a, select, textarea, [role=button], [role=checkbox], [role=radio], [role=menuitem], [draggable], [ondrop], .draggable-row, .droparea'
+                'input, button, a, select, textarea, [role=textbox], [role=combobox], [role=button], [role=checkbox], [role=radio], [role=menuitem], [draggable], [ondrop], .draggable-row, .droparea'
               ) || (!!el.id && el.children.length === 0 && ['DIV', 'SPAN'].includes(el.tagName)) ||
                 styledLeaf(el) || standInHosts.has(el);
               const readableLeaf = el => {
@@ -4927,7 +4927,23 @@ impl AppDriver for WebAppDriver {
                   (child.textContent || '').trim()
                 ) && (semanticCss(el) || scopedReadable(el));
               };
-              const ordered = all.filter(interactive).concat(
+              // Empty custom grid editors are controls too. Keep the first
+              // editable row ahead of decorative toolbar leaves so the scene
+              // budget cannot remove the fields needed to create an item.
+              const firstGridRows = new Set();
+              for (const editor of all.filter(el => el.matches('[role=textbox], [role=combobox]'))) {
+                if (!isRendered(editor)) continue;
+                const cell = editor.closest('[role=gridcell]');
+                const row = cell && cell.closest('tr, [role=row]');
+                const grid = cell && cell.closest('table, [role=grid]');
+                if (row && grid && !Array.from(firstGridRows).some(r => r.closest('table, [role=grid]') === grid)) {
+                  firstGridRows.add(row);
+                }
+              }
+              const priorityField = el => el.matches('input, select, textarea') ||
+                (el.matches('[role=textbox], [role=combobox]') &&
+                  firstGridRows.has(el.closest('tr, [role=row]')));
+              const ordered = all.filter(priorityField).concat(all.filter(interactive),
                 all.filter(el => !interactive(el) && readableLeaf(el))
               );
               const seen = new Set();
@@ -4962,8 +4978,15 @@ impl AppDriver for WebAppDriver {
               const entries = chosen.map(el => {
                 const css = cssPath(el);
                 const scoped = !interactive(el) && !semanticCss(el) ? scopedReadable(el) : null;
+                const labelledBy = (el.getAttribute('aria-labelledby') || '').split(/\s+/)
+                  .map(id => document.getElementById(id)?.textContent?.trim() || '').filter(Boolean).join(' ');
                 const label = el.labels && el.labels[0] ? el.labels[0].textContent.trim()
-                    : (el.getAttribute('aria-label') || el.getAttribute('placeholder') || '');
+                    : (el.getAttribute('aria-label') || labelledBy || el.getAttribute('placeholder') || '');
+                const gridCell = el.closest('[role=gridcell]');
+                const rowIndex = gridCell && (gridCell.getAttribute('aria-rowindex') ||
+                  gridCell.getAttribute('lsmatrixrowindex') ||
+                  gridCell.closest('[role=row]')?.getAttribute('aria-rowindex'));
+
                 const ticks = el.tagName === 'INPUT' && ['checkbox', 'radio'].includes(el.type);
                 const isField = ['INPUT', 'SELECT', 'TEXTAREA'].includes(el.tagName);
                 const entry = {
@@ -4973,7 +4996,9 @@ impl AppDriver for WebAppDriver {
                     actionable: interactive(el),
                     type: el.getAttribute('type') || undefined,
                     text: (el.textContent || '').trim().slice(0, 80) || undefined,
-                    label: label || undefined,
+                    label: label.trim().slice(0, 160) || undefined,
+                    row: rowIndex || undefined,
+                    role: el.getAttribute('role') || undefined,
                     value: fieldValue(el),
                     checked: ticks ? el.checked : undefined,
                     required: el.required || undefined,

flowproof-0.23.4/crates/flowproof-adapters/tests/grid_scene_e2e.rs

@@ -0,0 +1,54 @@
+//! SAP-style empty custom editors must survive a crowded scene inventory.
+use flowproof_driver::AppDriver;
+
+#[test]
+fn empty_grid_editors_have_column_labels_and_row_identity() {
+    if std::env::var("FLOWPROOF_E2E").as_deref() != Ok("1") {
+        return;
+    }
+    let _guard = flowproof_adapters::SharedBrowserGuard::new();
+    let toolbar = (0..120)
+        .map(|i| format!("<span id='tool{i}'>Tool {i}</span>"))
+        .collect::<String>();
+    let html = format!(
+        r#"<html><body>{toolbar}
+      <table><tr><th id="material-label">Material</th><th id="plant-label">Plant</th></tr>
+      <tr><td role="gridcell" lsmatrixrowindex="1"><span id="material" role="textbox" aria-labelledby="material-label" tabindex="0" style="display:block;width:100px;height:24px"></span></td>
+      <td role="gridcell" lsmatrixrowindex="1"><span id="plant" role="textbox" aria-labelledby="plant-label" tabindex="0" style="display:block;width:100px;height:24px"></span></td></tr></table>
+      <input type="password" value="never-export-this">
+      </body></html>"#
+    );
+    let listener = std::net::TcpListener::bind("127.0.0.1:0").expect("fixture listener");
+    let port = listener.local_addr().expect("listener address").port();
+    std::thread::spawn(move || {
+        use std::io::{Read, Write};
+        for mut stream in listener.incoming().flatten() {
+            let mut buf = [0; 2048];
+            let _ = stream.read(&mut buf);
+            let _ = write!(stream, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}", html.len(), html);
+        }
+    });
+    let mut driver = flowproof_adapters::WebAppDriver::new().expect("Chrome launches");
+    driver
+        .launch(
+            &format!("http://127.0.0.1:{port}"),
+            "",
+            std::time::Duration::from_secs(30),
+        )
+        .expect("fixture loads");
+    let scene = driver.scene().expect("scene reads").expect("scene exists");
+    let entries: serde_json::Value = serde_json::from_str(&scene).expect("scene JSON");
+    for (id, label) in [("material", "Material"), ("plant", "Plant")] {
+        let entry = entries
+            .as_array()
+            .expect("scene entries")
+            .iter()
+            .find(|e| e["target"] == format!("css:#{id}"))
+            .expect("empty editor in scene");
+        assert_eq!(entry["label"], label);
+        assert_eq!(entry["row"], "1");
+        assert_eq!(entry["actionable"], true);
+        assert_eq!(entry["role"], "textbox");
+    }
+    assert!(!scene.contains("never-export-this"));
+}

{flowproof-0.23.3 → flowproof-0.23.4}/flowproof/__init__.py

@@ -24,7 +24,7 @@ from flowproof.flow import (
     run,
 )
 
-__version__ = "0.23.3"
+__version__ = "0.23.4"
 
 __all__ = [
     "ClarificationNeeded",

{flowproof-0.23.3 → flowproof-0.23.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "flowproof"
-version = "0.23.3"
+version = "0.23.4"
 description = "Test that a bot only ever does the job it was given — and never deletes, sends or approves the thing it must not. Record it doing the job once, then replay on every commit with zero LLM calls. For the agents and RPA already running real work in production: web, desktop, SAP, Citrix."
 readme = "README.md"
 license = "Apache-2.0"