Use Gio clipboard commands on Android

.gitea/workflows/ci.yml

@@ -0,0 +1,173 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+      - "release-*"
+      - "[0-9]+.[0-9]+.[0-9]+*"
+
+permissions:
+  contents: write
+
+env:
+  GO_VERSION: "1.26.1"
+  ANDROID_SDK_ROOT: /opt/android-sdk
+  ANDROID_NDK_ROOT: /opt/android-sdk/ndk
+  JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
+  DIST_DIR: dist
+
+jobs:
+  lint-test:
+    runs-on: keepassgo-android
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install native build dependencies
+        shell: bash
+        run: |
+          set -euo pipefail
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update
+          apt-get install -y --no-install-recommends \
+            zsh \
+            pkg-config \
+            libx11-dev \
+            libx11-xcb-dev \
+            libxkbcommon-dev \
+            libxkbcommon-x11-dev \
+            libwayland-dev \
+            libvulkan-dev \
+            libegl1-mesa-dev \
+            libxcursor-dev \
+            libxfixes-dev
+
+      - name: Lint
+        shell: bash
+        run: |
+          set -euo pipefail
+          state_dir="$(mktemp -d)"
+          trap 'rm -rf -- "$state_dir"' EXIT
+          KEEPASSGO_STATE_DIR="$state_dir" go tool golangci-lint run --build-tags nox11,nowayland,novulkan ./...
+
+      - name: Test
+        shell: bash
+        run: |
+          set -euo pipefail
+          state_dir="$(mktemp -d)"
+          trap 'rm -rf -- "$state_dir"' EXIT
+          KEEPASSGO_STATE_DIR="$state_dir" go test -tags nox11,nowayland,novulkan ./...
+
+  build:
+    needs: lint-test
+    runs-on: keepassgo-android
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install native build dependencies
+        shell: bash
+        run: |
+          set -euo pipefail
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update
+          apt-get install -y --no-install-recommends \
+            zsh \
+            pkg-config \
+            libx11-dev \
+            libx11-xcb-dev \
+            libxkbcommon-dev \
+            libxkbcommon-x11-dev \
+            libwayland-dev \
+            libvulkan-dev \
+            libegl1-mesa-dev \
+            libxcursor-dev \
+            libxfixes-dev
+
+      - name: Prepare dist directory
+        shell: bash
+        run: |
+          set -euo pipefail
+          mkdir -p "${DIST_DIR}"
+
+      - name: Build desktop binaries
+        shell: bash
+        run: |
+          set -euo pipefail
+          # Gio needs a Linux ARM64 cgo cross-toolchain for desktop builds.
+          # Keep the CI matrix to targets this runner can build reproducibly.
+          for target in \
+            "linux amd64" \
+            "windows amd64" \
+            "windows arm64"
+          do
+            set -- ${target}
+            goos="$1"
+            goarch="$2"
+            ext=""
+            cgo_enabled=0
+            if [[ "${goos}" == "linux" ]]; then
+              cgo_enabled=1
+            fi
+            if [[ "${goos}" == "windows" ]]; then
+              ext=".exe"
+            fi
+            out="${DIST_DIR}/keepassgo-${goos}-${goarch}${ext}"
+            GOOS="${goos}" GOARCH="${goarch}" CGO_ENABLED="${cgo_enabled}" go build -o "${out}" .
+          done
+
+      - name: Build APK
+        shell: bash
+        run: |
+          set -euo pipefail
+          make apk
+          cp build/keepassgo.apk "${DIST_DIR}/keepassgo.apk"
+
+      - name: Upload CI artifacts
+        uses: christopherhx/gitea-upload-artifact@v4
+        env:
+          NODE_OPTIONS: --use-system-ca
+          SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
+        with:
+          name: keepassgo-${{ gitea.sha }}
+          path: |
+            dist/keepassgo-linux-amd64
+            dist/keepassgo-windows-amd64.exe
+            dist/keepassgo-windows-arm64.exe
+            dist/keepassgo.apk
+          retention-days: 30
+
+      - name: Publish release artifacts
+        if: startsWith(gitea.ref, 'refs/tags/')
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          GITEA_SERVER_URL: ${{ gitea.server_url }}
+          GITEA_REPOSITORY: ${{ gitea.repository }}
+          GITEA_REF_NAME: ${{ gitea.ref_name }}
+          SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
+          REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
+        shell: bash
+        run: |
+          set -euo pipefail
+          python3 scripts/gitea_release.py \
+            --server "${GITEA_SERVER_URL}" \
+            --repo "${GITEA_REPOSITORY}" \
+            --token "${GITEA_TOKEN}" \
+            --tag "${GITEA_REF_NAME}" \
+            "${DIST_DIR}/keepassgo-linux-amd64" \
+            "${DIST_DIR}/keepassgo-windows-amd64.exe" \
+            "${DIST_DIR}/keepassgo-windows-arm64.exe" \
+            "${DIST_DIR}/keepassgo.apk"

Makefile

@@ -9,7 +9,7 @@ ANDROID_MIN_SDK ?= 28
 ANDROID_TARGET_SDK ?= 35
 
 .PHONY: apk
-apk:
+apk: android/keepassgo-android.jar
 	@test -x "$(JAVA_HOME)/bin/java" || { echo "JAVA_HOME must point to a working JDK install"; exit 1; }
 	@test -d "$(ANDROID_SDK_ROOT)" || { echo "ANDROID_SDK_ROOT must point to an Android SDK install"; exit 1; }
 	@test -d "$(ANDROID_NDK_ROOT)" || { echo "ANDROID_NDK_ROOT must point to an Android NDK install"; exit 1; }
@@ -30,3 +30,15 @@ apk:
 		-targetsdk $(ANDROID_TARGET_SDK) \
 		-icon assets/keepassgo-icon.png \
 		.
+
+android/keepassgo-android.jar: $(shell find androidsrc -type f | sort)
+	@test -x "$(JAVA_HOME)/bin/javac" || { echo "JAVA_HOME must point to a working JDK install"; exit 1; }
+	@test -f "$(ANDROID_SDK_ROOT)/platforms/android-$(ANDROID_TARGET_SDK)/android.jar" || { echo "Android platform android-$(ANDROID_TARGET_SDK) is missing"; exit 1; }
+	@mkdir -p android
+	@zsh -lc 'tmpdir=$$(mktemp -d); \
+		trap '\''python3 -c "import shutil,sys; shutil.rmtree(sys.argv[1], ignore_errors=True)" "$$tmpdir"'\'' EXIT; \
+		"$(JAVA_HOME)/bin/javac" \
+			-classpath "$(ANDROID_SDK_ROOT)/platforms/android-$(ANDROID_TARGET_SDK)/android.jar" \
+			-d "$$tmpdir" \
+			$$(find androidsrc -name '\''*.java'\'' | sort); \
+		"$(JAVA_HOME)/bin/jar" --create --file "$$(pwd)/android/keepassgo-android.jar" -C "$$tmpdir" .'

TODO.md

@@ -6,6 +6,102 @@ These segments are intended to be independently executable wherever possible.
 Each segment has its own local exit criteria.
 The product is not complete until the global exit criteria at the end of this file are also met.
 
+## UI Review Follow-Ups
+
+These items came from a hands-on emulator and desktop walkthrough.
+They should be treated as usability work, not just polish.
+
+### Primary Workflow Changes
+
+These should remain in the main user flow rather than being hidden behind a settings gear.
+
+- Local open flow:
+  make the start screen primarily about opening a vault, not configuring one.
+- Local open flow:
+  keep recent vault selection visually obvious and clearly tappable.
+- Local open flow:
+  once a recent vault is preselected, collapse the full path into a compact summary with a `Change...` affordance.
+- Local open flow:
+  improve Android field focus and IME behavior so the master-password field reliably takes focus and summons the keyboard.
+- Local open flow:
+  show an explicit progress state and allow cancel or retry while opening a vault, especially on Android.
+- Remote open flow:
+  break the remote form into clearer sections such as `Location` and `Authentication`.
+- Remote open flow:
+  make recent remote connections easier to scan with a friendlier label than raw URL and path.
+- Locked screen:
+  show clear vault identity and target summary so the user knows what is being unlocked.
+- Entries screen:
+  tighten the top strip on phone so tabs, breadcrumbs, and group controls do not fight for the same row.
+- Entries screen:
+  make breadcrumbs compress more aggressively on phone.
+- Entries screen:
+  improve entry-row hierarchy and selected-state contrast.
+- Entries screen:
+  provide section-specific empty states for search, recycle bin, API tokens, and empty groups.
+- Group navigation:
+  make the distinction between root, current group, and child groups more obvious.
+- Group navigation:
+  separate navigation controls from group-management controls more clearly.
+- Entry detail:
+  tighten field spacing and reduce unnecessary whitespace.
+- Entry detail:
+  group password reveal and copy actions more clearly.
+- Entry detail:
+  make attachments more visible and actionable.
+- Entry edit:
+  break the editor into clearer subsections such as `Basics`, `Notes`, `Custom Fields`, `History`, and `Attachments`.
+- Entry edit:
+  make add/remove affordances for custom fields more visually obvious.
+- Entry edit:
+  make generated-password draft state more explicit before save.
+- Recycle bin:
+  make it visually distinct from normal entry browsing.
+- API tokens:
+  give token list, token detail, and policy editing a clearer dedicated management surface.
+- API tokens:
+  make policy rows easier to scan by separating effect, operation, and resource visually.
+- API audit:
+  improve empty-state guidance and provide quick filtering by token, decision, and operation.
+- Synchronize:
+  keep the split-button pattern, but reduce the visual weight of the sync controls and make advanced sync affordances clearer.
+- Synchronize:
+  avoid layout-shifting success banners and keep noncritical notifications ephemeral.
+- Phone layout:
+  continue reducing header and control density so content appears sooner.
+- Mobile reliability:
+  fix Android local-open ANR behavior before deeper mobile polish.
+- Autofill UX:
+  surface whether a fill candidate was found, ambiguous, blocked, or awaiting approval.
+
+### Settings Gear Candidates
+
+These are important, but they should likely move behind a dedicated settings gear or advanced/settings surface instead of occupying first-run or day-to-day credential screens.
+
+- Vault security:
+  move `Cipher` and `KDF` off the main local-open screen and into `Advanced` or `Vault Settings`.
+- Vault security:
+  frame security settings as vault configuration rather than freeform text fields in the primary workflow.
+- Remote preferences:
+  move remembered-auth behavior details and retention policy explanations into settings/help rather than the main open flow.
+- UI preferences:
+  save and expose view preferences such as group-tools collapse state and any future dense/comfortable layout toggle under settings.
+- Autofill behavior:
+  app and browser allowlists, package rules, and first-fill approval preferences should live under a settings/privacy area.
+- Sync defaults:
+  source/direction defaults, conflict preferences, and any future background sync behavior should live under settings.
+- Notification preferences:
+  banner timeout, ephemeral notices, and other noncritical UI feedback tuning should live under settings.
+- Accessibility preferences:
+  future display-density, contrast, reduced-motion, or keyboard-focus tuning should live under settings.
+
+### Exit Criteria
+
+- The main workflow screens prioritize opening, browsing, copying, editing, and synchronizing credentials.
+- Advanced vault/security and behavior preferences are no longer cluttering the primary open and browsing flows.
+- Phone and desktop layouts both present a clear information hierarchy.
+- The Android open flow is reliable enough to review and use without ANR during ordinary vault-open operations.
+
 ## API Token And gRPC Authorization Parallel Segments
 
 These segments define the work for programmatic access control over gRPC.
@@ -449,6 +545,21 @@ Exit criteria:
 - Focus and accessibility states are visible and intentional.
 - `go test ./...` passes.
 
+### Segment 21: Accessibility Fill Generalization
+
+Scope:
+- Extend Android accessibility-based fill beyond the current Chrome demo path.
+- Support package-specific rules so apps with stable package identities can have tailored matching behavior.
+- Support view-id matching so custom login forms can be identified more reliably than by generic hints alone.
+- Support app allowlists so only approved apps/packages are eligible for accessibility-based credential fill.
+- Require an approval step before filling into a newly seen app/package unless the user has already made a persistent decision.
+
+Exit criteria:
+- The design for package-specific rules, view-id matching, app allowlists, and first-fill approval is implemented or broken into executable sub-slices.
+- Accessibility fill no longer depends solely on Chrome-style generic username/password heuristics.
+- New app/package fill attempts can be allowed, denied, or made persistent by the user.
+- `go test ./...` passes.
+
 ### Segment 17: UI Completion And Error Surfaces
 
 Scope:

android/application_snippets.xml

@@ -0,0 +1,24 @@
+		<service
+			android:name="org.julianfamily.keepassgo.KeePassGOAutofillService"
+			android:exported="true"
+			android:label="KeePassGO Autofill"
+			android:permission="android.permission.BIND_AUTOFILL_SERVICE">
+			<intent-filter>
+				<action android:name="android.service.autofill.AutofillService" />
+			</intent-filter>
+			<meta-data
+				android:name="android.autofill"
+				android:resource="@xml/keepassgo_autofill_service" />
+		</service>
+		<service
+			android:name="org.julianfamily.keepassgo.KeePassGOAccessibilityService"
+			android:exported="true"
+			android:label="KeePassGO Accessibility Fill"
+			android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+			<intent-filter>
+				<action android:name="android.accessibilityservice.AccessibilityService" />
+			</intent-filter>
+			<meta-data
+				android:name="android.accessibilityservice"
+				android:resource="@xml/keepassgo_accessibility_service" />
+		</service>

android/res/xml/keepassgo_accessibility_service.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
+	android:accessibilityEventTypes="typeViewFocused|typeViewTextChanged|typeWindowContentChanged|typeWindowStateChanged"
+	android:accessibilityFeedbackType="feedbackGeneric"
+	android:accessibilityFlags="flagReportViewIds|flagRetrieveInteractiveWindows"
+	android:canRetrieveWindowContent="true"
+	android:notificationTimeout="100"
+	android:settingsActivity="" />

android/res/xml/keepassgo_autofill_service.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<autofill-service xmlns:android="http://schemas.android.com/apk/res/android" />

androidsrc/org/julianfamily/keepassgo/AutofillCacheStore.java

@@ -0,0 +1,334 @@
+package org.julianfamily.keepassgo;
+
+import android.content.Context;
+import android.util.JsonReader;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+final class AutofillCacheStore {
+    private static final String TAG = "KeePassGOAutofill";
+
+    private AutofillCacheStore() {
+    }
+
+    static Entry findBestMatch(Context context, String webDomain) {
+        File cacheFile = findCacheFile(context);
+        if (cacheFile == null) {
+            Log.i(TAG, "autofill cache file not found");
+            return null;
+        }
+        List<Entry> entries;
+        try {
+            entries = readEntries(cacheFile);
+        } catch (IOException err) {
+            Log.e(TAG, "failed to read autofill cache", err);
+            return null;
+        }
+        if (entries.isEmpty()) {
+            return null;
+        }
+        NormalizedTarget target = normalizeURL(webDomain);
+        if (target.host.isEmpty()) {
+            return null;
+        }
+        List<Entry> exactHost = new ArrayList<>();
+        List<Entry> parentHost = new ArrayList<>();
+        for (Entry entry : entries) {
+            if (entryMatchesHost(entry, target.host)) {
+                exactHost.add(entry);
+                continue;
+            }
+            if (entryMatchesParentHost(entry, target.host)) {
+                parentHost.add(entry);
+            }
+        }
+        Entry matched = chooseEntry(target, exactHost);
+        if (matched != null) {
+            return matched;
+        }
+        return chooseEntry(target, parentHost);
+    }
+
+    private static File findCacheFile(Context context) {
+        List<File> candidates = new ArrayList<>();
+        File filesDir = context.getFilesDir();
+        if (filesDir != null) {
+            candidates.add(new File(filesDir, "keepassgo/autofill-cache.json"));
+            candidates.add(new File(filesDir, ".config/keepassgo/autofill-cache.json"));
+            candidates.add(new File(filesDir, "config/keepassgo/autofill-cache.json"));
+        }
+        File baseDir = context.getDataDir();
+        if (baseDir != null) {
+            candidates.add(new File(baseDir, "files/keepassgo/autofill-cache.json"));
+            candidates.add(new File(baseDir, "files/.config/keepassgo/autofill-cache.json"));
+            candidates.add(new File(baseDir, "files/config/keepassgo/autofill-cache.json"));
+        }
+        for (File candidate : candidates) {
+            if (candidate.isFile()) {
+                Log.i(TAG, "using autofill cache " + candidate.getAbsolutePath());
+                return candidate;
+            }
+        }
+        Log.i(TAG, "no autofill cache file in " + candidates);
+        return null;
+    }
+
+    private static List<Entry> readEntries(File cacheFile) throws IOException {
+        List<Entry> entries = new ArrayList<>();
+        try (JsonReader reader = new JsonReader(new InputStreamReader(new FileInputStream(cacheFile), StandardCharsets.UTF_8))) {
+            reader.beginObject();
+            while (reader.hasNext()) {
+                String name = reader.nextName();
+                if ("entries".equals(name)) {
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        entries.add(readEntry(reader));
+                    }
+                    reader.endArray();
+                } else {
+                    reader.skipValue();
+                }
+            }
+            reader.endObject();
+        }
+        return entries;
+    }
+
+    private static Entry readEntry(JsonReader reader) throws IOException {
+        String title = "";
+        String username = "";
+        String password = "";
+        String host = "";
+        String url = "";
+        List<String> targets = new ArrayList<>();
+        reader.beginObject();
+        while (reader.hasNext()) {
+            String name = reader.nextName();
+            switch (name) {
+                case "title":
+                    title = nextString(reader);
+                    break;
+                case "username":
+                    username = nextString(reader);
+                    break;
+                case "password":
+                    password = nextString(reader);
+                    break;
+                case "url":
+                    url = nextString(reader);
+                    break;
+                case "host":
+                    host = normalizeHost(nextString(reader));
+                    break;
+                case "targets":
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        targets.add(nextString(reader));
+                    }
+                    reader.endArray();
+                    break;
+                default:
+                    reader.skipValue();
+                    break;
+            }
+        }
+        reader.endObject();
+        return new Entry(title, username, password, host, url, targets);
+    }
+
+    private static String nextString(JsonReader reader) throws IOException {
+        if (reader.peek() == android.util.JsonToken.NULL) {
+            reader.nextNull();
+            return "";
+        }
+        return reader.nextString();
+    }
+
+    private static String normalizeHost(String raw) {
+        return normalizeURL(raw).host;
+    }
+
+    private static NormalizedTarget normalizeURL(String raw) {
+        if (raw == null) {
+            return new NormalizedTarget("", "", "");
+        }
+        String value = raw.trim().toLowerCase(Locale.US);
+        if (value.startsWith("http://")) {
+            value = value.substring("http://".length());
+        } else if (value.startsWith("https://")) {
+            value = value.substring("https://".length());
+        }
+        int slash = value.indexOf('/');
+        if (slash >= 0) {
+            value = value.substring(0, slash);
+        }
+        int colon = value.indexOf(':');
+        if (colon >= 0) {
+            value = value.substring(0, colon);
+        }
+        String host = value;
+        String path = "/";
+        int schemeSep = raw.indexOf("://");
+        String original = raw.trim();
+        if (schemeSep < 0) {
+            original = "https://" + original;
+        }
+        try {
+            java.net.URI uri = java.net.URI.create(original);
+            if (uri.getHost() != null) {
+                host = uri.getHost().toLowerCase(Locale.US);
+            }
+            path = cleanPath(uri.getPath());
+        } catch (IllegalArgumentException ignored) {
+            path = "/";
+        }
+        return new NormalizedTarget(host, path, host + path);
+    }
+
+    private static String cleanPath(String raw) {
+        if (raw == null || raw.trim().isEmpty() || "/".equals(raw.trim())) {
+            return "/";
+        }
+        String value = raw.trim();
+        while (value.endsWith("/") && value.length() > 1) {
+            value = value.substring(0, value.length() - 1);
+        }
+        if (!value.startsWith("/")) {
+            value = "/" + value;
+        }
+        return value;
+    }
+
+    private static Entry chooseEntry(NormalizedTarget target, List<Entry> entries) {
+        if (entries.isEmpty()) {
+            return null;
+        }
+        if (entries.size() == 1) {
+            return entries.get(0);
+        }
+
+        List<Entry> exact = new ArrayList<>();
+        List<Entry> prefix = new ArrayList<>();
+        int bestPrefixLen = -1;
+        for (Entry entry : entries) {
+            MatchQuality quality = bestTargetMatch(entry, target);
+            if (quality.exact) {
+                exact.add(entry);
+                continue;
+            }
+            if (quality.prefixLength <= 0) {
+                continue;
+            }
+            if (quality.prefixLength > bestPrefixLen) {
+                prefix.clear();
+                prefix.add(entry);
+                bestPrefixLen = quality.prefixLength;
+            } else if (quality.prefixLength == bestPrefixLen) {
+                prefix.add(entry);
+            }
+        }
+        if (exact.size() == 1) {
+            return exact.get(0);
+        }
+        if (exact.size() > 1 || prefix.isEmpty()) {
+            return null;
+        }
+
+        return prefix.size() == 1 ? prefix.get(0) : null;
+    }
+
+    private static boolean entryMatchesHost(Entry entry, String host) {
+        for (NormalizedTarget target : entryTargets(entry)) {
+            if (target.host.equals(host)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean entryMatchesParentHost(Entry entry, String host) {
+        for (NormalizedTarget target : entryTargets(entry)) {
+            if (!target.host.isEmpty() && host.endsWith("." + target.host)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static List<NormalizedTarget> entryTargets(Entry entry) {
+        List<String> rawTargets = entry.targets;
+        if (rawTargets.isEmpty()) {
+            rawTargets = new ArrayList<>();
+            rawTargets.add(entry.url);
+        }
+        List<NormalizedTarget> targets = new ArrayList<>();
+        for (String rawTarget : rawTargets) {
+            NormalizedTarget target = normalizeURL(rawTarget);
+            if (!target.host.isEmpty()) {
+                targets.add(target);
+            }
+        }
+        return targets;
+    }
+
+    private static MatchQuality bestTargetMatch(Entry entry, NormalizedTarget target) {
+        int bestPrefixLen = -1;
+        for (NormalizedTarget entryTarget : entryTargets(entry)) {
+            if (entryTarget.url.equals(target.url)) {
+                return new MatchQuality(true, 0);
+            }
+            if (!"/".equals(entryTarget.path) && target.path.startsWith(entryTarget.path)) {
+                bestPrefixLen = Math.max(bestPrefixLen, entryTarget.path.length());
+            }
+        }
+        return new MatchQuality(false, bestPrefixLen);
+    }
+
+    static final class Entry {
+        final String title;
+        final String username;
+        final String password;
+        final String host;
+        final String url;
+        final List<String> targets;
+
+        Entry(String title, String username, String password, String host, String url, List<String> targets) {
+            this.title = title;
+            this.username = username;
+            this.password = password;
+            this.host = host;
+            this.url = url;
+            this.targets = new ArrayList<>(targets);
+        }
+    }
+
+    private static final class MatchQuality {
+        final boolean exact;
+        final int prefixLength;
+
+        MatchQuality(boolean exact, int prefixLength) {
+            this.exact = exact;
+            this.prefixLength = prefixLength;
+        }
+    }
+
+    private static final class NormalizedTarget {
+        final String host;
+        final String path;
+        final String url;
+
+        NormalizedTarget(String host, String path, String url) {
+            this.host = host;
+            this.path = path;
+            this.url = url;
+        }
+    }
+}

androidsrc/org/julianfamily/keepassgo/KeePassGOAccessibilityService.java

@@ -0,0 +1,195 @@
+package org.julianfamily.keepassgo;
+
+import android.accessibilityservice.AccessibilityService;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class KeePassGOAccessibilityService extends AccessibilityService {
+    private static final String TAG = "KeePassGOA11y";
+
+    private String lastFilledSignature = "";
+
+    @Override
+    public void onAccessibilityEvent(AccessibilityEvent event) {
+        try {
+            AccessibilityNodeInfo root = getRootInActiveWindow();
+            if (root == null) {
+                return;
+            }
+            CharSequence packageName = root.getPackageName();
+            if (packageName == null || !"com.android.chrome".contentEquals(packageName)) {
+                return;
+            }
+
+            ChromeForm form = inspectChrome(root);
+            if (form == null || form.passwordField == null) {
+                return;
+            }
+            AutofillCacheStore.Entry entry = AutofillCacheStore.findBestMatch(this, form.url);
+            if (entry == null) {
+                Log.i(TAG, "no accessibility-fill match for " + form.url);
+                return;
+            }
+
+            String signature = form.url + "|" + entry.username + "|" + nodeKey(form.passwordField);
+            if (signature.equals(lastFilledSignature)) {
+                return;
+            }
+
+            boolean filled = false;
+            if (form.usernameField != null) {
+                filled |= setNodeText(form.usernameField, entry.username);
+            }
+            filled |= setNodeText(form.passwordField, entry.password);
+            if (filled) {
+                lastFilledSignature = signature;
+                Log.i(TAG, "filled login form for " + form.url + " with " + entry.username);
+            }
+        } catch (Exception err) {
+            Log.e(TAG, "accessibility fill failed", err);
+        }
+    }
+
+    @Override
+    public void onInterrupt() {
+        Log.i(TAG, "accessibility service interrupted");
+    }
+
+    private static ChromeForm inspectChrome(AccessibilityNodeInfo root) {
+        List<AccessibilityNodeInfo> editables = new ArrayList<>();
+        ChromeForm form = new ChromeForm();
+        walk(root, editables, form);
+        if (form.url.isEmpty()) {
+            return null;
+        }
+        if (form.passwordField == null) {
+            for (AccessibilityNodeInfo node : editables) {
+                if (isPasswordNode(node)) {
+                    form.passwordField = node;
+                    break;
+                }
+            }
+        }
+        if (form.usernameField == null && form.passwordField != null) {
+            for (AccessibilityNodeInfo node : editables) {
+                if (node.equals(form.passwordField)) {
+                    continue;
+                }
+                if (isUsernameNode(node)) {
+                    form.usernameField = node;
+                    break;
+                }
+            }
+            if (form.usernameField == null) {
+                for (AccessibilityNodeInfo node : editables) {
+                    if (node.equals(form.passwordField)) {
+                        continue;
+                    }
+                    form.usernameField = node;
+                    break;
+                }
+            }
+        }
+        return form;
+    }
+
+    private static void walk(
+            AccessibilityNodeInfo node,
+            List<AccessibilityNodeInfo> editables,
+            ChromeForm form
+    ) {
+        if (node == null) {
+            return;
+        }
+        CharSequence viewID = node.getViewIdResourceName();
+        if (viewID != null && viewID.toString().endsWith(":id/url_bar")) {
+            CharSequence text = node.getText();
+            if (text != null) {
+                form.url = text.toString().trim();
+            }
+        }
+        if (node.isEditable()) {
+            editables.add(node);
+            if (form.passwordField == null && isPasswordNode(node)) {
+                form.passwordField = node;
+            } else if (form.usernameField == null && isUsernameNode(node)) {
+                form.usernameField = node;
+            }
+        }
+        for (int i = 0; i < node.getChildCount(); i++) {
+            AccessibilityNodeInfo child = node.getChild(i);
+            if (child != null) {
+                walk(child, editables, form);
+            }
+        }
+    }
+
+    private static boolean isPasswordNode(AccessibilityNodeInfo node) {
+        if (node.isPassword()) {
+            return true;
+        }
+        return nodeMatches(node, "password");
+    }
+
+    private static boolean isUsernameNode(AccessibilityNodeInfo node) {
+        if (isPasswordNode(node)) {
+            return false;
+        }
+        return nodeMatches(node, "username")
+                || nodeMatches(node, "email")
+                || nodeMatches(node, "login")
+                || nodeMatches(node, "user");
+    }
+
+    private static boolean nodeMatches(AccessibilityNodeInfo node, String term) {
+        String lowerTerm = term.toLowerCase();
+        return containsLower(node.getHintText(), lowerTerm)
+                || containsLower(node.getText(), lowerTerm)
+                || containsLower(node.getContentDescription(), lowerTerm)
+                || containsLower(node.getViewIdResourceName(), lowerTerm)
+                || containsLower(node.getPaneTitle(), lowerTerm);
+    }
+
+    private static boolean containsLower(CharSequence value, String term) {
+        return value != null && value.toString().toLowerCase().contains(term);
+    }
+
+    private static boolean setNodeText(AccessibilityNodeInfo node, String value) {
+        if (node == null || !node.isEditable() || value == null) {
+            return false;
+        }
+        Bundle args = new Bundle();
+        args.putCharSequence(
+                AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE,
+                value
+        );
+        return node.performAction(AccessibilityNodeInfo.ACTION_SET_TEXT, args);
+    }
+
+    private static String nodeKey(AccessibilityNodeInfo node) {
+        CharSequence viewID = node.getViewIdResourceName();
+        if (viewID != null) {
+            return viewID.toString();
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            return String.valueOf(node.getUniqueId());
+        }
+        CharSequence hint = node.getHintText();
+        if (hint != null) {
+            return hint.toString();
+        }
+        return String.valueOf(node.hashCode());
+    }
+
+    private static final class ChromeForm {
+        String url = "";
+        AccessibilityNodeInfo usernameField;
+        AccessibilityNodeInfo passwordField;
+    }
+}

androidsrc/org/julianfamily/keepassgo/KeePassGOAutofillService.java

@@ -0,0 +1,215 @@
+package org.julianfamily.keepassgo;
+
+import android.app.assist.AssistStructure;
+import android.os.CancellationSignal;
+import android.service.autofill.AutofillService;
+import android.service.autofill.Dataset;
+import android.service.autofill.FillCallback;
+import android.service.autofill.FillContext;
+import android.service.autofill.FillRequest;
+import android.service.autofill.FillResponse;
+import android.service.autofill.SaveCallback;
+import android.service.autofill.SaveRequest;
+import android.text.InputType;
+import android.util.Log;
+import android.view.View;
+import android.view.autofill.AutofillId;
+import android.view.autofill.AutofillValue;
+import android.widget.RemoteViews;
+
+import java.util.List;
+
+public final class KeePassGOAutofillService extends AutofillService {
+    private static final String TAG = "KeePassGOAutofill";
+    private static final String APP_SCHEME = "androidapp://";
+
+    @Override
+    public void onConnected() {
+        super.onConnected();
+        Log.i(TAG, "service connected");
+    }
+
+    @Override
+    public void onDisconnected() {
+        Log.i(TAG, "service disconnected");
+        super.onDisconnected();
+    }
+
+    @Override
+    public void onFillRequest(
+            FillRequest request,
+            CancellationSignal cancellationSignal,
+            FillCallback callback
+    ) {
+        try {
+            Log.i(TAG, "fill request flags=" + request.getFlags());
+            List<FillContext> contexts = request.getFillContexts();
+            if (contexts.isEmpty()) {
+                Log.i(TAG, "fill request had no contexts");
+                callback.onSuccess(null);
+                return;
+            }
+
+            AssistStructure structure = contexts.get(contexts.size() - 1).getStructure();
+            ParsedFields fields = new ParsedFields();
+            ParsedTarget target = parseWindow(structure, fields);
+            Log.i(
+                    TAG,
+                    "parsed target=" + target.matchTarget
+                            + " package=" + target.packageName
+                            + " usernameId=" + fields.usernameId
+                            + " passwordId=" + fields.passwordId
+            );
+            if (fields.passwordId == null) {
+                Log.i(TAG, "no password field found");
+                callback.onSuccess(null);
+                return;
+            }
+
+            AutofillCacheStore.Entry entry = AutofillCacheStore.findBestMatch(this, target.matchTarget);
+            if (entry == null) {
+                Log.i(TAG, "no autofill cache match");
+                callback.onSuccess(null);
+                return;
+            }
+            Log.i(TAG, "matched entry title=" + entry.title + " user=" + entry.username + " host=" + entry.host);
+
+            RemoteViews presentation = new RemoteViews(getPackageName(), android.R.layout.simple_list_item_1);
+            presentation.setTextViewText(
+                    android.R.id.text1,
+                    entry.title + " (" + entry.username + ")"
+            );
+
+            Dataset.Builder dataset = new Dataset.Builder(presentation);
+            if (fields.usernameId != null) {
+                dataset.setValue(fields.usernameId, AutofillValue.forText(entry.username));
+            }
+            dataset.setValue(fields.passwordId, AutofillValue.forText(entry.password));
+
+            FillResponse response = new FillResponse.Builder()
+                    .addDataset(dataset.build())
+                    .build();
+            Log.i(TAG, "returning dataset");
+            callback.onSuccess(response);
+        } catch (Exception err) {
+            Log.e(TAG, "fill request failed", err);
+            callback.onFailure(err.getMessage());
+        }
+    }
+
+    @Override
+    public void onSaveRequest(SaveRequest request, SaveCallback callback) {
+        Log.i(TAG, "save request");
+        callback.onSuccess();
+    }
+
+    private static ParsedTarget parseWindow(AssistStructure structure, ParsedFields fields) {
+        String domain = "";
+        final int windowCount = structure.getWindowNodeCount();
+        for (int i = 0; i < windowCount; i++) {
+            AssistStructure.ViewNode root = structure.getWindowNodeAt(i).getRootViewNode();
+            String next = parseNode(root, fields);
+            if (!next.isEmpty()) {
+                domain = next;
+            }
+        }
+        String packageName = "";
+        if (structure.getActivityComponent() != null) {
+            packageName = structure.getActivityComponent().getPackageName();
+        }
+        if (!domain.isEmpty()) {
+            return new ParsedTarget(domain, packageName);
+        }
+        if (packageName != null && !packageName.isEmpty()) {
+            return new ParsedTarget(APP_SCHEME + packageName, packageName);
+        }
+        return new ParsedTarget("", "");
+    }
+
+    private static String parseNode(AssistStructure.ViewNode node, ParsedFields fields) {
+        String domain = "";
+        if (node.getWebDomain() != null) {
+            domain = node.getWebDomain();
+        }
+
+        AutofillId id = node.getAutofillId();
+        if (id != null) {
+            if (fields.passwordId == null && isPasswordNode(node)) {
+                fields.passwordId = id;
+            } else if (fields.usernameId == null && isUsernameNode(node)) {
+                fields.usernameId = id;
+            }
+        }
+
+        for (int i = 0; i < node.getChildCount(); i++) {
+            String childDomain = parseNode(node.getChildAt(i), fields);
+            if (!childDomain.isEmpty()) {
+                domain = childDomain;
+            }
+        }
+        return domain;
+    }
+
+    private static boolean isPasswordNode(AssistStructure.ViewNode node) {
+        int inputType = node.getInputType();
+        int variation = inputType & InputType.TYPE_MASK_VARIATION;
+        if (variation == InputType.TYPE_TEXT_VARIATION_PASSWORD
+                || variation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
+                || variation == InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD) {
+            return true;
+        }
+        return nodeMatches(node, "password");
+    }
+
+    private static boolean isUsernameNode(AssistStructure.ViewNode node) {
+        int autofillType = node.getAutofillType();
+        if (autofillType != View.AUTOFILL_TYPE_TEXT) {
+            return false;
+        }
+        if (isPasswordNode(node)) {
+            return false;
+        }
+        return nodeMatches(node, "username")
+                || nodeMatches(node, "email")
+                || nodeMatches(node, "login")
+                || nodeMatches(node, "user");
+    }
+
+    private static boolean nodeMatches(AssistStructure.ViewNode node, String term) {
+        String lowerTerm = term.toLowerCase();
+        String[] hints = node.getAutofillHints();
+        if (hints != null) {
+            for (String hint : hints) {
+                if (hint != null && hint.toLowerCase().contains(lowerTerm)) {
+                    return true;
+                }
+            }
+        }
+        if (containsLower(node.getHint(), lowerTerm)
+                || containsLower(node.getIdEntry(), lowerTerm)
+                || containsLower(node.getText(), lowerTerm)
+                || containsLower(node.getContentDescription(), lowerTerm)) {
+            return true;
+        }
+        return false;
+    }
+
+    private static boolean containsLower(CharSequence value, String term) {
+        return value != null && value.toString().toLowerCase().contains(term);
+    }
+
+    private static final class ParsedFields {
+        AutofillId usernameId;
+        AutofillId passwordId;
+    }
+
+    private static final class ParsedTarget {
+        final String matchTarget;
+        final String packageName;
+
+        ParsedTarget(String matchTarget, String packageName) {
+            this.matchTarget = matchTarget;
+            this.packageName = packageName;
+        }
+    }
+}

apiaudit/audit.go

@@ -16,6 +16,9 @@ const (
 	EventApprovalDenied    EventType = "approval_denied"
 	EventApprovalCanceled  EventType = "approval_canceled"
 	EventApprovalTimedOut  EventType = "approval_timed_out"
+	EventAutofillFound     EventType = "autofill_found"
+	EventAutofillAmbiguous EventType = "autofill_ambiguous"
+	EventAutofillBlocked   EventType = "autofill_blocked"
 	EventAuthRejected      EventType = "auth_rejected"
 )
 

apiaudit/audit_test.go

@@ -47,3 +47,22 @@ func TestLogPreservesRecordedMetadata(t *testing.T) {
 		t.Fatalf("Events()[0] = %#v, want preserved metadata", events[0])
 	}
 }
+
+func TestLogStoresAutofillEventTypes(t *testing.T) {
+	t.Parallel()
+
+	log := New(5)
+	log.Record(Event{
+		Type:      EventAutofillAmbiguous,
+		TokenName: "Browser Extension",
+		Message:   "multiple matches for example.com",
+	})
+
+	events := log.Events()
+	if len(events) != 1 {
+		t.Fatalf("len(Events()) = %d, want 1", len(events))
+	}
+	if events[0].Type != EventAutofillAmbiguous {
+		t.Fatalf("Events()[0].Type = %q, want %q", events[0].Type, EventAutofillAmbiguous)
+	}
+}

appstate/state.go

@@ -302,7 +302,7 @@ func (s *State) VisibleEntries() ([]vault.Entry, error) {
 	}
 
 	if s.Section == SectionEntries {
-		return model.EntriesInPath(s.CurrentPath), nil
+		return entriesInPath(model.Entries, s.CurrentPath), nil
 	}
 	if s.Section == SectionRecycleBin || len(s.CurrentPath) == 0 {
 		return entries, nil
@@ -837,6 +837,27 @@ func (s *State) CreateGroup(name string) error {
 	return nil
 }
 
+func (s *State) MoveCurrentGroup(parent []string) error {
+	session, ok := s.Session.(MutableSession)
+	if !ok {
+		return fmt.Errorf("session is not mutable")
+	}
+	model, err := session.Current()
+	if err != nil {
+		return err
+	}
+	current := append([]string(nil), s.CurrentPath...)
+	if err := model.MoveGroup(current, parent); err != nil {
+		return err
+	}
+	session.Replace(model)
+	if len(current) > 0 {
+		s.CurrentPath = append(append([]string(nil), parent...), current[len(current)-1])
+	}
+	s.Dirty = true
+	return nil
+}
+
 func (s *State) RenameCurrentGroup(newName string) error {
 	session, ok := s.Session.(MutableSession)
 	if !ok {

appstate/state_test.go

@@ -44,6 +44,37 @@ func TestVisibleEntriesFollowsCurrentPathWithoutSearch(t *testing.T) {
 	}
 }
 
+func TestVisibleEntriesAtParentGroupOnlyShowsDirectEntries(t *testing.T) {
+	t.Parallel()
+
+	state := State{
+		Session: stubSession{
+			model: vault.Model{
+				Entries: []vault.Entry{
+					{ID: "joe-note", Title: "Crew Note", Path: []string{"Crew"}},
+					{ID: "bellagio", Title: "Bellagio", Path: []string{"Crew", "Internet"}},
+					{ID: "vault-console", Title: "Vault Console", Path: []string{"Crew", "Internet"}},
+					{ID: "surveillance-console", Title: "Surveillance Console", Path: []string{"Crew", "Home Assistant"}},
+				},
+			},
+		},
+		CurrentPath: []string{"Crew"},
+	}
+
+	got, err := state.VisibleEntries()
+	if err != nil {
+		t.Fatalf("VisibleEntries() error = %v", err)
+	}
+
+	titles := make([]string, 0, len(got))
+	for _, entry := range got {
+		titles = append(titles, entry.Title)
+	}
+	if !slices.Equal(titles, []string{"Crew Note"}) {
+		t.Fatalf("visible titles = %v, want only direct entries from Crew", titles)
+	}
+}
+
 func TestPendingApprovalsReturnsManagerRequests(t *testing.T) {
 	t.Parallel()
 
@@ -160,6 +191,41 @@ func TestVisibleEntriesUsesGlobalSearchWhenQueryPresent(t *testing.T) {
 	}
 }
 
+func TestVisibleEntriesReturnsDescendantsAfterClearingSearch(t *testing.T) {
+	t.Parallel()
+
+	state := State{
+		Session: stubSession{
+			model: vault.Model{
+				Entries: []vault.Entry{
+					{ID: "bellagio", Title: "Bellagio", Path: []string{"Crew", "Internet"}},
+					{ID: "vault-console", Title: "Vault Console", URL: "https://vault.crew.example.invalid", Path: []string{"Crew", "Internet"}},
+					{ID: "surveillance-console", Title: "Surveillance Console", URL: "https://surveillance.crew.example.invalid", Path: []string{"Crew", "Home Assistant"}},
+				},
+			},
+		},
+		CurrentPath: []string{"Crew"},
+		SearchQuery: "missing",
+	}
+
+	got, err := state.VisibleEntries()
+	if err != nil {
+		t.Fatalf("VisibleEntries() with search error = %v", err)
+	}
+	if len(got) != 0 {
+		t.Fatalf("VisibleEntries() with missing search = %#v, want empty", got)
+	}
+
+	state.SearchQuery = ""
+	got, err = state.VisibleEntries()
+	if err != nil {
+		t.Fatalf("VisibleEntries() after clearing search error = %v", err)
+	}
+	if len(got) != 0 {
+		t.Fatalf("len(VisibleEntries()) after clearing search = %d, want 0 direct entries at Crew", len(got))
+	}
+}
+
 func TestVisibleEntriesUsesTemplateSection(t *testing.T) {
 	t.Parallel()
 
@@ -1150,6 +1216,27 @@ func TestCreateGroupPersistsGroupAndMarksDirty(t *testing.T) {
 	}
 }
 
+func TestCreateGroupSupportsNestedGroupPath(t *testing.T) {
+	t.Parallel()
+
+	session := &mutableStubSession{model: vault.Model{}}
+	state := State{
+		Session:     session,
+		CurrentPath: []string{"Root"},
+	}
+
+	if err := state.CreateGroup("Infrastructure / Prod"); err != nil {
+		t.Fatalf("CreateGroup() error = %v", err)
+	}
+
+	if got := session.model.ChildGroups([]string{"Root"}); !slices.Equal(got, []string{"Infrastructure"}) {
+		t.Fatalf("ChildGroups(Root) = %v, want [Infrastructure]", got)
+	}
+	if got := session.model.ChildGroups([]string{"Root", "Infrastructure"}); !slices.Equal(got, []string{"Prod"}) {
+		t.Fatalf("ChildGroups(Root/Infrastructure) = %v, want [Prod]", got)
+	}
+}
+
 func TestRenameCurrentGroupUpdatesPathAndMarksDirty(t *testing.T) {
 	t.Parallel()
 
@@ -1234,6 +1321,37 @@ func TestMoveSelectedEntryPersistsPathChangeAndMarksDirty(t *testing.T) {
 	}
 }
 
+func TestMoveCurrentGroupMovesHierarchyAndMarksDirty(t *testing.T) {
+	t.Parallel()
+
+	model := vault.Model{
+		Entries: []vault.Entry{
+			{ID: "vault-console", Title: "Vault Console", Path: []string{"Root", "Internet"}},
+		},
+	}
+	model.CreateGroup([]string{"Root", "Internet"}, "Infrastructure")
+
+	session := &mutableStubSession{model: model}
+	state := State{
+		Session:     session,
+		CurrentPath: []string{"Root", "Internet"},
+	}
+
+	if err := state.MoveCurrentGroup([]string{"Root", "Crew"}); err != nil {
+		t.Fatalf("MoveCurrentGroup() error = %v", err)
+	}
+
+	if !slices.Equal(state.CurrentPath, []string{"Root", "Crew", "Internet"}) {
+		t.Fatalf("CurrentPath = %v, want [Root Crew Internet]", state.CurrentPath)
+	}
+	if got := session.model.EntriesInPath([]string{"Root", "Crew", "Internet"}); len(got) != 1 || got[0].ID != "vault-console" {
+		t.Fatalf("EntriesInPath(Root/Crew/Internet) = %#v, want moved entry", got)
+	}
+	if !state.Dirty {
+		t.Fatal("Dirty = false, want true after MoveCurrentGroup")
+	}
+}
+
 func TestAddAttachmentToSelectedEntryPersistsAndMarksDirty(t *testing.T) {
 	t.Parallel()
 

autofillcache/cache.go

@@ -0,0 +1,296 @@
+package autofillcache
+
+import (
+	"encoding/json"
+	"net/url"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	"git.julianfamily.org/keepassgo/vault"
+)
+
+type Entry struct {
+	ID       string   `json:"id"`
+	Title    string   `json:"title"`
+	Username string   `json:"username"`
+	Password string   `json:"password"`
+	URL      string   `json:"url"`
+	Host     string   `json:"host"`
+	Targets  []string `json:"targets,omitempty"`
+	Path     []string `json:"path,omitempty"`
+}
+
+type File struct {
+	UpdatedAt string  `json:"updatedAt"`
+	Entries   []Entry `json:"entries"`
+}
+
+type MatchStatus string
+
+const (
+	MatchStatusNone      MatchStatus = ""
+	MatchStatusFound     MatchStatus = "found"
+	MatchStatusAmbiguous MatchStatus = "ambiguous"
+	MatchStatusMissing   MatchStatus = "missing"
+)
+
+type MatchResult struct {
+	Status MatchStatus `json:"status"`
+	Entry  Entry       `json:"entry,omitempty"`
+}
+
+func Match(cache File, webURL string) (Entry, bool) {
+	result := Resolve(cache, webURL)
+	return result.Entry, result.Status == MatchStatusFound
+}
+
+func Resolve(cache File, webURL string) MatchResult {
+	target := normalizeURL(webURL)
+	if target.host == "" {
+		return MatchResult{Status: MatchStatusMissing}
+	}
+
+	exactHost := make([]Entry, 0)
+	parentHost := make([]Entry, 0)
+	for _, entry := range cache.Entries {
+		if entryMatchesHost(entry, target.host) {
+			exactHost = append(exactHost, entry)
+			continue
+		}
+		if entryMatchesParentHost(entry, target.host) {
+			parentHost = append(parentHost, entry)
+		}
+	}
+
+	if result := chooseEntry(target, exactHost); result.Status != MatchStatusMissing {
+		return result
+	}
+	return chooseEntry(target, parentHost)
+}
+
+func Build(model vault.Model, now time.Time) File {
+	entries := make([]Entry, 0, len(model.Entries))
+	for _, item := range model.Entries {
+		targets := collectTargets(item)
+		host := normalizeHost(item.URL)
+		if host == "" {
+			for _, target := range targets {
+				host = normalizeHost(target)
+				if host != "" {
+					break
+				}
+			}
+		}
+		if host == "" {
+			continue
+		}
+		if strings.TrimSpace(item.Username) == "" || strings.TrimSpace(item.Password) == "" {
+			continue
+		}
+		entries = append(entries, Entry{
+			ID:       item.ID,
+			Title:    item.Title,
+			Username: item.Username,
+			Password: item.Password,
+			URL:      item.URL,
+			Host:     host,
+			Targets:  targets,
+			Path:     append([]string(nil), item.Path...),
+		})
+	}
+	return File{
+		UpdatedAt: now.UTC().Format(time.RFC3339),
+		Entries:   entries,
+	}
+}
+
+func Write(path string, model vault.Model, now time.Time) error {
+	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
+		return err
+	}
+	data, err := json.MarshalIndent(Build(model, now), "", "  ")
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(path, data, 0o600)
+}
+
+func Clear(path string) error {
+	if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
+		return err
+	}
+	return nil
+}
+
+func normalizeHost(raw string) string {
+	return normalizeURL(raw).host
+}
+
+type normalizedTarget struct {
+	host string
+	path string
+	url  string
+}
+
+func normalizeURL(raw string) normalizedTarget {
+	value := strings.TrimSpace(raw)
+	if value == "" {
+		return normalizedTarget{}
+	}
+	if !strings.Contains(value, "://") {
+		value = "https://" + value
+	}
+	parsed, err := url.Parse(value)
+	if err != nil {
+		return normalizedTarget{}
+	}
+	host := strings.TrimSpace(parsed.Hostname())
+	path := cleanPath(parsed.EscapedPath())
+	return normalizedTarget{
+		host: strings.ToLower(host),
+		path: path,
+		url:  strings.ToLower(host) + path,
+	}
+}
+
+func cleanPath(path string) string {
+	path = strings.TrimSpace(path)
+	if path == "" || path == "/" {
+		return "/"
+	}
+	path = strings.TrimRight(path, "/")
+	if path == "" {
+		return "/"
+	}
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+	return path
+}
+
+func chooseEntry(target normalizedTarget, entries []Entry) MatchResult {
+	switch len(entries) {
+	case 0:
+		return MatchResult{Status: MatchStatusMissing}
+	case 1:
+		return MatchResult{Status: MatchStatusFound, Entry: entries[0]}
+	}
+
+	exact := make([]Entry, 0)
+	bestPrefixLen := -1
+	bestPrefix := make([]Entry, 0)
+	for _, entry := range entries {
+		exactMatch, prefixLen := bestTargetMatch(entry, target)
+		if exactMatch {
+			exact = append(exact, entry)
+			continue
+		}
+		if prefixLen <= 0 {
+			continue
+		}
+		switch {
+		case prefixLen > bestPrefixLen:
+			bestPrefixLen = prefixLen
+			bestPrefix = []Entry{entry}
+		case prefixLen == bestPrefixLen:
+			bestPrefix = append(bestPrefix, entry)
+		}
+	}
+	if len(exact) == 1 {
+		return MatchResult{Status: MatchStatusFound, Entry: exact[0]}
+	}
+	if len(exact) > 1 {
+		return MatchResult{Status: MatchStatusAmbiguous}
+	}
+	if len(bestPrefix) == 1 {
+		return MatchResult{Status: MatchStatusFound, Entry: bestPrefix[0]}
+	}
+	if len(bestPrefix) == 0 {
+		return MatchResult{Status: MatchStatusMissing}
+	}
+	return MatchResult{Status: MatchStatusAmbiguous}
+}
+
+func collectTargets(item vault.Entry) []string {
+	seen := make(map[string]struct{})
+	targets := make([]string, 0, 1+len(item.Fields))
+	appendTarget := func(raw string) {
+		value := strings.TrimSpace(raw)
+		if value == "" {
+			return
+		}
+		if _, ok := seen[value]; ok {
+			return
+		}
+		seen[value] = struct{}{}
+		targets = append(targets, value)
+	}
+
+	appendTarget(item.URL)
+
+	keys := make([]string, 0, len(item.Fields))
+	for key := range item.Fields {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+	for _, key := range keys {
+		upper := strings.ToUpper(strings.TrimSpace(key))
+		if strings.HasPrefix(upper, "ANDROIDAPP") || strings.HasPrefix(upper, "KP2A_URL") {
+			appendTarget(item.Fields[key])
+		}
+	}
+
+	return targets
+}
+
+func entryTargets(entry Entry) []normalizedTarget {
+	values := entry.Targets
+	if len(values) == 0 {
+		values = []string{entry.URL}
+	}
+	targets := make([]normalizedTarget, 0, len(values))
+	for _, value := range values {
+		target := normalizeURL(value)
+		if target.host == "" {
+			continue
+		}
+		targets = append(targets, target)
+	}
+	return targets
+}
+
+func entryMatchesHost(entry Entry, host string) bool {
+	for _, target := range entryTargets(entry) {
+		if target.host == host {
+			return true
+		}
+	}
+	return false
+}
+
+func entryMatchesParentHost(entry Entry, host string) bool {
+	for _, target := range entryTargets(entry) {
+		if target.host != "" && strings.HasSuffix(host, "."+target.host) {
+			return true
+		}
+	}
+	return false
+}
+
+func bestTargetMatch(entry Entry, target normalizedTarget) (bool, int) {
+	bestPrefixLen := -1
+	for _, candidate := range entryTargets(entry) {
+		if candidate.url == target.url {
+			return true, 0
+		}
+		if candidate.path != "/" && strings.HasPrefix(target.path, candidate.path) {
+			if pathLen := len(candidate.path); pathLen > bestPrefixLen {
+				bestPrefixLen = pathLen
+			}
+		}
+	}
+	return false, bestPrefixLen
+}

autofillcache/cache_test.go

@@ -0,0 +1,339 @@
+package autofillcache
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"git.julianfamily.org/keepassgo/vault"
+)
+
+func TestBuildFiltersAndNormalizesEntries(t *testing.T) {
+	t.Parallel()
+
+	now := time.Date(2026, time.March, 31, 12, 0, 0, 0, time.UTC)
+	got := Build(vault.Model{
+		Entries: []vault.Entry{
+			{
+				ID:       "one",
+				Title:    "Chrome Test",
+				Username: "joe",
+				Password: "secret",
+				URL:      "https://10.0.2.2:8443/login",
+				Path:     []string{"Crew", "Internet"},
+			},
+			{
+				ID:       "two",
+				Title:    "No Password",
+				Username: "joe",
+				URL:      "https://example.com",
+			},
+			{
+				ID:       "three",
+				Title:    "Bare Host",
+				Username: "user",
+				Password: "pass",
+				URL:      "surveillance.crew.example.invalid",
+				Fields: map[string]string{
+					"AndroidApp1": "androidapp://com.lights.mobile",
+					"KP2A_URL_1":  "https://surveillance.crew.example.invalid/account",
+				},
+			},
+		},
+	}, now)
+
+	if len(got.Entries) != 2 {
+		t.Fatalf("entry count = %d, want 2", len(got.Entries))
+	}
+	if got.Entries[0].Host != "10.0.2.2" {
+		t.Fatalf("first host = %q, want 10.0.2.2", got.Entries[0].Host)
+	}
+	if got.Entries[1].Host != "surveillance.crew.example.invalid" {
+		t.Fatalf("second host = %q, want lights.julianfamily.org", got.Entries[1].Host)
+	}
+	if len(got.Entries[1].Targets) != 3 {
+		t.Fatalf("len(second targets) = %d, want 3", len(got.Entries[1].Targets))
+	}
+	if got.UpdatedAt != "2026-03-31T12:00:00Z" {
+		t.Fatalf("updatedAt = %q", got.UpdatedAt)
+	}
+}
+
+func TestWriteAndClear(t *testing.T) {
+	t.Parallel()
+
+	dir := t.TempDir()
+	path := filepath.Join(dir, "autofill-cache.json")
+	model := vault.Model{
+		Entries: []vault.Entry{
+			{ID: "one", Title: "Chrome Test", Username: "joe", Password: "secret", URL: "https://10.0.2.2:8443/login"},
+		},
+	}
+
+	if err := Write(path, model, time.Date(2026, time.March, 31, 12, 0, 0, 0, time.UTC)); err != nil {
+		t.Fatalf("Write() error = %v", err)
+	}
+	data, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatalf("ReadFile() error = %v", err)
+	}
+	var got File
+	if err := json.Unmarshal(data, &got); err != nil {
+		t.Fatalf("Unmarshal() error = %v", err)
+	}
+	if len(got.Entries) != 1 || got.Entries[0].Host != "10.0.2.2" {
+		t.Fatalf("cache entries = %#v", got.Entries)
+	}
+	if err := Clear(path); err != nil {
+		t.Fatalf("Clear() error = %v", err)
+	}
+	if _, err := os.Stat(path); !os.IsNotExist(err) {
+		t.Fatalf("cache path still exists, stat err = %v", err)
+	}
+}
+
+func TestMatchChoosesExactURLWhenHostsRepeat(t *testing.T) {
+	t.Parallel()
+
+	cache := File{
+		Entries: []Entry{
+			{
+				ID:       "one",
+				Title:    "Primary Login",
+				Username: "first",
+				Password: "secret1",
+				URL:      "https://10.0.2.2:8443/login/",
+				Host:     "10.0.2.2",
+			},
+			{
+				ID:       "two",
+				Title:    "Alt Login",
+				Username: "second",
+				Password: "secret2",
+				URL:      "https://10.0.2.2:8443/alt/",
+				Host:     "10.0.2.2",
+			},
+		},
+	}
+
+	got, ok := Match(cache, "https://10.0.2.2:8443/alt/")
+	if !ok {
+		t.Fatalf("Match() found no entry")
+	}
+	if got.ID != "two" {
+		t.Fatalf("Match() entry = %q, want two", got.ID)
+	}
+}
+
+func TestMatchRejectsAmbiguousSharedHost(t *testing.T) {
+	t.Parallel()
+
+	cache := File{
+		Entries: []Entry{
+			{
+				ID:       "one",
+				Title:    "Host A",
+				Username: "first",
+				Password: "secret1",
+				URL:      "https://surveillance.crew.example.invalid/",
+				Host:     "surveillance.crew.example.invalid",
+			},
+			{
+				ID:       "two",
+				Title:    "Host B",
+				Username: "second",
+				Password: "secret2",
+				URL:      "https://surveillance.crew.example.invalid/",
+				Host:     "surveillance.crew.example.invalid",
+			},
+		},
+	}
+
+	if _, ok := Match(cache, "https://surveillance.crew.example.invalid/"); ok {
+		t.Fatalf("Match() unexpectedly resolved ambiguous shared host")
+	}
+}
+
+func TestResolveReportsFoundAmbiguousAndMissingStatuses(t *testing.T) {
+	t.Parallel()
+
+	cache := File{
+		Entries: []Entry{
+			{
+				ID:       "one",
+				Title:    "Admin Login",
+				Username: "admin",
+				Password: "secret1",
+				URL:      "https://example.com/admin",
+				Host:     "example.com",
+			},
+			{
+				ID:       "two",
+				Title:    "Shared Login A",
+				Username: "shared-a",
+				Password: "secret2",
+				URL:      "https://shared.example.com",
+				Host:     "shared.example.com",
+			},
+			{
+				ID:       "three",
+				Title:    "Shared Login B",
+				Username: "shared-b",
+				Password: "secret3",
+				URL:      "https://shared.example.com",
+				Host:     "shared.example.com",
+			},
+		},
+	}
+
+	if got := Resolve(cache, "https://example.com/admin/login"); got.Status != MatchStatusFound || got.Entry.ID != "one" {
+		t.Fatalf("Resolve(found) = %#v, want found entry one", got)
+	}
+	if got := Resolve(cache, "https://shared.example.com"); got.Status != MatchStatusAmbiguous {
+		t.Fatalf("Resolve(ambiguous) = %#v, want ambiguous", got)
+	}
+	if got := Resolve(cache, "https://nowhere.invalid"); got.Status != MatchStatusMissing {
+		t.Fatalf("Resolve(missing) = %#v, want missing", got)
+	}
+}
+
+func TestMatchChoosesLongestPathPrefix(t *testing.T) {
+	t.Parallel()
+
+	cache := File{
+		Entries: []Entry{
+			{
+				ID:       "one",
+				Title:    "Generic Login",
+				Username: "generic",
+				Password: "secret1",
+				URL:      "https://example.com/",
+				Host:     "example.com",
+			},
+			{
+				ID:       "two",
+				Title:    "Admin Login",
+				Username: "admin",
+				Password: "secret2",
+				URL:      "https://example.com/admin",
+				Host:     "example.com",
+			},
+		},
+	}
+
+	got, ok := Match(cache, "https://example.com/admin/login")
+	if !ok {
+		t.Fatalf("Match() found no entry")
+	}
+	if got.ID != "two" {
+		t.Fatalf("Match() entry = %q, want two", got.ID)
+	}
+}
+
+func TestMatchSupportsAndroidAppPackageTargets(t *testing.T) {
+	t.Parallel()
+
+	cache := File{
+		Entries: []Entry{
+			{
+				ID:       "one",
+				Title:    "Thunderbird",
+				Username: "mail-user",
+				Password: "secret1",
+				URL:      "androidapp://org.mozilla.thunderbird/login",
+				Host:     "org.mozilla.thunderbird",
+			},
+		},
+	}
+
+	got, ok := Match(cache, "androidapp://org.mozilla.thunderbird")
+	if !ok {
+		t.Fatalf("Match() found no entry")
+	}
+	if got.ID != "one" {
+		t.Fatalf("Match() entry = %q, want one", got.ID)
+	}
+}
+
+func TestMatchRejectsAmbiguousAndroidAppPackageTargets(t *testing.T) {
+	t.Parallel()
+
+	cache := File{
+		Entries: []Entry{
+			{
+				ID:       "one",
+				Title:    "Thunderbird Primary",
+				Username: "mail-user",
+				Password: "secret1",
+				URL:      "androidapp://org.mozilla.thunderbird",
+				Host:     "org.mozilla.thunderbird",
+			},
+			{
+				ID:       "two",
+				Title:    "Thunderbird Secondary",
+				Username: "other-user",
+				Password: "secret2",
+				URL:      "androidapp://org.mozilla.thunderbird",
+				Host:     "org.mozilla.thunderbird",
+			},
+		},
+	}
+
+	if _, ok := Match(cache, "androidapp://org.mozilla.thunderbird"); ok {
+		t.Fatalf("Match() unexpectedly resolved ambiguous android app package target")
+	}
+}
+
+func TestMatchUsesAndroidAppCustomFieldTarget(t *testing.T) {
+	t.Parallel()
+
+	cache := File{
+		Entries: []Entry{
+			{
+				ID:       "one",
+				Title:    "Blink",
+				Username: "blink-user",
+				Password: "secret1",
+				URL:      "https://account.blinknetwork.com",
+				Host:     "account.blinknetwork.com",
+				Targets:  []string{"https://account.blinknetwork.com", "androidapp://com.blinknetwork.mobile2"},
+			},
+		},
+	}
+
+	got, ok := Match(cache, "androidapp://com.blinknetwork.mobile2")
+	if !ok {
+		t.Fatalf("Match() found no entry")
+	}
+	if got.ID != "one" {
+		t.Fatalf("Match() entry = %q, want one", got.ID)
+	}
+}
+
+func TestMatchUsesKP2AURLCustomFieldTarget(t *testing.T) {
+	t.Parallel()
+
+	cache := File{
+		Entries: []Entry{
+			{
+				ID:       "one",
+				Title:    "Blink",
+				Username: "blink-user",
+				Password: "secret1",
+				URL:      "https://blinknetwork.com",
+				Host:     "blinknetwork.com",
+				Targets:  []string{"https://blinknetwork.com", "https://account.blinknetwork.com"},
+			},
+		},
+	}
+
+	got, ok := Match(cache, "https://account.blinknetwork.com")
+	if !ok {
+		t.Fatalf("Match() found no entry")
+	}
+	if got.ID != "one" {
+		t.Fatalf("Match() entry = %q, want one", got.ID)
+	}
+}

clipboard_gio.go

@@ -0,0 +1,63 @@
+package main
+
+import (
+	"io"
+	"strings"
+	"sync"
+
+	gioclipboard "gioui.org/io/clipboard"
+	"gioui.org/layout"
+
+	appclipboard "git.julianfamily.org/keepassgo/clipboard"
+)
+
+type clipboardCommandWriter struct {
+	mu         sync.Mutex
+	pending    []string
+	invalidate func()
+}
+
+func newPlatformClipboardWriter(goos string, invalidate func()) appclipboard.Writer {
+	if strings.EqualFold(goos, "android") {
+		return &clipboardCommandWriter{invalidate: invalidate}
+	}
+	return nil
+}
+
+func processClipboardWrites(gtx layout.Context, writer appclipboard.Writer) {
+	commandWriter, ok := writer.(*clipboardCommandWriter)
+	if !ok {
+		return
+	}
+	commandWriter.Process(gtx)
+}
+
+func (w *clipboardCommandWriter) WriteText(text string) error {
+	w.mu.Lock()
+	w.pending = append(w.pending, text)
+	w.mu.Unlock()
+	if w.invalidate != nil {
+		w.invalidate()
+	}
+	return nil
+}
+
+func (w *clipboardCommandWriter) Process(gtx layout.Context) {
+	for _, text := range w.drain() {
+		gtx.Execute(gioclipboard.WriteCmd{
+			Type: "application/text",
+			Data: io.NopCloser(strings.NewReader(text)),
+		})
+	}
+}
+
+func (w *clipboardCommandWriter) drain() []string {
+	w.mu.Lock()
+	defer w.mu.Unlock()
+	if len(w.pending) == 0 {
+		return nil
+	}
+	pending := append([]string(nil), w.pending...)
+	w.pending = nil
+	return pending
+}

clipboard_gio_test.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"slices"
+	"testing"
+)
+
+func TestNewPlatformClipboardWriterUsesCommandWriterOnAndroid(t *testing.T) {
+	t.Parallel()
+
+	writer := newPlatformClipboardWriter("android", nil)
+	if _, ok := writer.(*clipboardCommandWriter); !ok {
+		t.Fatalf("newPlatformClipboardWriter(android) = %T, want *clipboardCommandWriter", writer)
+	}
+}
+
+func TestNewPlatformClipboardWriterUsesSystemClipboardOffAndroid(t *testing.T) {
+	t.Parallel()
+
+	if writer := newPlatformClipboardWriter("linux", nil); writer != nil {
+		t.Fatalf("newPlatformClipboardWriter(linux) = %T, want nil", writer)
+	}
+}
+
+func TestClipboardCommandWriterDrainsQueuedWrites(t *testing.T) {
+	t.Parallel()
+
+	writer := &clipboardCommandWriter{}
+	if err := writer.WriteText("username"); err != nil {
+		t.Fatalf("WriteText(username) error = %v", err)
+	}
+	if err := writer.WriteText("password"); err != nil {
+		t.Fatalf("WriteText(password) error = %v", err)
+	}
+
+	if got := writer.drain(); !slices.Equal(got, []string{"username", "password"}) {
+		t.Fatalf("drain() = %v, want [username password]", got)
+	}
+	if got := writer.drain(); got != nil {
+		t.Fatalf("drain() after flush = %v, want nil", got)
+	}
+}

go.mod

@@ -2,6 +2,8 @@ module git.julianfamily.org/keepassgo
 
 go 1.26
 
+replace gioui.org/cmd => ./third_party/gioui-cmd
+
 require (
 	gioui.org v0.8.0
 	github.com/atotto/clipboard v0.1.4

go.sum

@@ -39,8 +39,6 @@ eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKw
 eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA=
 gioui.org v0.8.0 h1:QV5p5JvsmSmGiIXVYOKn6d9YDliTfjtLlVf5J+BZ9Pg=
 gioui.org v0.8.0/go.mod h1:vEMmpxMOd/iwJhXvGVIzWEbxMWhnMQ9aByOGQdlQ8rc=
-gioui.org/cmd v0.8.0 h1:oy5qOlc1UXcglc5HBCMZQELiIzQ2obhT98mw+SuWafQ=
-gioui.org/cmd v0.8.0/go.mod h1:wKLAyAgRR25VMYFzGX2Ecia0m0Td562wDcZ3LaPHPTI=
 gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
 gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
 gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=

scripts/gitea_release.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+import argparse
+import json
+import mimetypes
+import pathlib
+import sys
+import urllib.error
+import urllib.parse
+import urllib.request
+
+
+def request_json(method: str, url: str, token: str, payload: dict | None = None) -> dict:
+    data = None
+    headers = {"Authorization": f"token {token}", "Accept": "application/json"}
+    if payload is not None:
+        data = json.dumps(payload).encode()
+        headers["Content-Type"] = "application/json"
+    req = urllib.request.Request(url, data=data, headers=headers, method=method)
+    with urllib.request.urlopen(req) as resp:
+        return json.loads(resp.read().decode())
+
+
+def request_no_content(method: str, url: str, token: str) -> None:
+    req = urllib.request.Request(
+        url,
+        headers={"Authorization": f"token {token}", "Accept": "application/json"},
+        method=method,
+    )
+    with urllib.request.urlopen(req):
+        return
+
+
+def get_or_create_release(server: str, repo: str, token: str, tag: str) -> dict:
+    base = f"{server.rstrip('/')}/api/v1/repos/{repo}"
+    tag_url = f"{base}/releases/tags/{urllib.parse.quote(tag, safe='')}"
+    try:
+        return request_json("GET", tag_url, token)
+    except urllib.error.HTTPError as err:
+        if err.code != 404:
+            raise
+    payload = {
+        "tag_name": tag,
+        "name": tag,
+        "draft": False,
+        "prerelease": False,
+    }
+    return request_json("POST", f"{base}/releases", token, payload)
+
+
+def upload_asset(server: str, repo: str, token: str, release: dict, path: pathlib.Path) -> None:
+    base = f"{server.rstrip('/')}/api/v1/repos/{repo}"
+    assets = release.get("assets", [])
+    for asset in assets:
+        if asset.get("name") == path.name:
+            request_no_content("DELETE", f"{base}/releases/{release['id']}/assets/{asset['id']}", token)
+    query = urllib.parse.urlencode({"name": path.name})
+    url = f"{base}/releases/{release['id']}/assets?{query}"
+    content_type = mimetypes.guess_type(path.name)[0] or "application/octet-stream"
+    req = urllib.request.Request(
+        url,
+        data=path.read_bytes(),
+        headers={
+            "Authorization": f"token {token}",
+            "Accept": "application/json",
+            "Content-Type": content_type,
+        },
+        method="POST",
+    )
+    with urllib.request.urlopen(req):
+        return
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--server", required=True)
+    parser.add_argument("--repo", required=True)
+    parser.add_argument("--token", required=True)
+    parser.add_argument("--tag", required=True)
+    parser.add_argument("artifacts", nargs="+")
+    args = parser.parse_args()
+
+    paths = [pathlib.Path(p) for p in args.artifacts]
+    missing = [str(p) for p in paths if not p.is_file()]
+    if missing:
+        print(f"missing artifacts: {', '.join(missing)}", file=sys.stderr)
+        return 1
+
+    release = get_or_create_release(args.server, args.repo, args.token, args.tag)
+    for path in paths:
+        upload_asset(args.server, args.repo, args.token, release, path)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

session/session.go

@@ -32,6 +32,33 @@ type Manager struct {
 	remoteVersion webdav.Version
 }
 
+type PreparedLocalOpen struct {
+	Model     vault.Model
+	Config    *vault.KDBXConfig
+	Path      string
+	Key       vault.MasterKey
+	Encoded   []byte
+	VaultRoot string
+}
+
+type PreparedRemoteOpen struct {
+	Model         vault.Model
+	Config        *vault.KDBXConfig
+	Client        webdav.Client
+	Path          string
+	Key           vault.MasterKey
+	Encoded       []byte
+	VaultRoot     string
+	RemoteVersion webdav.Version
+}
+
+type PreparedUnlock struct {
+	Model     vault.Model
+	Config    *vault.KDBXConfig
+	Key       vault.MasterKey
+	VaultRoot string
+}
+
 func (m *Manager) SecuritySettings() vault.SecuritySettings {
 	return vault.DetectSecuritySettings(m.config)
 }
@@ -65,6 +92,10 @@ func (m *Manager) HasVault() bool {
 	return len(m.encoded) > 0 || m.path != "" || m.remotePath != ""
 }
 
+func (m *Manager) EncodedBytes() []byte {
+	return append([]byte(nil), m.encoded...)
+}
+
 func (m *Manager) IsLocked() bool {
 	return m.locked
 }
@@ -74,23 +105,11 @@ func (m *Manager) IsRemote() bool {
 }
 
 func (m *Manager) Open(path string, key vault.MasterKey) error {
-	content, err := os.ReadFile(path)
+	prepared, err := PrepareLocalOpen(path, key)
 	if err != nil {
-		return fmt.Errorf("read %s: %w", path, err)
+		return err
 	}
-
-	model, config, err := vault.LoadKDBXWithConfig(bytes.NewReader(content), key)
-	if err != nil {
-		return fmt.Errorf("open %s: %w", path, err)
-	}
-
-	m.model = model
-	m.config = config
-	m.path = path
-	m.key = key
-	m.vaultRoot = detectSingleVaultRoot(model)
-	m.encoded = content
-	m.locked = false
+	m.ApplyPreparedLocalOpen(prepared)
 	return nil
 }
 
@@ -107,25 +126,11 @@ func (m *Manager) Save() error {
 }
 
 func (m *Manager) OpenRemote(client webdav.Client, path string, key vault.MasterKey) error {
-	content, version, err := client.Open(path)
+	prepared, err := PrepareRemoteOpen(client, path, key)
 	if err != nil {
-		return fmt.Errorf("open remote %s: %w", path, err)
+		return err
 	}
-
-	model, config, err := vault.LoadKDBXWithConfig(bytes.NewReader(content), key)
-	if err != nil {
-		return fmt.Errorf("decode remote %s: %w", path, err)
-	}
-
-	m.model = model
-	m.config = config
-	m.key = key
-	m.vaultRoot = detectSingleVaultRoot(model)
-	m.encoded = content
-	m.locked = false
-	m.remoteClient = &client
-	m.remotePath = path
-	m.remoteVersion = version
+	m.ApplyPreparedRemoteOpen(prepared)
 	return nil
 }
 
@@ -265,19 +270,101 @@ func (m *Manager) Lock() error {
 }
 
 func (m *Manager) Unlock(key vault.MasterKey) error {
-	model, config, err := vault.LoadKDBXWithConfig(bytes.NewReader(m.encoded), key)
+	prepared, err := PrepareUnlock(m.encoded, key)
 	if err != nil {
-		return fmt.Errorf("unlock vault: %w", err)
+		return err
 	}
-
-	m.model = model
-	m.config = config
-	m.key = key
-	m.vaultRoot = detectSingleVaultRoot(model)
-	m.locked = false
+	m.ApplyPreparedUnlock(prepared)
 	return nil
 }
 
+func PrepareLocalOpen(path string, key vault.MasterKey) (PreparedLocalOpen, error) {
+	content, err := os.ReadFile(path)
+	if err != nil {
+		return PreparedLocalOpen{}, fmt.Errorf("read %s: %w", path, err)
+	}
+	model, config, err := vault.LoadKDBXWithConfig(bytes.NewReader(content), key)
+	if err != nil {
+		return PreparedLocalOpen{}, fmt.Errorf("open %s: %w", path, err)
+	}
+	return PreparedLocalOpen{
+		Model:     model,
+		Config:    config,
+		Path:      path,
+		Key:       key,
+		Encoded:   content,
+		VaultRoot: detectSingleVaultRoot(model),
+	}, nil
+}
+
+func PrepareRemoteOpen(client webdav.Client, path string, key vault.MasterKey) (PreparedRemoteOpen, error) {
+	content, version, err := client.Open(path)
+	if err != nil {
+		return PreparedRemoteOpen{}, fmt.Errorf("open remote %s: %w", path, err)
+	}
+	model, config, err := vault.LoadKDBXWithConfig(bytes.NewReader(content), key)
+	if err != nil {
+		return PreparedRemoteOpen{}, fmt.Errorf("decode remote %s: %w", path, err)
+	}
+	return PreparedRemoteOpen{
+		Model:         model,
+		Config:        config,
+		Client:        client,
+		Path:          path,
+		Key:           key,
+		Encoded:       content,
+		VaultRoot:     detectSingleVaultRoot(model),
+		RemoteVersion: version,
+	}, nil
+}
+
+func PrepareUnlock(encoded []byte, key vault.MasterKey) (PreparedUnlock, error) {
+	model, config, err := vault.LoadKDBXWithConfig(bytes.NewReader(encoded), key)
+	if err != nil {
+		return PreparedUnlock{}, fmt.Errorf("unlock vault: %w", err)
+	}
+	return PreparedUnlock{
+		Model:     model,
+		Config:    config,
+		Key:       key,
+		VaultRoot: detectSingleVaultRoot(model),
+	}, nil
+}
+
+func (m *Manager) ApplyPreparedLocalOpen(prepared PreparedLocalOpen) {
+	m.model = prepared.Model
+	m.config = prepared.Config
+	m.path = prepared.Path
+	m.key = prepared.Key
+	m.vaultRoot = prepared.VaultRoot
+	m.encoded = prepared.Encoded
+	m.locked = false
+	m.remoteClient = nil
+	m.remotePath = ""
+	m.remoteVersion = webdav.Version{}
+}
+
+func (m *Manager) ApplyPreparedRemoteOpen(prepared PreparedRemoteOpen) {
+	m.model = prepared.Model
+	m.config = prepared.Config
+	m.key = prepared.Key
+	m.vaultRoot = prepared.VaultRoot
+	m.encoded = prepared.Encoded
+	m.locked = false
+	m.remoteClient = &prepared.Client
+	m.remotePath = prepared.Path
+	m.remoteVersion = prepared.RemoteVersion
+	m.path = ""
+}
+
+func (m *Manager) ApplyPreparedUnlock(prepared PreparedUnlock) {
+	m.model = prepared.Model
+	m.config = prepared.Config
+	m.key = prepared.Key
+	m.vaultRoot = prepared.VaultRoot
+	m.locked = false
+}
+
 func (m *Manager) ChangeMasterKey(key vault.MasterKey) error {
 	var (
 		model  vault.Model

third_party/gioui-cmd/.builds/apple.yml

@@ -0,0 +1,67 @@
+# SPDX-License-Identifier: Unlicense OR MIT
+image: debian/testing
+packages:
+ - clang
+ - cmake
+ - curl
+ - autoconf
+ - libxml2-dev
+ - libssl-dev
+ - libz-dev
+ - llvm-dev # for cctools
+ - uuid-dev ## for cctools
+ - libplist-utils # for gogio
+sources:
+ - https://git.sr.ht/~eliasnaur/gio-cmd
+ - https://git.sr.ht/~eliasnaur/applesdks
+ - https://git.sr.ht/~eliasnaur/giouiorg
+ - https://github.com/tpoechtrager/cctools-port.git
+ - https://github.com/tpoechtrager/apple-libtapi.git
+ - https://github.com/mackyle/xar.git
+environment:
+   APPLE_TOOLCHAIN_ROOT: /home/build/appletools
+   PATH: /home/build/sdk/go/bin:/home/build/go/bin:/usr/bin
+tasks:
+ - install_go: |
+     mkdir -p /home/build/sdk
+     curl -s https://dl.google.com/go/go1.19.8.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
+ - prepare_toolchain: |
+     mkdir -p $APPLE_TOOLCHAIN_ROOT
+     cd $APPLE_TOOLCHAIN_ROOT
+     tar xJf /home/build/applesdks/applesdks.tar.xz
+     mkdir bin tools
+     cd bin
+     ln -s ../toolchain/bin/x86_64-apple-darwin19-ld ld
+     ln -s ../toolchain/bin/x86_64-apple-darwin19-ar ar
+     ln -s /home/build/cctools-port/cctools/misc/lipo lipo
+     ln -s ../tools/appletoolchain xcrun
+     ln -s /usr/bin/plistutil plutil
+     cd ../tools
+     ln -s appletoolchain clang-ios
+     ln -s appletoolchain clang-macos
+ - install_appletoolchain: |
+     cd giouiorg
+     go build -o $APPLE_TOOLCHAIN_ROOT/tools ./cmd/appletoolchain
+ - build_xar: |
+     cd xar/xar
+     ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes CC=clang ./autogen.sh --prefix=/usr
+     make
+     sudo make install
+ - build_libtapi: |
+     cd apple-libtapi
+     INSTALLPREFIX=$APPLE_TOOLCHAIN_ROOT/libtapi ./build.sh
+     ./install.sh
+ - build_cctools: |
+     cd cctools-port/cctools
+     ./configure --prefix $APPLE_TOOLCHAIN_ROOT/toolchain --with-libtapi=$APPLE_TOOLCHAIN_ROOT/libtapi --target=x86_64-apple-darwin19
+     make install
+ - install_gogio: |
+     cd gio-cmd
+     go install ./gogio
+ - test_ios_gogio: |
+     mkdir tmp
+     cd tmp
+     go mod init example.com
+     go get -d gioui.org/example/kitchen
+     export PATH=/home/build/appletools/bin:$PATH
+     gogio -target ios -o app.app gioui.org/example/kitchen

third_party/gioui-cmd/.builds/freebsd.yml

@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: Unlicense OR MIT
+image: freebsd/13.x
+packages:
+ - libX11
+ - libxkbcommon
+ - libXcursor
+ - libXfixes
+ - vulkan-headers
+ - wayland
+ - mesa-libs
+ - xorg-vfbserver
+sources:
+ - https://git.sr.ht/~eliasnaur/gio-cmd
+environment:
+ PATH: /home/build/sdk/go/bin:/bin:/usr/local/bin:/usr/bin
+tasks:
+ - install_go: |
+     mkdir -p /home/build/sdk
+     curl https://dl.google.com/go/go1.19.8.freebsd-amd64.tar.gz | tar -C /home/build/sdk -xzf -
+ - test_cmd: |
+     cd gio-cmd
+     go test ./...

third_party/gioui-cmd/.builds/linux.yml

@@ -0,0 +1,91 @@
+# SPDX-License-Identifier: Unlicense OR MIT
+image: debian/bookworm
+packages:
+ - curl
+ - pkg-config
+ - libwayland-dev
+ - libx11-dev
+ - libx11-xcb-dev
+ - libxkbcommon-dev
+ - libxkbcommon-x11-dev
+ - libgles2-mesa-dev
+ - libegl1-mesa-dev
+ - libffi-dev
+ - libvulkan-dev
+ - libxcursor-dev
+ - libxrandr-dev
+ - libxinerama-dev
+ - libxi-dev
+ - libxxf86vm-dev
+ - mesa-vulkan-drivers
+ - wine
+ - xvfb
+ - xdotool
+ - scrot
+ - sway
+ - grim
+ - wine
+ - unzip
+sources:
+ - https://git.sr.ht/~eliasnaur/gio-cmd
+environment:
+ PATH: /home/build/sdk/go/bin:/usr/bin:/home/build/go/bin:/home/build/android/tools/bin
+ ANDROID_SDK_ROOT: /home/build/android
+ android_sdk_tools_zip: sdk-tools-linux-3859397.zip
+ android_ndk_zip: android-ndk-r20-linux-x86_64.zip
+ github_mirror: git@github.com:gioui/gio-cmd
+secrets:
+ - fdc570bf-87f4-4528-8aee-4d1711b1c86f
+tasks:
+ - install_go: |
+     mkdir -p /home/build/sdk
+     curl -s https://dl.google.com/go/go1.19.8.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
+ - check_gofmt: |
+     cd gio-cmd
+     test -z "$(gofmt -s -l .)"
+ - check_sign_off: |
+     set +x -e
+     cd gio-cmd
+     for hash in $(git log -n 20 --format="%H"); do
+        message=$(git log -1 --format=%B $hash)
+        if [[ ! "$message" =~ "Signed-off-by: " ]]; then
+            echo "Missing 'Signed-off-by' in commit $hash"
+            exit 1
+        fi
+     done
+ - mirror: |
+     # mirror to github
+     ssh-keyscan github.com > "$HOME"/.ssh/known_hosts && cd gio-cmd && git push --mirror "$github_mirror" || echo "failed mirroring"
+ - install_chrome: |
+     curl -s https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+     sudo sh -c 'echo "deb [arch=amd64] https://dl-ssl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+     sudo apt-get -qq update
+     sudo apt-get -qq install -y google-chrome-stable
+ - test: |
+     cd gio-cmd
+     go test ./...
+     go test -race ./...
+ - install_jdk8: |
+     curl -so jdk.deb "https://cdn.azul.com/zulu/bin/zulu8.42.0.21-ca-jdk8.0.232-linux_amd64.deb"
+     sudo apt-get -qq install -y -f ./jdk.deb
+ - install_android: |
+     mkdir android
+     cd android
+     curl -so sdk-tools.zip https://dl.google.com/android/repository/$android_sdk_tools_zip
+     unzip -q sdk-tools.zip
+     rm sdk-tools.zip
+     curl -so ndk.zip https://dl.google.com/android/repository/$android_ndk_zip
+     unzip -q ndk.zip
+     rm ndk.zip
+     mv android-ndk-* ndk-bundle
+     yes|sdkmanager --licenses
+     sdkmanager "platforms;android-31" "build-tools;32.0.0"
+ - install_gogio: |
+     cd gio-cmd
+     go install ./gogio
+ - test_android_gogio: |
+     mkdir tmp
+     cd tmp
+     go mod init example.com
+     go get -d gioui.org/example/kitchen
+     gogio -target android gioui.org/example/kitchen

third_party/gioui-cmd/.builds/openbsd.yml

@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: Unlicense OR MIT
+image: openbsd/latest
+packages:
+ - libxkbcommon
+ - go
+sources:
+ - https://git.sr.ht/~eliasnaur/gio-cmd
+environment:
+ PATH: /home/build/sdk/go/bin:/bin:/usr/local/bin:/usr/bin
+tasks:
+ - install_go: |
+     mkdir -p /home/build/sdk
+     curl https://dl.google.com/go/go1.19.8.src.tar.gz | tar -C /home/build/sdk -xzf -
+     cd /home/build/sdk/go/src
+     ./make.bash
+ - test_cmd: |
+     cd gio-cmd
+     go test ./...

third_party/gioui-cmd/LICENSE

@@ -0,0 +1,63 @@
+This project is provided under the terms of the UNLICENSE or
+the MIT license denoted by the following SPDX identifier:
+
+SPDX-License-Identifier: Unlicense OR MIT
+
+You may use the project under the terms of either license.
+
+Both licenses are reproduced below.
+
+----
+The MIT License (MIT)
+
+Copyright (c) 2019 The Gio authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+---
+
+
+
+---
+The UNLICENSE
+
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org/>
+---

third_party/gioui-cmd/README.md

@@ -0,0 +1,21 @@
+# Gio Tools
+
+Tools for the [Gio project](https://gioui.org), most notably `gogio` for packaging Gio programs.
+
+[![builds.sr.ht status](https://builds.sr.ht/~eliasnaur/gio-cmd.svg)](https://builds.sr.ht/~eliasnaur/gio-cmd)
+
+## Issues
+
+File bugs and TODOs through the [issue tracker](https://todo.sr.ht/~eliasnaur/gio) or send an email
+to [~eliasnaur/gio@todo.sr.ht](mailto:~eliasnaur/gio@todo.sr.ht). For general discussion, use the
+mailing list: [~eliasnaur/gio@lists.sr.ht](mailto:~eliasnaur/gio@lists.sr.ht).
+
+## Contributing
+
+Post discussion to the [mailing list](https://lists.sr.ht/~eliasnaur/gio) and patches to
+[gio-patches](https://lists.sr.ht/~eliasnaur/gio-patches). No Sourcehut
+account is required and you can post without being subscribed.
+
+See the [contribution guide](https://gioui.org/doc/contribute) for more details.
+
+An [official GitHub mirror](https://github.com/gioui/gio-cmd) is available.

third_party/gioui-cmd/go.mod

@@ -0,0 +1,28 @@
+module gioui.org/cmd
+
+go 1.21
+
+require (
+	gioui.org v0.8.0
+	github.com/akavel/rsrc v0.10.1
+	github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4
+	github.com/chromedp/chromedp v0.5.2
+	golang.org/x/image v0.18.0
+	golang.org/x/sync v0.7.0
+	golang.org/x/text v0.16.0
+	golang.org/x/tools v0.23.0
+)
+
+require (
+	gioui.org/shader v1.0.8 // indirect
+	github.com/go-text/typesetting v0.2.1 // indirect
+	github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect
+	github.com/gobwas/pool v0.2.0 // indirect
+	github.com/gobwas/ws v1.0.2 // indirect
+	github.com/knq/sysutil v0.0.0-20191005231841-15668db23d08 // indirect
+	github.com/mailru/easyjson v0.7.0 // indirect
+	golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
+	golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 // indirect
+	golang.org/x/mod v0.19.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+)

third_party/gioui-cmd/go.sum

@@ -0,0 +1,44 @@
+eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKweuI9L6UgfTbYb0YwPacY=
+eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA=
+gioui.org v0.8.0 h1:QV5p5JvsmSmGiIXVYOKn6d9YDliTfjtLlVf5J+BZ9Pg=
+gioui.org v0.8.0/go.mod h1:vEMmpxMOd/iwJhXvGVIzWEbxMWhnMQ9aByOGQdlQ8rc=
+gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
+gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
+gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
+github.com/akavel/rsrc v0.10.1 h1:hCCPImjmFKVNGpeLZyTDRHEFC283DzyTXTo0cO0Rq9o=
+github.com/akavel/rsrc v0.10.1/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
+github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 h1:QD3KxSJ59L2lxG6MXBjNHxiQO2RmxTQ3XcK+wO44WOg=
+github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4/go.mod h1:PfAWWKJqjlGFYJEidUM6aVIWPr0EpobeyVWEEmplX7g=
+github.com/chromedp/chromedp v0.5.2 h1:W8xBXQuUnd2dZK0SN/lyVwsQM7KgW+kY5HGnntms194=
+github.com/chromedp/chromedp v0.5.2/go.mod h1:rsTo/xRo23KZZwFmWk2Ui79rBaVRRATCjLzNQlOFSiA=
+github.com/go-text/typesetting v0.2.1 h1:x0jMOGyO3d1qFAPI0j4GSsh7M0Q3Ypjzr4+CEVg82V8=
+github.com/go-text/typesetting v0.2.1/go.mod h1:mTOxEwasOFpAMBjEQDhdWRckoLLeI/+qrQeBCTGEt6M=
+github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0=
+github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+github.com/knq/sysutil v0.0.0-20191005231841-15668db23d08 h1:V0an7KRw92wmJysvFvtqtKMAPmvS5O0jtB0nYo6t+gs=
+github.com/knq/sysutil v0.0.0-20191005231841-15668db23d08/go.mod h1:dFWs1zEqDjFtnBXsd1vPOZaLsESovai349994nHx3e0=
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
+golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37 h1:SOSg7+sueresE4IbmmGM60GmlIys+zNX63d6/J4CMtU=
+golang.org/x/exp/shiny v0.0.0-20240707233637-46b078467d37/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o=
+golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
+golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
+golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
+golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
+golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=

third_party/gioui-cmd/gogio/android_test.go

@@ -0,0 +1,143 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main_test
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"image"
+	"image/png"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+)
+
+type AndroidTestDriver struct {
+	driverBase
+
+	sdkDir  string
+	adbPath string
+}
+
+var rxAdbDevice = regexp.MustCompile(`(.*)\s+device$`)
+
+func (d *AndroidTestDriver) Start(path string) {
+	d.sdkDir = os.Getenv("ANDROID_SDK_ROOT")
+	if d.sdkDir == "" {
+		d.Skipf("Android SDK is required; set $ANDROID_SDK_ROOT")
+	}
+	d.adbPath = filepath.Join(d.sdkDir, "platform-tools", "adb")
+	if _, err := os.Stat(d.adbPath); os.IsNotExist(err) {
+		d.Skipf("adb not found")
+	}
+
+	devOut := bytes.TrimSpace(d.adb("devices"))
+	devices := rxAdbDevice.FindAllSubmatch(devOut, -1)
+	switch len(devices) {
+	case 0:
+		d.Skipf("no Android devices attached via adb; skipping")
+	case 1:
+	default:
+		d.Skipf("multiple Android devices attached via adb; skipping")
+	}
+
+	// If the device is attached but asleep, it's probably just charging.
+	// Don't use it; the screen needs to be on and unlocked for the test to
+	// work.
+	if !bytes.Contains(
+		d.adb("shell", "dumpsys", "power"),
+		[]byte(" mWakefulness=Awake"),
+	) {
+		d.Skipf("Android device isn't awake; skipping")
+	}
+
+	// First, build the app.
+	apk := filepath.Join(d.tempDir("gio-endtoend-android"), "e2e.apk")
+	d.gogio("-target=android", "-appid="+appid, "-o="+apk, path)
+
+	// Make sure the app isn't installed already, and try to uninstall it
+	// when we finish. Previous failed test runs might have left the app.
+	d.tryUninstall()
+	d.adb("install", apk)
+	d.Cleanup(d.tryUninstall)
+
+	// Force our e2e app to be fullscreen, so that the android system bar at
+	// the top doesn't mess with our screenshots.
+	// TODO(mvdan): is there a way to do this via gio, so that we don't need
+	// to set up a global Android setting via the shell?
+	d.adb("shell", "settings", "put", "global", "policy_control", "immersive.full="+appid)
+
+	// Make sure the app isn't already running.
+	d.adb("shell", "pm", "clear", appid)
+
+	// Start listening for log messages.
+	{
+		ctx, cancel := context.WithCancel(context.Background())
+		cmd := exec.CommandContext(ctx, d.adbPath,
+			"logcat",
+			"-s",       // suppress other logs
+			"-T1",      // don't show previous log messages
+			appid+":*", // show all logs from our gio app ID
+		)
+		output, err := cmd.StdoutPipe()
+		if err != nil {
+			d.Fatal(err)
+		}
+		cmd.Stderr = cmd.Stdout
+		d.output = output
+		if err := cmd.Start(); err != nil {
+			d.Fatal(err)
+		}
+		d.Cleanup(cancel)
+	}
+
+	// Start the app.
+	d.adb("shell", "monkey", "-p", appid, "1")
+
+	// Wait for the gio app to render.
+	d.waitForFrame()
+}
+
+func (d *AndroidTestDriver) Screenshot() image.Image {
+	out := d.adb("shell", "screencap", "-p")
+	img, err := png.Decode(bytes.NewReader(out))
+	if err != nil {
+		d.Fatal(err)
+	}
+	return img
+}
+
+func (d *AndroidTestDriver) tryUninstall() {
+	cmd := exec.Command(d.adbPath, "shell", "pm", "uninstall", appid)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		if bytes.Contains(out, []byte("Unknown package")) {
+			// The package is not installed. Don't log anything.
+			return
+		}
+		d.Logf("could not uninstall: %v\n%s", err, out)
+	}
+}
+
+func (d *AndroidTestDriver) adb(args ...interface{}) []byte {
+	strs := []string{}
+	for _, arg := range args {
+		strs = append(strs, fmt.Sprint(arg))
+	}
+	cmd := exec.Command(d.adbPath, strs...)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		d.Errorf("%s", out)
+		d.Fatal(err)
+	}
+	return out
+}
+
+func (d *AndroidTestDriver) Click(x, y int) {
+	d.adb("shell", "input", "tap", x, y)
+
+	// Wait for the gio app to render after this click.
+	d.waitForFrame()
+}

third_party/gioui-cmd/gogio/build_info.go

@@ -0,0 +1,206 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+)
+
+type buildInfo struct {
+	appID          string
+	archs          []string
+	ldflags        string
+	minsdk         int
+	targetsdk      int
+	name           string
+	pkgDir         string
+	pkgPath        string
+	iconPath       string
+	tags           string
+	target         string
+	version        Semver
+	key            string
+	password       string
+	notaryAppleID  string
+	notaryPassword string
+	notaryTeamID   string
+}
+
+type Semver struct {
+	Major, Minor, Patch int
+	VersionCode         uint32
+}
+
+func newBuildInfo(pkgPath string) (*buildInfo, error) {
+	pkgMetadata, err := getPkgMetadata(pkgPath)
+	if err != nil {
+		return nil, err
+	}
+	appID := getAppID(pkgMetadata)
+	appIcon := filepath.Join(pkgMetadata.Dir, "appicon.png")
+	if *iconPath != "" {
+		appIcon = *iconPath
+	}
+	appName := getPkgName(pkgMetadata)
+	if *name != "" {
+		appName = *name
+	}
+	ver, err := parseSemver(*version)
+	if err != nil {
+		return nil, err
+	}
+	bi := &buildInfo{
+		appID:          appID,
+		archs:          getArchs(),
+		ldflags:        getLdFlags(appID),
+		minsdk:         *minsdk,
+		targetsdk:      *targetsdk,
+		name:           appName,
+		pkgDir:         pkgMetadata.Dir,
+		pkgPath:        pkgPath,
+		iconPath:       appIcon,
+		tags:           *extraTags,
+		target:         *target,
+		version:        ver,
+		key:            *signKey,
+		password:       *signPass,
+		notaryAppleID:  *notaryID,
+		notaryPassword: *notaryPass,
+		notaryTeamID:   *notaryTeamID,
+	}
+	return bi, nil
+}
+
+// UppercaseName returns a string with its first rune in uppercase.
+func UppercaseName(name string) string {
+	ch, w := utf8.DecodeRuneInString(name)
+	return string(unicode.ToUpper(ch)) + name[w:]
+}
+
+func (s Semver) String() string {
+	return fmt.Sprintf("%d.%d.%d.%d", s.Major, s.Minor, s.Patch, s.VersionCode)
+}
+
+func parseSemver(v string) (Semver, error) {
+	var sv Semver
+	_, err := fmt.Sscanf(v, "%d.%d.%d.%d", &sv.Major, &sv.Minor, &sv.Patch, &sv.VersionCode)
+	if err != nil {
+		return Semver{}, fmt.Errorf("invalid semver: %q", v)
+	}
+	if sv.String() != v {
+		return Semver{}, fmt.Errorf("invalid semver: %q", v)
+	}
+	return sv, nil
+}
+
+func getArchs() []string {
+	if *archNames != "" {
+		return strings.Split(*archNames, ",")
+	}
+	switch *target {
+	case "js":
+		return []string{"wasm"}
+	case "ios", "tvos":
+		// Only 64-bit support.
+		return []string{"arm64", "amd64"}
+	case "android":
+		return []string{"arm", "arm64", "386", "amd64"}
+	case "windows":
+		goarch := os.Getenv("GOARCH")
+		if goarch == "" {
+			goarch = runtime.GOARCH
+		}
+		return []string{goarch}
+	case "macos":
+		return []string{"arm64", "amd64"}
+	default:
+		// TODO: Add flag tests.
+		panic("The target value has already been validated, this will never execute.")
+	}
+}
+
+func getLdFlags(appID string) string {
+	var ldflags []string
+	if extra := *extraLdflags; extra != "" {
+		ldflags = append(ldflags, strings.Split(extra, " ")...)
+	}
+	// Pass appID along, to be used for logging on platforms like Android.
+	ldflags = append(ldflags, fmt.Sprintf("-X gioui.org/app.ID=%s", appID))
+	// Support earlier Gio versions that had a separate app id recorded.
+	// TODO: delete this in the future.
+	ldflags = append(ldflags, fmt.Sprintf("-X gioui.org/app/internal/log.appID=%s", appID))
+	// Pass along all remaining arguments to the app.
+	if appArgs := flag.Args()[1:]; len(appArgs) > 0 {
+		ldflags = append(ldflags, fmt.Sprintf("-X gioui.org/app.extraArgs=%s", strings.Join(appArgs, "|")))
+	}
+	if m := *linkMode; m != "" {
+		ldflags = append(ldflags, "-linkmode="+m)
+	}
+	return strings.Join(ldflags, " ")
+}
+
+type packageMetadata struct {
+	PkgPath string
+	Dir     string
+}
+
+func getPkgMetadata(pkgPath string) (*packageMetadata, error) {
+	pkgImportPath, err := runCmd(exec.Command("go", "list", "-tags", *extraTags, "-f", "{{.ImportPath}}", pkgPath))
+	if err != nil {
+		return nil, err
+	}
+	pkgDir, err := runCmd(exec.Command("go", "list", "-tags", *extraTags, "-f", "{{.Dir}}", pkgPath))
+	if err != nil {
+		return nil, err
+	}
+	return &packageMetadata{
+		PkgPath: pkgImportPath,
+		Dir:     pkgDir,
+	}, nil
+}
+
+func getAppID(pkgMetadata *packageMetadata) string {
+	if *appID != "" {
+		return *appID
+	}
+	elems := strings.Split(pkgMetadata.PkgPath, "/")
+	domain := strings.Split(elems[0], ".")
+	name := ""
+	if len(elems) > 1 {
+		name = "." + elems[len(elems)-1]
+	}
+	if len(elems) < 2 && len(domain) < 2 {
+		name = "." + domain[0]
+		domain[0] = "localhost"
+	} else {
+		for i := 0; i < len(domain)/2; i++ {
+			opp := len(domain) - 1 - i
+			domain[i], domain[opp] = domain[opp], domain[i]
+		}
+	}
+
+	pkgDomain := strings.Join(domain, ".")
+	appid := []rune(pkgDomain + name)
+
+	// a Java-language-style package name may contain upper- and lower-case
+	// letters and underscores with individual parts separated by '.'.
+	// https://developer.android.com/guide/topics/manifest/manifest-element
+	for i, c := range appid {
+		if !('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' ||
+			c == '_' || c == '.') {
+			appid[i] = '_'
+		}
+	}
+	return string(appid)
+}
+
+func getPkgName(pkgMetadata *packageMetadata) string {
+	return path.Base(pkgMetadata.PkgPath)
+}

third_party/gioui-cmd/gogio/build_info_test.go

@@ -0,0 +1,32 @@
+package main
+
+import "testing"
+
+type expval struct {
+	in, out string
+}
+
+func TestAppID(t *testing.T) {
+	t.Parallel()
+
+	tests := []expval{
+		{"example", "localhost.example"},
+		{"example.com", "com.example"},
+		{"www.example.com", "com.example.www"},
+		{"examplecom/app", "examplecom.app"},
+		{"example.com/app", "com.example.app"},
+		{"www.example.com/app", "com.example.www.app"},
+		{"www.en.example.com/app", "com.example.en.www.app"},
+		{"example.com/dir/app", "com.example.app"},
+		{"example.com/dir.ext/app", "com.example.app"},
+		{"example.com/dir/app.ext", "com.example.app.ext"},
+		{"example-com.net/dir/app", "net.example_com.app"},
+	}
+
+	for i, test := range tests {
+		got := getAppID(&packageMetadata{PkgPath: test.in})
+		if exp := test.out; got != exp {
+			t.Errorf("(%d): expected '%s', got '%s'", i, exp, got)
+		}
+	}
+}

third_party/gioui-cmd/gogio/doc.go

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+/*
+The gogio tool builds and packages Gio programs for Android, iOS/tvOS
+and WebAssembly.
+
+Run gogio with no arguments for instructions, or see the examples at
+https://gioui.org.
+*/
+package main

third_party/gioui-cmd/gogio/e2e_test.go

@@ -0,0 +1,337 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main_test
+
+import (
+	"bufio"
+	"errors"
+	"flag"
+	"fmt"
+	"image"
+	"image/color"
+	"io"
+	"os"
+	"os/exec"
+	"runtime"
+	"strings"
+	"testing"
+	"time"
+)
+
+var raceEnabled = false
+
+var headless = flag.Bool("headless", true, "run end-to-end tests in headless mode")
+
+const appid = "localhost.gogio.endtoend"
+
+// TestDriver is implemented by each of the platforms we can run end-to-end
+// tests on. None of its methods return any errors, as the errors are directly
+// reported to testing.T via methods like Fatal.
+type TestDriver interface {
+	initBase(t *testing.T, width, height int)
+
+	// Start opens the Gio app found at path. The driver should attempt to
+	// run the app with the base driver's width and height, and the
+	// platform's background should be white.
+	//
+	// When the function returns, the gio app must be ready to use on the
+	// platform, with its initial frame fully drawn.
+	Start(path string)
+
+	// Screenshot takes a screenshot of the Gio app on the platform.
+	Screenshot() image.Image
+
+	// Click performs a pointer click at the specified coordinates,
+	// including both press and release. It returns when the next frame is
+	// fully drawn.
+	Click(x, y int)
+}
+
+type driverBase struct {
+	*testing.T
+
+	width, height int
+
+	output      io.Reader
+	frameNotifs chan bool
+}
+
+func (d *driverBase) initBase(t *testing.T, width, height int) {
+	d.T = t
+	d.width, d.height = width, height
+}
+
+func TestEndToEnd(t *testing.T) {
+	if testing.Short() {
+		t.Skipf("end-to-end tests tend to be slow")
+	}
+
+	t.Parallel()
+
+	const (
+		testdataWithGoImportPkgPath             = "gioui.org/cmd/gogio/internal/normal"
+		testdataWithRelativePkgPath             = "internal/normal/testdata.go"
+		customRenderTestdataWithRelativePkgPath = "internal/custom/testdata.go"
+	)
+	// Keep this list local, to not reuse TestDriver objects.
+	subtests := []struct {
+		name      string
+		driver    TestDriver
+		pkgPath   string
+		skipGeese string
+	}{
+		{"X11 using go import path", &X11TestDriver{}, testdataWithGoImportPkgPath, ""},
+		{"X11", &X11TestDriver{}, testdataWithRelativePkgPath, ""},
+		{"X11 with custom rendering", &X11TestDriver{}, customRenderTestdataWithRelativePkgPath, "openbsd,darwin,windows,netbsd"},
+		// Doesn't work on the builders.
+		//{"Wayland", &WaylandTestDriver{}, testdataWithRelativePkgPath},
+		{"JS", &JSTestDriver{}, testdataWithRelativePkgPath, ""},
+		{"Android", &AndroidTestDriver{}, testdataWithRelativePkgPath, ""},
+		{"Windows", &WineTestDriver{}, testdataWithRelativePkgPath, ""},
+	}
+
+	for _, subtest := range subtests {
+		t.Run(subtest.name, func(t *testing.T) {
+			subtest := subtest // copy the changing loop variable
+			if strings.Contains(subtest.skipGeese, runtime.GOOS) {
+				t.Skipf("not supported on %s", runtime.GOOS)
+			}
+			t.Parallel()
+			runEndToEndTest(t, subtest.driver, subtest.pkgPath)
+		})
+	}
+}
+
+func runEndToEndTest(t *testing.T, driver TestDriver, pkgPath string) {
+	size := image.Point{X: 800, Y: 600}
+	driver.initBase(t, size.X, size.Y)
+
+	t.Log("starting driver and gio app")
+	driver.Start(pkgPath)
+
+	beef := color.NRGBA{R: 0xde, G: 0xad, B: 0xbe, A: 0xff}
+	white := color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
+	black := color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xff}
+	gray := color.NRGBA{R: 0xbb, G: 0xbb, B: 0xbb, A: 0xff}
+	red := color.NRGBA{R: 0xff, G: 0x00, B: 0x00, A: 0xff}
+
+	// These are the four colors at the beginning.
+	t.Log("taking initial screenshot")
+	withRetries(t, 4*time.Second, func() error {
+		img := driver.Screenshot()
+		size = img.Bounds().Size() // override the default size
+		return checkImageCorners(img, beef, white, black, gray)
+	})
+
+	// TODO(mvdan): implement this properly in the Wayland driver; swaymsg
+	// almost works to automate clicks, but the button presses end up in the
+	// wrong coordinates.
+	if _, ok := driver.(*WaylandTestDriver); ok {
+		return
+	}
+
+	// Click the first and last sections to turn them red.
+	t.Log("clicking twice and taking another screenshot")
+	driver.Click(1*(size.X/4), 1*(size.Y/4))
+	driver.Click(3*(size.X/4), 3*(size.Y/4))
+	withRetries(t, 4*time.Second, func() error {
+		img := driver.Screenshot()
+		return checkImageCorners(img, red, white, black, red)
+	})
+}
+
+// withRetries keeps retrying fn until it succeeds, or until the timeout is hit.
+// It uses a rudimentary kind of backoff, which starts with 100ms delays. As
+// such, timeout should generally be in the order of seconds.
+func withRetries(t *testing.T, timeout time.Duration, fn func() error) {
+	t.Helper()
+
+	timeoutTimer := time.NewTimer(timeout)
+	defer timeoutTimer.Stop()
+	backoff := 100 * time.Millisecond
+
+	tries := 0
+	var lastErr error
+	for {
+		if lastErr = fn(); lastErr == nil {
+			return
+		}
+		tries++
+		t.Logf("retrying after %s", backoff)
+
+		// Use a timer instead of a sleep, so that the timeout can stop
+		// the backoff early. Don't reuse this timer, since we're not in
+		// a hot loop, and we don't want tricky code.
+		backoffTimer := time.NewTimer(backoff)
+		defer backoffTimer.Stop()
+
+		select {
+		case <-timeoutTimer.C:
+			t.Errorf("last error: %v", lastErr)
+			t.Fatalf("hit timeout of %s after %d tries", timeout, tries)
+		case <-backoffTimer.C:
+		}
+
+		// Keep doubling it until a maximum. With the start at 100ms,
+		// we'll do: 100ms, 200ms, 400ms, 800ms, 1.6s, and 2s forever.
+		backoff *= 2
+		if max := 2 * time.Second; backoff > max {
+			backoff = max
+		}
+	}
+}
+
+type colorMismatch struct {
+	x, y            int
+	wantRGB, gotRGB [3]uint32
+}
+
+func (m colorMismatch) String() string {
+	return fmt.Sprintf("%3d,%-3d got 0x%04x%04x%04x, want 0x%04x%04x%04x",
+		m.x, m.y,
+		m.gotRGB[0], m.gotRGB[1], m.gotRGB[2],
+		m.wantRGB[0], m.wantRGB[1], m.wantRGB[2],
+	)
+}
+
+func checkImageCorners(img image.Image, topLeft, topRight, botLeft, botRight color.Color) error {
+	// The colors are split in four rectangular sections. Check the corners
+	// of each of the sections. We check the corners left to right, top to
+	// bottom, like when reading left-to-right text.
+
+	size := img.Bounds().Size()
+	var mismatches []colorMismatch
+
+	checkColor := func(x, y int, want color.Color) {
+		r, g, b, _ := want.RGBA()
+		got := img.At(x, y)
+		r_, g_, b_, _ := got.RGBA()
+		if r_ != r || g_ != g || b_ != b {
+			mismatches = append(mismatches, colorMismatch{
+				x:       x,
+				y:       y,
+				wantRGB: [3]uint32{r, g, b},
+				gotRGB:  [3]uint32{r_, g_, b_},
+			})
+		}
+	}
+
+	{
+		minX, minY := 5, 5
+		maxX, maxY := (size.X/2)-5, (size.Y/2)-5
+		checkColor(minX, minY, topLeft)
+		checkColor(maxX, minY, topLeft)
+		checkColor(minX, maxY, topLeft)
+		checkColor(maxX, maxY, topLeft)
+	}
+	{
+		minX, minY := (size.X/2)+5, 5
+		maxX, maxY := size.X-5, (size.Y/2)-5
+		checkColor(minX, minY, topRight)
+		checkColor(maxX, minY, topRight)
+		checkColor(minX, maxY, topRight)
+		checkColor(maxX, maxY, topRight)
+	}
+	{
+		minX, minY := 5, (size.Y/2)+5
+		maxX, maxY := (size.X/2)-5, size.Y-5
+		checkColor(minX, minY, botLeft)
+		checkColor(maxX, minY, botLeft)
+		checkColor(minX, maxY, botLeft)
+		checkColor(maxX, maxY, botLeft)
+	}
+	{
+		minX, minY := (size.X/2)+5, (size.Y/2)+5
+		maxX, maxY := size.X-5, size.Y-5
+		checkColor(minX, minY, botRight)
+		checkColor(maxX, minY, botRight)
+		checkColor(minX, maxY, botRight)
+		checkColor(maxX, maxY, botRight)
+	}
+	if n := len(mismatches); n > 0 {
+		b := new(strings.Builder)
+		fmt.Fprintf(b, "encountered %d color mismatches:\n", n)
+		for _, m := range mismatches {
+			fmt.Fprintf(b, "%s\n", m)
+		}
+		return errors.New(b.String())
+	}
+	return nil
+}
+
+func (d *driverBase) waitForFrame() {
+	d.Helper()
+
+	if d.frameNotifs == nil {
+		// Start the goroutine that reads output lines and notifies of
+		// new frames via frameNotifs. The test doesn't wait for this
+		// goroutine to finish; it will naturally end when the output
+		// reader reaches an error like EOF.
+		d.frameNotifs = make(chan bool, 1)
+		if d.output == nil {
+			d.Fatal("need an output reader to be notified of frames")
+		}
+		go func() {
+			scanner := bufio.NewScanner(d.output)
+			for scanner.Scan() {
+				line := scanner.Text()
+				d.Log(line)
+				if strings.Contains(line, "gio frame ready") {
+					d.frameNotifs <- true
+				}
+			}
+			// Since we're only interested in the output while the
+			// app runs, and we don't know when it finishes here,
+			// ignore "already closed" pipe errors.
+			if err := scanner.Err(); err != nil && !errors.Is(err, os.ErrClosed) {
+				d.Errorf("reading app output: %v", err)
+			}
+		}()
+	}
+
+	// Unfortunately, there isn't a way to select on a test failing, since
+	// testing.T doesn't have anything like a context or a "done" channel.
+	//
+	// We can't let selects block forever, since the default -test.timeout
+	// is ten minutes - far too long for tests that take seconds.
+	//
+	// For now, a static short timeout is better than nothing. 5s is plenty
+	// for our simple test app to render on any device.
+	select {
+	case <-d.frameNotifs:
+	case <-time.After(5 * time.Second):
+		d.Fatalf("timed out waiting for a frame to be ready")
+	}
+}
+
+func (d *driverBase) needPrograms(names ...string) {
+	d.Helper()
+	for _, name := range names {
+		if _, err := exec.LookPath(name); err != nil {
+			d.Skipf("%s needed to run", name)
+		}
+	}
+}
+
+func (d *driverBase) tempDir(name string) string {
+	d.Helper()
+	dir, err := os.MkdirTemp("", name)
+	if err != nil {
+		d.Fatal(err)
+	}
+	d.Cleanup(func() { os.RemoveAll(dir) })
+	return dir
+}
+
+func (d *driverBase) gogio(args ...string) {
+	d.Helper()
+	prog, err := os.Executable()
+	if err != nil {
+		d.Fatal(err)
+	}
+	cmd := exec.Command(prog, args...)
+	cmd.Env = append(os.Environ(), "RUN_GOGIO=1")
+	if out, err := cmd.CombinedOutput(); err != nil {
+		d.Fatalf("gogio error: %s:\n%s", err, out)
+	}
+}

third_party/gioui-cmd/gogio/help.go

@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main
+
+const mainUsage = `The gogio command builds and packages Gio (gioui.org) programs.
+
+Usage:
+
+	gogio -target <target> [flags] <package> [run arguments]
+
+The gogio tool builds and packages Gio programs for platforms where additional
+metadata or support files are required.
+
+The package argument specifies an import path or a single Go source file to
+package. Any run arguments are appended to os.Args at runtime.
+
+Compiled Java class files from jar files in the package directory are
+included in Android builds.
+
+The mandatory -target flag selects the target platform: ios or android for the
+mobile platforms, tvos for Apple's tvOS, js for WebAssembly/WebGL, macos for
+MacOS and windows for Windows.
+
+The -arch flag specifies a comma separated list of GOARCHs to include. The
+default is all supported architectures.
+
+The -o flag specifies an output file or directory, depending on the target.
+
+The -buildmode flag selects the build mode. Two build modes are available, exe
+and archive. Buildmode exe outputs an .ipa file for iOS or tvOS, an .apk file
+for Android or a directory with the WebAssembly module and support files for
+a browser.
+
+The -ldflags and -tags flags pass extra linker flags and tags to the go tool.
+
+As a special case for iOS or tvOS, specifying a path that ends with ".app"
+will output an app directory suitable for a simulator.
+
+The other buildmode is archive, which will output an .aar library for Android
+or a .framework for iOS and tvOS.
+
+The -icon flag specifies a path to a PNG image to use as app icon on iOS and Android.
+If left unspecified, the appicon.png file from the main package is used
+(if it exists).
+
+The -appid flag specifies the package name for Android or the bundle id for
+iOS and tvOS. A bundle id must be provisioned through Xcode before the gogio
+tool can use it.
+
+The -version flag specifies the integer version code for Android and the last
+component of the 1.0.X version for iOS and tvOS.
+
+For Android builds the -minsdk flag specify the minimum SDK level. For example,
+use -minsdk 22 to target Android 5.1 (Lollipop) and later.
+
+For Windows builds the -minsdk flag specify the minimum OS version. For example,
+use -mindk 10 to target Windows 10 and later, -minsdk 6 for Windows Vista and later.
+
+For iOS builds the -minsdk flag specify the minimum iOS version. For example, 
+use -mindk 15 to target iOS 15.0 and later.
+
+For Android builds the -targetsdk flag specify the target SDK level. For example,
+use -targetsdk 33 to target Android 13 (Tiramisu) and later.
+
+The -work flag prints the path to the working directory and suppress
+its deletion.
+
+The -x flag will print all the external commands executed by the gogio tool.
+
+The -signkey flag specifies the path of the keystore, used for signing Android apk/aab files
+or specifies the name of key on Keychain to sign MacOS app.
+
+The -signpass flag specifies the password of the keystore, ignored if -signkey is not provided.
+
+The -notaryid flag specifies the Apple ID to use for notarization of MacOS app.
+
+The -notarypass flag specifies the password of the Apple ID, ignored if -notaryid is not 
+provided. That must be an app-specific password, see https://support.apple.com/en-us/HT204397 
+for details. If not provided, the password will be prompted.
+
+The -notaryteamid flag specifies the team ID to use for notarization of MacOS app, ignored if
+-notaryid is not provided.
+`

third_party/gioui-cmd/gogio/internal/custom/testdata.go

@@ -0,0 +1,371 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+//go:build linux
+// +build linux
+
+// This program demonstrates the use of a custom OpenGL ES context with
+// app.Window.
+package main
+
+import (
+	"errors"
+	"fmt"
+	"image"
+	"image/color"
+	"log"
+	"os"
+	"runtime"
+	"strings"
+	"unsafe"
+
+	"gioui.org/app"
+	"gioui.org/gpu"
+	"gioui.org/io/event"
+	"gioui.org/io/pointer"
+	"gioui.org/layout"
+	"gioui.org/op"
+	"gioui.org/op/clip"
+	"gioui.org/op/paint"
+)
+
+/*
+#cgo linux pkg-config: egl wayland-egl
+#cgo freebsd openbsd CFLAGS: -I/usr/local/include
+#cgo openbsd CFLAGS: -I/usr/X11R6/include
+#cgo freebsd LDFLAGS: -L/usr/local/lib
+#cgo openbsd LDFLAGS: -L/usr/X11R6/lib
+#cgo freebsd openbsd LDFLAGS: -lwayland-egl
+#cgo CFLAGS: -DEGL_NO_X11
+#cgo LDFLAGS: -lEGL -lGLESv2
+
+#include <EGL/egl.h>
+#include <wayland-client.h>
+#include <wayland-egl.h>
+#include <GLES3/gl3.h>
+#define EGL_EGLEXT_PROTOTYPES
+#include <EGL/eglext.h>
+
+*/
+import "C"
+
+func getDisplay(ve app.ViewEvent) C.EGLDisplay {
+	switch ve := ve.(type) {
+	case app.X11ViewEvent:
+		return C.eglGetDisplay(C.EGLNativeDisplayType(ve.Display))
+	case app.WaylandViewEvent:
+		return C.eglGetDisplay(C.EGLNativeDisplayType(ve.Display))
+	}
+	panic("no display available")
+}
+
+func nativeViewFor(e app.ViewEvent, size image.Point) (C.EGLNativeWindowType, func()) {
+	switch e := e.(type) {
+	case app.X11ViewEvent:
+		return C.EGLNativeWindowType(uintptr(e.Window)), func() {}
+	case app.WaylandViewEvent:
+		eglWin := C.wl_egl_window_create((*C.struct_wl_surface)(e.Surface), C.int(size.X), C.int(size.Y))
+		return C.EGLNativeWindowType(uintptr(unsafe.Pointer(eglWin))), func() {
+			C.wl_egl_window_destroy(eglWin)
+		}
+	}
+	panic("no native view available")
+}
+
+type (
+	C = layout.Context
+	D = layout.Dimensions
+)
+
+type notifyFrame int
+
+const (
+	notifyNone notifyFrame = iota
+	notifyInvalidate
+	notifyPrint
+)
+
+// notify keeps track of whether we want to print to stdout to notify the user
+// when a frame is ready. Initially we want to notify about the first frame.
+var notify = notifyInvalidate
+
+type eglContext struct {
+	disp    C.EGLDisplay
+	ctx     C.EGLContext
+	surf    C.EGLSurface
+	cleanup func()
+}
+
+func main() {
+	go func() {
+		// Set CustomRenderer so we can provide our own rendering context.
+		w := new(app.Window)
+		w.Option(app.CustomRenderer(true))
+		if err := loop(w); err != nil {
+			log.Fatal(err)
+		}
+		os.Exit(0)
+	}()
+	app.Main()
+}
+
+func loop(w *app.Window) error {
+	var ops op.Ops
+	var (
+		ctx    *eglContext
+		gioCtx gpu.GPU
+		ve     app.ViewEvent
+		init   bool
+		size   image.Point
+	)
+
+	recreateContext := func() {
+		w.Run(func() {
+			if gioCtx != nil {
+				gioCtx.Release()
+				gioCtx = nil
+			}
+			if ctx != nil {
+				C.eglMakeCurrent(ctx.disp, nil, nil, nil)
+				ctx.Release()
+				ctx = nil
+			}
+			c, err := createContext(ve, size)
+			if err != nil {
+				log.Fatal(err)
+			}
+			ctx = c
+		})
+		if ok := C.eglMakeCurrent(ctx.disp, ctx.surf, ctx.surf, ctx.ctx); ok != C.EGL_TRUE {
+			err := fmt.Errorf("eglMakeCurrent failed (%#x)", C.eglGetError())
+			log.Fatal(err)
+		}
+		glGetString := func(e C.GLenum) string {
+			return C.GoString((*C.char)(unsafe.Pointer(C.glGetString(e))))
+		}
+		fmt.Printf("GL_VERSION: %s\nGL_RENDERER: %s\n", glGetString(C.GL_VERSION), glGetString(C.GL_RENDERER))
+		var err error
+		gioCtx, err = gpu.New(gpu.OpenGL{ES: true, Shared: true})
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+
+	topLeft := quarterWidget{
+		color: color.NRGBA{R: 0xde, G: 0xad, B: 0xbe, A: 0xff},
+	}
+	topRight := quarterWidget{
+		color: color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff},
+	}
+	botLeft := quarterWidget{
+		color: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xff},
+	}
+	botRight := quarterWidget{
+		color: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x80},
+	}
+
+	// eglMakeCurrent binds a context to an operating system thread. Prevent Go from switching thread.
+	runtime.LockOSThread()
+	for {
+		switch e := w.Event().(type) {
+		case app.ViewEvent:
+			ve = e
+			init = true
+			if size != (image.Point{}) {
+				recreateContext()
+			}
+		case app.DestroyEvent:
+			return e.Err
+		case app.FrameEvent:
+			if init && size != e.Size {
+				size = e.Size
+				recreateContext()
+			}
+			if gioCtx == nil || !init {
+				break
+			}
+			// Build ops.
+			gtx := app.NewContext(&ops, e)
+
+			// Clear background to white, even on embedded platforms such as webassembly.
+			paint.Fill(gtx.Ops, color.NRGBA{A: 0xff, R: 0xff, G: 0xff, B: 0xff})
+			layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+				layout.Flexed(1, func(gtx C) D {
+					return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
+						// r1c1
+						layout.Flexed(1, func(gtx C) D { return topLeft.Layout(gtx) }),
+						// r1c2
+						layout.Flexed(1, func(gtx C) D { return topRight.Layout(gtx) }),
+					)
+				}),
+				layout.Flexed(1, func(gtx C) D {
+					return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
+						// r2c1
+						layout.Flexed(1, func(gtx C) D { return botLeft.Layout(gtx) }),
+						// r2c2
+						layout.Flexed(1, func(gtx C) D { return botRight.Layout(gtx) }),
+					)
+				}),
+			)
+			gtx.Execute(op.InvalidateCmd{})
+			log.Println("frame")
+
+			// Trigger window resize detection in ANGLE.
+			C.eglWaitClient()
+			// Draw custom OpenGL content.
+			drawGL()
+
+			// Render drawing ops.
+			if err := gioCtx.Frame(gtx.Ops, gpu.OpenGLRenderTarget{}, e.Size); err != nil {
+				log.Fatal(fmt.Errorf("render failed: %v", err))
+			}
+
+			// Process non-drawing ops.
+			e.Frame(gtx.Ops)
+			switch notify {
+			case notifyInvalidate:
+				notify = notifyPrint
+				w.Invalidate()
+			case notifyPrint:
+				notify = notifyNone
+				fmt.Println("gio frame ready")
+			}
+
+			if ok := C.eglSwapBuffers(ctx.disp, ctx.surf); ok != C.EGL_TRUE {
+				log.Fatal(fmt.Errorf("swap failed: %v", C.eglGetError()))
+			}
+
+		}
+	}
+	return nil
+}
+
+func drawGL() {
+	C.glClearColor(0, 0, 0, 1)
+	C.glClear(C.GL_COLOR_BUFFER_BIT | C.GL_DEPTH_BUFFER_BIT)
+}
+
+func createContext(ve app.ViewEvent, size image.Point) (*eglContext, error) {
+	view, cleanup := nativeViewFor(ve, size)
+	var nilv C.EGLNativeWindowType
+	if view == nilv {
+		return nil, fmt.Errorf("failed creating native view")
+	}
+	disp := getDisplay(ve)
+	if disp == 0 {
+		return nil, fmt.Errorf("eglGetPlatformDisplay failed: 0x%x", C.eglGetError())
+	}
+	var major, minor C.EGLint
+	if ok := C.eglInitialize(disp, &major, &minor); ok != C.EGL_TRUE {
+		return nil, fmt.Errorf("eglInitialize failed: 0x%x", C.eglGetError())
+	}
+	exts := strings.Split(C.GoString(C.eglQueryString(disp, C.EGL_EXTENSIONS)), " ")
+	srgb := hasExtension(exts, "EGL_KHR_gl_colorspace")
+	attribs := []C.EGLint{
+		C.EGL_RENDERABLE_TYPE, C.EGL_OPENGL_ES2_BIT,
+		C.EGL_SURFACE_TYPE, C.EGL_WINDOW_BIT,
+		C.EGL_BLUE_SIZE, 8,
+		C.EGL_GREEN_SIZE, 8,
+		C.EGL_RED_SIZE, 8,
+		C.EGL_CONFIG_CAVEAT, C.EGL_NONE,
+	}
+	if srgb {
+		// Some drivers need alpha for sRGB framebuffers to work.
+		attribs = append(attribs, C.EGL_ALPHA_SIZE, 8)
+	}
+	attribs = append(attribs, C.EGL_NONE)
+	var (
+		cfg     C.EGLConfig
+		numCfgs C.EGLint
+	)
+	if ok := C.eglChooseConfig(disp, &attribs[0], &cfg, 1, &numCfgs); ok != C.EGL_TRUE {
+		return nil, fmt.Errorf("eglChooseConfig failed: 0x%x", C.eglGetError())
+	}
+	if numCfgs == 0 {
+		supportsNoCfg := hasExtension(exts, "EGL_KHR_no_config_context")
+		if !supportsNoCfg {
+			return nil, errors.New("eglChooseConfig returned no configs")
+		}
+	}
+	ctxAttribs := []C.EGLint{
+		C.EGL_CONTEXT_CLIENT_VERSION, 3,
+		C.EGL_NONE,
+	}
+	ctx := C.eglCreateContext(disp, cfg, nil, &ctxAttribs[0])
+	if ctx == nil {
+		return nil, fmt.Errorf("eglCreateContext failed: 0x%x", C.eglGetError())
+	}
+	var surfAttribs []C.EGLint
+	if srgb {
+		surfAttribs = append(surfAttribs, C.EGL_GL_COLORSPACE, C.EGL_GL_COLORSPACE_SRGB)
+	}
+	surfAttribs = append(surfAttribs, C.EGL_NONE)
+	surf := C.eglCreateWindowSurface(disp, cfg, view, &surfAttribs[0])
+	if surf == nil {
+		return nil, fmt.Errorf("eglCreateWindowSurface failed (0x%x)", C.eglGetError())
+	}
+	return &eglContext{disp: disp, ctx: ctx, surf: surf, cleanup: cleanup}, nil
+}
+
+func (c *eglContext) Release() {
+	if c.ctx != nil {
+		C.eglDestroyContext(c.disp, c.ctx)
+	}
+	if c.surf != nil {
+		C.eglDestroySurface(c.disp, c.surf)
+	}
+	if c.cleanup != nil {
+		c.cleanup()
+	}
+	*c = eglContext{}
+}
+
+func hasExtension(exts []string, ext string) bool {
+	for _, e := range exts {
+		if ext == e {
+			return true
+		}
+	}
+	return false
+}
+
+// quarterWidget paints a quarter of the screen with one color. When clicked, it
+// turns red, going back to its normal color when clicked again.
+type quarterWidget struct {
+	color color.NRGBA
+
+	clicked bool
+}
+
+var red = color.NRGBA{R: 0xff, G: 0x00, B: 0x00, A: 0xff}
+
+func (w *quarterWidget) Layout(gtx layout.Context) layout.Dimensions {
+	var color color.NRGBA
+	if w.clicked {
+		color = red
+	} else {
+		color = w.color
+	}
+
+	r := image.Rectangle{Max: gtx.Constraints.Max}
+	paint.FillShape(gtx.Ops, color, clip.Rect(r).Op())
+
+	defer clip.Rect(image.Rectangle{
+		Max: image.Pt(gtx.Constraints.Max.X, gtx.Constraints.Max.Y),
+	}).Push(gtx.Ops).Pop()
+	event.Op(gtx.Ops, w)
+	for {
+		e, ok := gtx.Event(pointer.Filter{
+			Target: w,
+			Kinds:  pointer.Press,
+		})
+		if !ok {
+			break
+		}
+		if e, ok := e.(pointer.Event); ok && e.Kind == pointer.Press {
+			w.clicked = !w.clicked
+			// notify when we're done updating the frame.
+			notify = notifyInvalidate
+		}
+	}
+	return layout.Dimensions{Size: gtx.Constraints.Max}
+}

third_party/gioui-cmd/gogio/internal/normal/testdata.go

@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+// A simple app used for gogio's end-to-end tests.
+package main
+
+import (
+	"fmt"
+	"image"
+	"image/color"
+	"log"
+
+	"gioui.org/app"
+	"gioui.org/io/event"
+	"gioui.org/io/pointer"
+	"gioui.org/layout"
+	"gioui.org/op"
+	"gioui.org/op/clip"
+	"gioui.org/op/paint"
+)
+
+func main() {
+	go func() {
+		w := new(app.Window)
+		if err := loop(w); err != nil {
+			log.Fatal(err)
+		}
+	}()
+	app.Main()
+}
+
+type notifyFrame int
+
+const (
+	notifyNone notifyFrame = iota
+	notifyInvalidate
+	notifyPrint
+)
+
+// notify keeps track of whether we want to print to stdout to notify the user
+// when a frame is ready. Initially we want to notify about the first frame.
+var notify = notifyInvalidate
+
+type (
+	C = layout.Context
+	D = layout.Dimensions
+)
+
+func loop(w *app.Window) error {
+	topLeft := quarterWidget{
+		color: color.NRGBA{R: 0xde, G: 0xad, B: 0xbe, A: 0xff},
+	}
+	topRight := quarterWidget{
+		color: color.NRGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff},
+	}
+	botLeft := quarterWidget{
+		color: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0xff},
+	}
+	botRight := quarterWidget{
+		color: color.NRGBA{R: 0x00, G: 0x00, B: 0x00, A: 0x80},
+	}
+
+	var ops op.Ops
+	for {
+		e := w.Event()
+		switch e := e.(type) {
+		case app.DestroyEvent:
+			return e.Err
+		case app.FrameEvent:
+			gtx := app.NewContext(&ops, e)
+			// Clear background to white, even on embedded platforms such as webassembly.
+			paint.Fill(gtx.Ops, color.NRGBA{A: 0xff, R: 0xff, G: 0xff, B: 0xff})
+			layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+				layout.Flexed(1, func(gtx C) D {
+					return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
+						// r1c1
+						layout.Flexed(1, func(gtx C) D { return topLeft.Layout(gtx) }),
+						// r1c2
+						layout.Flexed(1, func(gtx C) D { return topRight.Layout(gtx) }),
+					)
+				}),
+				layout.Flexed(1, func(gtx C) D {
+					return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
+						// r2c1
+						layout.Flexed(1, func(gtx C) D { return botLeft.Layout(gtx) }),
+						// r2c2
+						layout.Flexed(1, func(gtx C) D { return botRight.Layout(gtx) }),
+					)
+				}),
+			)
+
+			e.Frame(gtx.Ops)
+
+			switch notify {
+			case notifyInvalidate:
+				notify = notifyPrint
+				w.Invalidate()
+			case notifyPrint:
+				notify = notifyNone
+				fmt.Println("gio frame ready")
+			}
+		}
+	}
+}
+
+// quarterWidget paints a quarter of the screen with one color. When clicked, it
+// turns red, going back to its normal color when clicked again.
+type quarterWidget struct {
+	color color.NRGBA
+
+	clicked bool
+}
+
+var red = color.NRGBA{R: 0xff, G: 0x00, B: 0x00, A: 0xff}
+
+func (w *quarterWidget) Layout(gtx layout.Context) layout.Dimensions {
+	var color color.NRGBA
+	if w.clicked {
+		color = red
+	} else {
+		color = w.color
+	}
+
+	r := image.Rectangle{Max: gtx.Constraints.Max}
+	paint.FillShape(gtx.Ops, color, clip.Rect(r).Op())
+
+	defer clip.Rect(image.Rectangle{
+		Max: image.Pt(gtx.Constraints.Max.X, gtx.Constraints.Max.Y),
+	}).Push(gtx.Ops).Pop()
+	event.Op(gtx.Ops, w)
+	filter := pointer.Filter{
+		Target: w,
+		Kinds:  pointer.Press,
+	}
+
+	for {
+		e, ok := gtx.Event(filter)
+		if !ok {
+			break
+		}
+		if e, ok := e.(pointer.Event); ok && e.Kind == pointer.Press {
+			w.clicked = !w.clicked
+			// notify when we're done updating the frame.
+			notify = notifyInvalidate
+		}
+	}
+	return layout.Dimensions{Size: gtx.Constraints.Max}
+}

third_party/gioui-cmd/gogio/iosbuild.go

@@ -0,0 +1,546 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main
+
+import (
+	"archive/zip"
+	"crypto/sha1"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	"golang.org/x/sync/errgroup"
+)
+
+const (
+	minIOSVersion = 10
+	// Some Metal features require tvOS 11
+	minTVOSVersion = 11
+	// Metal is available from iOS 8 on devices, yet from version 13 on the
+	// simulator.
+	minSimulatorVersion = 13
+)
+
+func buildIOS(tmpDir, target string, bi *buildInfo) error {
+	appName := bi.name
+	switch *buildMode {
+	case "archive":
+		framework := *destPath
+		if framework == "" {
+			framework = fmt.Sprintf("%s.framework", UppercaseName(appName))
+		}
+		return archiveIOS(tmpDir, target, framework, bi)
+	case "exe":
+		out := *destPath
+		if out == "" {
+			out = appName + ".ipa"
+		}
+		forDevice := strings.HasSuffix(out, ".ipa")
+		// Filter out unsupported architectures.
+		for i := len(bi.archs) - 1; i >= 0; i-- {
+			switch bi.archs[i] {
+			case "arm", "arm64":
+				if forDevice {
+					continue
+				}
+			case "386", "amd64":
+				if !forDevice {
+					continue
+				}
+			}
+
+			bi.archs = append(bi.archs[:i], bi.archs[i+1:]...)
+		}
+		if !forDevice && !strings.HasSuffix(out, ".app") {
+			return fmt.Errorf("the specified output directory %q does not end in .app or .ipa", out)
+		}
+		if !forDevice {
+			return exeIOS(tmpDir, target, out, bi)
+		}
+		payload := filepath.Join(tmpDir, "Payload")
+		appDir := filepath.Join(payload, appName+".app")
+		if err := os.MkdirAll(appDir, 0755); err != nil {
+			return err
+		}
+		if err := exeIOS(tmpDir, target, appDir, bi); err != nil {
+			return err
+		}
+		if err := signIOS(bi, tmpDir, appDir); err != nil {
+			return err
+		}
+		return zipDir(out, tmpDir, "Payload")
+	default:
+		panic("unreachable")
+	}
+}
+
+func signIOS(bi *buildInfo, tmpDir, app string) error {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return err
+	}
+	provPattern := filepath.Join(home, "Library", "MobileDevice", "Provisioning Profiles", "*.mobileprovision")
+	provisions, err := filepath.Glob(provPattern)
+	if err != nil {
+		return err
+	}
+	provInfo := filepath.Join(tmpDir, "provision.plist")
+	var avail []string
+	for _, prov := range provisions {
+		// Decode the provision file to a plist.
+		_, err := runCmd(exec.Command("security", "cms", "-D", "-i", prov, "-o", provInfo))
+		if err != nil {
+			return err
+		}
+		expUnix, err := runCmd(exec.Command("/usr/libexec/PlistBuddy", "-c", "Print:ExpirationDate", provInfo))
+		if err != nil {
+			return err
+		}
+		exp, err := time.Parse(time.UnixDate, expUnix)
+		if err != nil {
+			return fmt.Errorf("sign: failed to parse expiration date from %q: %v", prov, err)
+		}
+		if exp.Before(time.Now()) {
+			continue
+		}
+		appIDPrefix, err := runCmd(exec.Command("/usr/libexec/PlistBuddy", "-c", "Print:ApplicationIdentifierPrefix:0", provInfo))
+		if err != nil {
+			return err
+		}
+		provAppID, err := runCmd(exec.Command("/usr/libexec/PlistBuddy", "-c", "Print:Entitlements:application-identifier", provInfo))
+		if err != nil {
+			return err
+		}
+		expAppID := fmt.Sprintf("%s.%s", appIDPrefix, bi.appID)
+		avail = append(avail, provAppID)
+		if expAppID != provAppID {
+			continue
+		}
+		// Copy provisioning file.
+		embedded := filepath.Join(app, "embedded.mobileprovision")
+		if err := copyFile(embedded, prov); err != nil {
+			return err
+		}
+		certDER, err := runCmdRaw(exec.Command("/usr/libexec/PlistBuddy", "-c", "Print:DeveloperCertificates:0", provInfo))
+		if err != nil {
+			return err
+		}
+		// Omit trailing newline.
+		certDER = certDER[:len(certDER)-1]
+		entitlements, err := runCmd(exec.Command("/usr/libexec/PlistBuddy", "-x", "-c", "Print:Entitlements", provInfo))
+		if err != nil {
+			return err
+		}
+		entFile := filepath.Join(tmpDir, "entitlements.plist")
+		if err := os.WriteFile(entFile, []byte(entitlements), 0660); err != nil {
+			return err
+		}
+		identity := sha1.Sum(certDER)
+		idHex := hex.EncodeToString(identity[:])
+		_, err = runCmd(exec.Command("codesign", "-s", idHex, "-v", "--entitlements", entFile, app))
+		return err
+	}
+	return fmt.Errorf("sign: no valid provisioning profile found for bundle id %q among %v", bi.appID, avail)
+}
+
+func exeIOS(tmpDir, target, app string, bi *buildInfo) error {
+	if bi.appID == "" {
+		return errors.New("app id is empty; use -appid to set it")
+	}
+	if err := os.RemoveAll(app); err != nil {
+		return err
+	}
+	if err := os.Mkdir(app, 0755); err != nil {
+		return err
+	}
+	appName := UppercaseName(bi.name)
+	exe := filepath.Join(app, appName)
+	lipo := exec.Command("xcrun", "lipo", "-o", exe, "-create")
+	var builds errgroup.Group
+	for _, a := range bi.archs {
+		clang, cflags, err := iosCompilerFor(target, a, bi.minsdk)
+		if err != nil {
+			return err
+		}
+		cflags = append(cflags,
+			"-fobjc-arc",
+		)
+		cflagsLine := strings.Join(cflags, " ")
+		exeSlice := filepath.Join(tmpDir, "app-"+a)
+		lipo.Args = append(lipo.Args, exeSlice)
+		compile := exec.Command(
+			"go",
+			"build",
+			"-ldflags=-s -w "+bi.ldflags,
+			"-o", exeSlice,
+			"-tags", bi.tags,
+			bi.pkgPath,
+		)
+		compile.Env = append(
+			os.Environ(),
+			"GOOS=ios",
+			"GOARCH="+a,
+			"CGO_ENABLED=1",
+			"CC="+clang,
+			"CGO_CFLAGS="+cflagsLine,
+			"CGO_LDFLAGS=-lresolv "+cflagsLine,
+		)
+		builds.Go(func() error {
+			_, err := runCmd(compile)
+			return err
+		})
+	}
+	if err := builds.Wait(); err != nil {
+		return err
+	}
+	if _, err := runCmd(lipo); err != nil {
+		return err
+	}
+	infoPlist := buildInfoPlist(bi)
+	plistFile := filepath.Join(app, "Info.plist")
+	if err := os.WriteFile(plistFile, []byte(infoPlist), 0660); err != nil {
+		return err
+	}
+	if _, err := os.Stat(bi.iconPath); err == nil {
+		assetPlist, err := iosIcons(bi, tmpDir, app, bi.iconPath)
+		if err != nil {
+			return err
+		}
+		// Merge assets plist with Info.plist
+		cmd := exec.Command(
+			"/usr/libexec/PlistBuddy",
+			"-c", "Merge "+assetPlist,
+			plistFile,
+		)
+		if _, err := runCmd(cmd); err != nil {
+			return err
+		}
+	}
+	if _, err := runCmd(exec.Command("plutil", "-convert", "binary1", plistFile)); err != nil {
+		return err
+	}
+	return nil
+}
+
+// iosIcons builds an asset catalog and compile it with the Xcode command actool.
+// iosIcons returns the asset plist file to be merged into Info.plist.
+func iosIcons(bi *buildInfo, tmpDir, appDir, icon string) (string, error) {
+	assets := filepath.Join(tmpDir, "Assets.xcassets")
+	if err := os.Mkdir(assets, 0700); err != nil {
+		return "", err
+	}
+	appIcon := filepath.Join(assets, "AppIcon.appiconset")
+	err := buildIcons(appIcon, icon, []iconVariant{
+		{path: "ios_2x.png", size: 120},
+		{path: "ios_3x.png", size: 180},
+		// The App Store icon is not allowed to contain
+		// transparent pixels.
+		{path: "ios_store.png", size: 1024, fill: true},
+	})
+	if err != nil {
+		return "", err
+	}
+	contentJson := `{
+	"images" : [
+		{
+			"size" : "60x60",
+			"idiom" : "iphone",
+			"filename" : "ios_2x.png",
+			"scale" : "2x"
+		},
+		{
+			"size" : "60x60",
+			"idiom" : "iphone",
+			"filename" : "ios_3x.png",
+			"scale" : "3x"
+		},
+		{
+			"size" : "1024x1024",
+			"idiom" : "ios-marketing",
+			"filename" : "ios_store.png",
+			"scale" : "1x"
+		}
+	]
+}`
+	contentFile := filepath.Join(appIcon, "Contents.json")
+	if err := os.WriteFile(contentFile, []byte(contentJson), 0600); err != nil {
+		return "", err
+	}
+	assetPlist := filepath.Join(tmpDir, "assets.plist")
+
+	minsdk := bi.minsdk
+	if minsdk == 0 {
+		minsdk = minIOSVersion
+	}
+	compile := exec.Command(
+		"actool",
+		"--compile", appDir,
+		"--platform", iosPlatformFor(bi.target),
+		"--minimum-deployment-target", strconv.Itoa(minsdk),
+		"--app-icon", "AppIcon",
+		"--output-partial-info-plist", assetPlist,
+		assets)
+	_, err = runCmd(compile)
+	return assetPlist, err
+}
+
+func buildInfoPlist(bi *buildInfo) string {
+	appName := UppercaseName(bi.name)
+	platform := iosPlatformFor(bi.target)
+	var supportPlatform string
+	switch bi.target {
+	case "ios":
+		supportPlatform = "iPhoneOS"
+	case "tvos":
+		supportPlatform = "AppleTVOS"
+	}
+	return fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>%s</string>
+	<key>CFBundleIdentifier</key>
+	<string>%s</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>%s</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>%s</string>
+	<key>CFBundleVersion</key>
+	<string>%d</string>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array><string>arm64</string></array>
+	<key>DTPlatformName</key>
+	<string>%s</string>
+	<key>DTPlatformVersion</key>
+	<string>12.4</string>
+	<key>MinimumOSVersion</key>
+	<string>%d</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>%s</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>16G73</string>
+	<key>DTSDKBuild</key>
+	<string>16G73</string>
+	<key>DTSDKName</key>
+	<string>%s12.4</string>
+	<key>DTXcode</key>
+	<string>1030</string>
+	<key>DTXcodeBuild</key>
+	<string>10G8</string>
+</dict>
+</plist>`, appName, bi.appID, appName, bi.version, bi.version.VersionCode, platform, minIOSVersion, supportPlatform, platform)
+}
+
+func iosPlatformFor(target string) string {
+	switch target {
+	case "ios":
+		return "iphoneos"
+	case "tvos":
+		return "appletvos"
+	default:
+		panic("invalid platform " + target)
+	}
+}
+
+func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {
+	framework := filepath.Base(frameworkRoot)
+	const suf = ".framework"
+	if !strings.HasSuffix(framework, suf) {
+		return fmt.Errorf("the specified output %q does not end in '.framework'", frameworkRoot)
+	}
+	framework = framework[:len(framework)-len(suf)]
+	if err := os.RemoveAll(frameworkRoot); err != nil {
+		return err
+	}
+	frameworkDir := filepath.Join(frameworkRoot, "Versions", "A")
+	for _, dir := range []string{"Headers", "Modules"} {
+		p := filepath.Join(frameworkDir, dir)
+		if err := os.MkdirAll(p, 0755); err != nil {
+			return err
+		}
+	}
+	symlinks := [][2]string{
+		{"Versions/Current/Headers", "Headers"},
+		{"Versions/Current/Modules", "Modules"},
+		{"Versions/Current/" + framework, framework},
+		{"A", filepath.Join("Versions", "Current")},
+	}
+	for _, l := range symlinks {
+		if err := os.Symlink(l[0], filepath.Join(frameworkRoot, l[1])); err != nil && !os.IsExist(err) {
+			return err
+		}
+	}
+	exe := filepath.Join(frameworkDir, framework)
+	lipo := exec.Command("xcrun", "lipo", "-o", exe, "-create")
+	var builds errgroup.Group
+	tags := bi.tags
+	for _, a := range bi.archs {
+		clang, cflags, err := iosCompilerFor(target, a, bi.minsdk)
+		if err != nil {
+			return err
+		}
+		lib := filepath.Join(tmpDir, "gio-"+a)
+		cmd := exec.Command(
+			"go",
+			"build",
+			"-ldflags=-s -w "+bi.ldflags,
+			"-buildmode=c-archive",
+			"-o", lib,
+			"-tags", tags,
+			bi.pkgPath,
+		)
+		lipo.Args = append(lipo.Args, lib)
+		cflagsLine := strings.Join(cflags, " ")
+		cmd.Env = append(
+			os.Environ(),
+			"GOOS=ios",
+			"GOARCH="+a,
+			"CGO_ENABLED=1",
+			"CC="+clang,
+			"CGO_CFLAGS="+cflagsLine,
+			"CGO_LDFLAGS="+cflagsLine,
+		)
+		builds.Go(func() error {
+			_, err := runCmd(cmd)
+			return err
+		})
+	}
+	if err := builds.Wait(); err != nil {
+		return err
+	}
+	if _, err := runCmd(lipo); err != nil {
+		return err
+	}
+	appDir, err := runCmd(exec.Command("go", "list", "-tags", tags, "-f", "{{.Dir}}", "gioui.org/app/"))
+	if err != nil {
+		return err
+	}
+	headerDst := filepath.Join(frameworkDir, "Headers", framework+".h")
+	headerSrc := filepath.Join(appDir, "framework_ios.h")
+	if err := copyFile(headerDst, headerSrc); err != nil {
+		return err
+	}
+	module := fmt.Sprintf(`framework module "%s" {
+    header "%[1]s.h"
+
+    export *
+}`, framework)
+	moduleFile := filepath.Join(frameworkDir, "Modules", "module.modulemap")
+	return os.WriteFile(moduleFile, []byte(module), 0644)
+}
+
+func iosCompilerFor(target, arch string, minsdk int) (string, []string, error) {
+	var (
+		platformSDK string
+		platformOS  string
+	)
+	switch target {
+	case "ios":
+		platformOS = "ios"
+		platformSDK = "iphone"
+	case "tvos":
+		platformOS = "tvos"
+		platformSDK = "appletv"
+	}
+	switch arch {
+	case "arm", "arm64":
+		platformSDK += "os"
+		if minsdk == 0 {
+			minsdk = minIOSVersion
+			if target == "tvos" {
+				minsdk = minTVOSVersion
+			}
+		}
+	case "386", "amd64":
+		platformOS += "-simulator"
+		platformSDK += "simulator"
+		if minsdk == 0 {
+			minsdk = minSimulatorVersion
+		}
+	default:
+		return "", nil, fmt.Errorf("unsupported -arch: %s", arch)
+	}
+	sdkPath, err := runCmd(exec.Command("xcrun", "--sdk", platformSDK, "--show-sdk-path"))
+	if err != nil {
+		return "", nil, err
+	}
+	clang, err := runCmd(exec.Command("xcrun", "--sdk", platformSDK, "--find", "clang"))
+	if err != nil {
+		return "", nil, err
+	}
+	cflags := []string{
+		"-fembed-bitcode",
+		"-arch", allArchs[arch].iosArch,
+		"-isysroot", sdkPath,
+		"-m" + platformOS + "-version-min=" + strconv.Itoa(minsdk),
+	}
+	return clang, cflags, nil
+}
+
+func zipDir(dst, base, dir string) (err error) {
+	f, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if cerr := f.Close(); err == nil {
+			err = cerr
+		}
+	}()
+	zipf := zip.NewWriter(f)
+	err = filepath.Walk(filepath.Join(base, dir), func(path string, f os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if f.IsDir() {
+			return nil
+		}
+		rel := filepath.ToSlash(path[len(base)+1:])
+		entry, err := zipf.Create(rel)
+		if err != nil {
+			return err
+		}
+		src, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		defer src.Close()
+		_, err = io.Copy(entry, src)
+		return err
+	})
+	if err != nil {
+		return err
+	}
+	return zipf.Close()
+}

third_party/gioui-cmd/gogio/js_test.go

@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main_test
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"image"
+	"image/png"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"os/exec"
+
+	"github.com/chromedp/cdproto/runtime"
+	"github.com/chromedp/chromedp"
+
+	_ "gioui.org/unit" // the build tool adds it to go.mod, so keep it there
+)
+
+type JSTestDriver struct {
+	driverBase
+
+	// ctx is the chromedp context.
+	ctx context.Context
+}
+
+func (d *JSTestDriver) Start(path string) {
+	if raceEnabled {
+		d.Skipf("js/wasm doesn't support -race; skipping")
+	}
+
+	// First, build the app.
+	dir := d.tempDir("gio-endtoend-js")
+	d.gogio("-target=js", "-o="+dir, path)
+
+	// Second, start Chrome.
+	opts := append(chromedp.DefaultExecAllocatorOptions[:],
+		chromedp.Flag("headless", *headless),
+	)
+
+	actx, cancel := chromedp.NewExecAllocator(context.Background(), opts...)
+	d.Cleanup(cancel)
+
+	ctx, cancel := chromedp.NewContext(actx,
+		// Send all logf/errf calls to t.Logf
+		chromedp.WithLogf(d.Logf),
+	)
+	d.Cleanup(cancel)
+	d.ctx = ctx
+
+	if err := chromedp.Run(ctx); err != nil {
+		if errors.Is(err, exec.ErrNotFound) {
+			d.Skipf("test requires Chrome to be installed: %v", err)
+			return
+		}
+		d.Fatal(err)
+	}
+	pr, pw := io.Pipe()
+	d.Cleanup(func() { pw.Close() })
+	d.output = pr
+	chromedp.ListenTarget(ctx, func(ev interface{}) {
+		switch ev := ev.(type) {
+		case *runtime.EventConsoleAPICalled:
+			switch ev.Type {
+			case "log", "info", "warning", "error":
+				var b bytes.Buffer
+				b.WriteString("console.")
+				b.WriteString(string(ev.Type))
+				b.WriteString("(")
+				for i, arg := range ev.Args {
+					if i > 0 {
+						b.WriteString(", ")
+					}
+					b.Write(arg.Value)
+				}
+				b.WriteString(")\n")
+				pw.Write(b.Bytes())
+			}
+		}
+	})
+
+	// Third, serve the app folder, set the browser tab dimensions, and
+	// navigate to the folder.
+	ts := httptest.NewServer(http.FileServer(http.Dir(dir)))
+	d.Cleanup(ts.Close)
+
+	if err := chromedp.Run(ctx,
+		chromedp.EmulateViewport(int64(d.width), int64(d.height)),
+		chromedp.Navigate(ts.URL),
+	); err != nil {
+		d.Fatal(err)
+	}
+
+	// Wait for the gio app to render.
+	d.waitForFrame()
+}
+
+func (d *JSTestDriver) Screenshot() image.Image {
+	var buf []byte
+	if err := chromedp.Run(d.ctx,
+		chromedp.CaptureScreenshot(&buf),
+	); err != nil {
+		d.Fatal(err)
+	}
+	img, err := png.Decode(bytes.NewReader(buf))
+	if err != nil {
+		d.Fatal(err)
+	}
+	return img
+}
+
+func (d *JSTestDriver) Click(x, y int) {
+	if err := chromedp.Run(d.ctx,
+		chromedp.MouseClickXY(float64(x), float64(y)),
+	); err != nil {
+		d.Fatal(err)
+	}
+
+	// Wait for the gio app to render after this click.
+	d.waitForFrame()
+}

third_party/gioui-cmd/gogio/jsbuild.go

@@ -0,0 +1,200 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"text/template"
+
+	"golang.org/x/tools/go/packages"
+)
+
+func buildJS(bi *buildInfo) error {
+	out := *destPath
+	if out == "" {
+		out = bi.name
+	}
+	if err := os.MkdirAll(out, 0700); err != nil {
+		return err
+	}
+	cmd := exec.Command(
+		"go",
+		"build",
+		"-ldflags="+bi.ldflags,
+		"-tags="+bi.tags,
+		"-o", filepath.Join(out, "main.wasm"),
+		bi.pkgPath,
+	)
+	cmd.Env = append(
+		os.Environ(),
+		"GOOS=js",
+		"GOARCH=wasm",
+	)
+	_, err := runCmd(cmd)
+	if err != nil {
+		return err
+	}
+
+	var faviconPath string
+	if _, err := os.Stat(bi.iconPath); err == nil {
+		// Copy icon to the output folder
+		icon, err := os.ReadFile(bi.iconPath)
+		if err != nil {
+			return err
+		}
+		if err := os.WriteFile(filepath.Join(out, filepath.Base(bi.iconPath)), icon, 0600); err != nil {
+			return err
+		}
+		faviconPath = filepath.Base(bi.iconPath)
+	}
+
+	indexTemplate, err := template.New("").Parse(jsIndex)
+	if err != nil {
+		return err
+	}
+
+	var b bytes.Buffer
+	if err := indexTemplate.Execute(&b, struct {
+		Name string
+		Icon string
+	}{
+		Name: bi.name,
+		Icon: faviconPath,
+	}); err != nil {
+		return err
+	}
+
+	if err := os.WriteFile(filepath.Join(out, "index.html"), b.Bytes(), 0600); err != nil {
+		return err
+	}
+
+	goroot, err := runCmd(exec.Command("go", "env", "GOROOT"))
+	if err != nil {
+		return err
+	}
+	wasmJS := filepath.Join(goroot, "misc", "wasm", "wasm_exec.js")
+	if _, err := os.Stat(wasmJS); err != nil {
+		return fmt.Errorf("failed to find $GOROOT/misc/wasm/wasm_exec.js driver: %v", err)
+	}
+	pkgs, err := packages.Load(&packages.Config{
+		Mode: packages.NeedName | packages.NeedFiles | packages.NeedImports | packages.NeedDeps,
+		Env:  append(os.Environ(), "GOOS=js", "GOARCH=wasm"),
+	}, bi.pkgPath)
+	if err != nil {
+		return err
+	}
+	extraJS, err := findPackagesJS(pkgs[0], make(map[string]bool))
+	if err != nil {
+		return err
+	}
+
+	return mergeJSFiles(filepath.Join(out, "wasm.js"), append([]string{wasmJS}, extraJS...)...)
+}
+
+func findPackagesJS(p *packages.Package, visited map[string]bool) (extraJS []string, err error) {
+	if len(p.GoFiles) == 0 {
+		return nil, nil
+	}
+	js, err := filepath.Glob(filepath.Join(filepath.Dir(p.GoFiles[0]), "*_js.js"))
+	if err != nil {
+		return nil, err
+	}
+	extraJS = append(extraJS, js...)
+	for _, imp := range p.Imports {
+		if !visited[imp.ID] {
+			extra, err := findPackagesJS(imp, visited)
+			if err != nil {
+				return nil, err
+			}
+			extraJS = append(extraJS, extra...)
+			visited[imp.ID] = true
+		}
+	}
+	return extraJS, nil
+}
+
+// mergeJSFiles will merge all files into a single `wasm.js`. It will prepend the jsSetGo
+// and append the jsStartGo.
+func mergeJSFiles(dst string, files ...string) (err error) {
+	w, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if cerr := w.Close(); err != nil {
+			err = cerr
+		}
+	}()
+	_, err = io.Copy(w, strings.NewReader(jsSetGo))
+	if err != nil {
+		return err
+	}
+	for i := range files {
+		r, err := os.Open(files[i])
+		if err != nil {
+			return err
+		}
+		_, err = io.Copy(w, r)
+		r.Close()
+		if err != nil {
+			return err
+		}
+	}
+	_, err = io.Copy(w, strings.NewReader(jsStartGo))
+	return err
+}
+
+const (
+	jsIndex = `<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, user-scalable=no">
+		<meta name="mobile-web-app-capable" content="yes">
+		{{ if .Icon }}<link rel="icon" href="{{.Icon}}" type="image/x-icon" />{{ end }}
+		{{ if .Name }}<title>{{.Name}}</title>{{ end }}
+		<script src="wasm.js"></script>
+		<style>
+			body,pre { margin:0;padding:0; }
+		</style>
+	</head>
+	<body>
+	</body>
+</html>`
+	// jsSetGo sets the `window.go` variable.
+	jsSetGo = `(() => {
+    window.go = {argv: [], env: {}, importObject: {go: {}}};
+	const argv = new URLSearchParams(location.search).get("argv");
+	if (argv) {
+		window.go["argv"] = argv.split(" ");
+	}
+})();`
+	// jsStartGo initializes the main.wasm.
+	jsStartGo = `(() => {
+	defaultGo = new Go();
+	Object.assign(defaultGo["argv"], defaultGo["argv"].concat(go["argv"]));
+	Object.assign(defaultGo["env"], go["env"]);
+	for (let key in go["importObject"]) {
+		if (typeof defaultGo["importObject"][key] === "undefined") {
+			defaultGo["importObject"][key] = {};
+		}
+		Object.assign(defaultGo["importObject"][key], go["importObject"][key]);
+	}
+	window.go = defaultGo;
+    if (!WebAssembly.instantiateStreaming) { // polyfill
+        WebAssembly.instantiateStreaming = async (resp, importObject) => {
+            const source = await (await resp).arrayBuffer();
+            return await WebAssembly.instantiate(source, importObject);
+        };
+    }
+    WebAssembly.instantiateStreaming(fetch("main.wasm"), go.importObject).then((result) => {
+        go.run(result.instance);
+    });
+})();`
+)

third_party/gioui-cmd/gogio/macosbuild.go

@@ -0,0 +1,262 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"text/template"
+)
+
+func buildMac(tmpDir string, bi *buildInfo) error {
+	builder := &macBuilder{TempDir: tmpDir}
+	builder.DestDir = *destPath
+	if builder.DestDir == "" {
+		builder.DestDir = bi.pkgPath
+	}
+
+	name := bi.name
+	if *destPath != "" {
+		if filepath.Ext(*destPath) != ".app" {
+			return fmt.Errorf("invalid output name %q, it must end with `.app`", *destPath)
+		}
+		name = filepath.Base(*destPath)
+	}
+	name = strings.TrimSuffix(name, ".app")
+
+	if bi.appID == "" {
+		return errors.New("app id is empty; use -appid to set it")
+	}
+
+	if err := builder.setIcon(bi.iconPath); err != nil {
+		return err
+	}
+
+	if err := builder.setInfo(bi, name); err != nil {
+		return fmt.Errorf("can't build the resources: %v", err)
+	}
+
+	for _, arch := range bi.archs {
+		tmpDest := filepath.Join(builder.TempDir, filepath.Base(builder.DestDir))
+		finalDest := builder.DestDir
+		if len(bi.archs) > 1 {
+			tmpDest = filepath.Join(builder.TempDir, name+"_"+arch+".app")
+			finalDest = filepath.Join(builder.DestDir, name+"_"+arch+".app")
+		}
+
+		if err := builder.buildProgram(bi, tmpDest, name, arch); err != nil {
+			return err
+		}
+
+		if bi.key != "" {
+			if err := builder.signProgram(bi, tmpDest, name, arch); err != nil {
+				return err
+			}
+		}
+
+		if err := dittozip(tmpDest, tmpDest+".zip"); err != nil {
+			return err
+		}
+
+		if bi.notaryAppleID != "" {
+			if err := builder.notarize(bi, tmpDest+".zip"); err != nil {
+				return err
+			}
+		}
+
+		if err := dittounzip(tmpDest+".zip", finalDest); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+type macBuilder struct {
+	TempDir string
+	DestDir string
+
+	Icons        []byte
+	Manifest     []byte
+	Entitlements []byte
+}
+
+func (b *macBuilder) setIcon(path string) (err error) {
+	if _, err := os.Stat(path); err != nil {
+		return nil
+	}
+
+	out := filepath.Join(b.TempDir, "iconset.iconset")
+	if err := os.MkdirAll(out, 0777); err != nil {
+		return err
+	}
+
+	err = buildIcons(out, path, []iconVariant{
+		{path: "icon_512x512@2x.png", size: 1024},
+		{path: "icon_512x512.png", size: 512},
+		{path: "icon_256x256@2x.png", size: 512},
+		{path: "icon_256x256.png", size: 256},
+		{path: "icon_128x128@2x.png", size: 256},
+		{path: "icon_128x128.png", size: 128},
+		{path: "icon_64x64@2x.png", size: 128},
+		{path: "icon_64x64.png", size: 64},
+		{path: "icon_32x32@2x.png", size: 64},
+		{path: "icon_32x32.png", size: 32},
+		{path: "icon_16x16@2x.png", size: 32},
+		{path: "icon_16x16.png", size: 16},
+	})
+
+	if err != nil {
+		return err
+	}
+
+	cmd := exec.Command("iconutil",
+		"-c", "icns", out,
+		"-o", filepath.Join(b.TempDir, "icon.icns"))
+	if _, err := runCmd(cmd); err != nil {
+		return err
+	}
+
+	b.Icons, err = os.ReadFile(filepath.Join(b.TempDir, "icon.icns"))
+	return err
+}
+
+func (b *macBuilder) setInfo(buildInfo *buildInfo, name string) error {
+	t, err := template.New("manifest").Parse(`<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>{{.Name}}</string>
+	<key>CFBundleIconFile</key>
+	<string>icon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>{{.Bundle}}</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+</dict>
+</plist>`)
+	if err != nil {
+		return err
+	}
+
+	var manifest bufferCoff
+	if err := t.Execute(&manifest, struct {
+		Name, Bundle string
+	}{
+		Name:   name,
+		Bundle: buildInfo.appID,
+	}); err != nil {
+		return err
+	}
+	b.Manifest = manifest.Bytes()
+
+	b.Entitlements = []byte(`<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+<true/>
+<key>com.apple.security.cs.allow-jit</key>
+<true/>
+</dict>
+</plist>`)
+
+	return nil
+}
+
+func (b *macBuilder) buildProgram(buildInfo *buildInfo, binDest string, name string, arch string) error {
+	for _, path := range []string{"/Contents/MacOS", "/Contents/Resources"} {
+		if err := os.MkdirAll(filepath.Join(binDest, path), 0755); err != nil {
+			return err
+		}
+	}
+
+	if len(b.Icons) > 0 {
+		if err := os.WriteFile(filepath.Join(binDest, "/Contents/Resources/icon.icns"), b.Icons, 0755); err != nil {
+			return err
+		}
+	}
+
+	if err := os.WriteFile(filepath.Join(binDest, "/Contents/Info.plist"), b.Manifest, 0755); err != nil {
+		return err
+	}
+
+	cmd := exec.Command(
+		"go",
+		"build",
+		"-ldflags="+buildInfo.ldflags,
+		"-tags="+buildInfo.tags,
+		"-o", filepath.Join(binDest, "/Contents/MacOS/"+name),
+		buildInfo.pkgPath,
+	)
+	cmd.Env = append(
+		os.Environ(),
+		"GOOS=darwin",
+		"GOARCH="+arch,
+		"CGO_ENABLED=1", // Required to cross-compile between AMD/ARM
+	)
+	_, err := runCmd(cmd)
+	return err
+}
+
+func (b *macBuilder) signProgram(buildInfo *buildInfo, binDest string, name string, arch string) error {
+	options := filepath.Join(b.TempDir, "ent.ent")
+	if err := os.WriteFile(options, b.Entitlements, 0777); err != nil {
+		return err
+	}
+
+	xattr := exec.Command("xattr", "-rc", binDest)
+	if _, err := runCmd(xattr); err != nil {
+		return err
+	}
+
+	cmd := exec.Command(
+		"codesign",
+		"--deep",
+		"--force",
+		"--options", "runtime",
+		"--entitlements", options,
+		"--sign", buildInfo.key,
+		binDest,
+	)
+	_, err := runCmd(cmd)
+	return err
+}
+
+func (b *macBuilder) notarize(buildInfo *buildInfo, binDest string) error {
+	cmd := exec.Command(
+		"xcrun",
+		"notarytool",
+		"submit",
+		binDest,
+		"--apple-id", buildInfo.notaryAppleID,
+		"--team-id", buildInfo.notaryTeamID,
+		"--wait",
+	)
+
+	if buildInfo.notaryPassword != "" {
+		cmd.Args = append(cmd.Args, "--password", buildInfo.notaryPassword)
+	}
+
+	_, err := runCmd(cmd)
+	return err
+}
+
+func dittozip(input, output string) error {
+	cmd := exec.Command("ditto", "-c", "-k", "-X", "--rsrc", input, output)
+
+	_, err := runCmd(cmd)
+	return err
+}
+
+func dittounzip(input, output string) error {
+	cmd := exec.Command("ditto", "-x", "-k", "-X", "--rsrc", input, output)
+
+	_, err := runCmd(cmd)
+	return err
+}

third_party/gioui-cmd/gogio/main.go

@@ -0,0 +1,230 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main
+
+import (
+	"bytes"
+	"errors"
+	"flag"
+	"fmt"
+	"image"
+	"image/color"
+	"image/png"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"golang.org/x/image/draw"
+	"golang.org/x/sync/errgroup"
+)
+
+var (
+	target        = flag.String("target", "", "specify target (ios, tvos, android, js).\n")
+	archNames     = flag.String("arch", "", "specify architecture(s) to include (arm, arm64, amd64).")
+	minsdk        = flag.Int("minsdk", 0, "specify the minimum supported operating system level")
+	targetsdk     = flag.Int("targetsdk", 0, "specify the target supported operating system level for Android")
+	buildMode     = flag.String("buildmode", "exe", "specify buildmode (archive, exe)")
+	destPath      = flag.String("o", "", "output file or directory.\nFor -target ios or tvos, use the .app suffix to target simulators.")
+	appID         = flag.String("appid", "", "app identifier (for -buildmode=exe)")
+	name          = flag.String("name", "", "app name (for -buildmode=exe)")
+	version       = flag.String("version", "1.0.0.1", "semver app version (for -buildmode=exe) on the form major.minor.patch.versioncode")
+	printCommands = flag.Bool("x", false, "print the commands")
+	keepWorkdir   = flag.Bool("work", false, "print the name of the temporary work directory and do not delete it when exiting.")
+	linkMode      = flag.String("linkmode", "", "set the -linkmode flag of the go tool")
+	extraLdflags  = flag.String("ldflags", "", "extra flags to the Go linker")
+	extraTags     = flag.String("tags", "", "extra tags to the Go tool")
+	iconPath      = flag.String("icon", "", "specify an icon for iOS and Android")
+	signKey       = flag.String("signkey", "", "specify the path of the keystore to be used to sign Android apk files.")
+	signPass      = flag.String("signpass", "", "specify the password to decrypt the signkey.")
+	notaryID      = flag.String("notaryid", "", "specify the apple id to use for notarization.")
+	notaryPass    = flag.String("notarypass", "", "specify app-specific password of the Apple ID to be used for notarization.")
+	notaryTeamID  = flag.String("notaryteamid", "", "specify the team id to use for notarization.")
+)
+
+func main() {
+	flag.Usage = func() {
+		fmt.Fprint(os.Stderr, mainUsage)
+	}
+	flag.Parse()
+	if err := flagValidate(); err != nil {
+		fmt.Fprintf(os.Stderr, "gogio: %v\n", err)
+		os.Exit(1)
+	}
+	buildInfo, err := newBuildInfo(flag.Arg(0))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "gogio: %v\n", err)
+		os.Exit(1)
+	}
+	if err := build(buildInfo); err != nil {
+		fmt.Fprintf(os.Stderr, "gogio: %v\n", err)
+		os.Exit(1)
+	}
+	os.Exit(0)
+}
+
+func flagValidate() error {
+	pkgPathArg := flag.Arg(0)
+	if pkgPathArg == "" {
+		return errors.New("specify a package")
+	}
+	if *target == "" {
+		return errors.New("please specify -target")
+	}
+	switch *target {
+	case "ios", "tvos", "android", "js", "windows", "macos":
+	default:
+		return fmt.Errorf("invalid -target %s", *target)
+	}
+	switch *buildMode {
+	case "archive", "exe":
+	default:
+		return fmt.Errorf("invalid -buildmode %s", *buildMode)
+	}
+	return nil
+}
+
+func build(bi *buildInfo) error {
+	tmpDir, err := os.MkdirTemp("", "gogio-")
+	if err != nil {
+		return err
+	}
+	if *keepWorkdir {
+		fmt.Fprintf(os.Stderr, "WORKDIR=%s\n", tmpDir)
+	} else {
+		defer os.RemoveAll(tmpDir)
+	}
+	switch *target {
+	case "js":
+		return buildJS(bi)
+	case "ios", "tvos":
+		return buildIOS(tmpDir, *target, bi)
+	case "android":
+		return buildAndroid(tmpDir, bi)
+	case "windows":
+		return buildWindows(tmpDir, bi)
+	case "macos":
+		return buildMac(tmpDir, bi)
+	default:
+		panic("unreachable")
+	}
+}
+
+func runCmdRaw(cmd *exec.Cmd) ([]byte, error) {
+	if *printCommands {
+		fmt.Printf("%s\n", strings.Join(cmd.Args, " "))
+	}
+	out, err := cmd.Output()
+	if err == nil {
+		return out, nil
+	}
+	if err, ok := err.(*exec.ExitError); ok {
+		return nil, fmt.Errorf("%s failed: %s%s", strings.Join(cmd.Args, " "), out, err.Stderr)
+	}
+	return nil, err
+}
+
+func runCmd(cmd *exec.Cmd) (string, error) {
+	out, err := runCmdRaw(cmd)
+	return string(bytes.TrimSpace(out)), err
+}
+
+func copyFile(dst, src string) (err error) {
+	r, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer r.Close()
+	w, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if cerr := w.Close(); err == nil {
+			err = cerr
+		}
+	}()
+	_, err = io.Copy(w, r)
+	return err
+}
+
+type arch struct {
+	iosArch   string
+	jniArch   string
+	clangArch string
+}
+
+var allArchs = map[string]arch{
+	"arm": {
+		iosArch:   "armv7",
+		jniArch:   "armeabi-v7a",
+		clangArch: "armv7a-linux-androideabi",
+	},
+	"arm64": {
+		iosArch:   "arm64",
+		jniArch:   "arm64-v8a",
+		clangArch: "aarch64-linux-android",
+	},
+	"386": {
+		iosArch:   "i386",
+		jniArch:   "x86",
+		clangArch: "i686-linux-android",
+	},
+	"amd64": {
+		iosArch:   "x86_64",
+		jniArch:   "x86_64",
+		clangArch: "x86_64-linux-android",
+	},
+}
+
+type iconVariant struct {
+	path string
+	size int
+	fill bool
+}
+
+func buildIcons(baseDir, icon string, variants []iconVariant) error {
+	f, err := os.Open(icon)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	img, _, err := image.Decode(f)
+	if err != nil {
+		return err
+	}
+	var resizes errgroup.Group
+	for _, v := range variants {
+		v := v
+		resizes.Go(func() (err error) {
+			path := filepath.Join(baseDir, v.path)
+			if err := os.MkdirAll(filepath.Dir(path), 0700); err != nil {
+				return err
+			}
+			f, err := os.Create(path)
+			if err != nil {
+				return err
+			}
+			defer func() {
+				if cerr := f.Close(); err == nil {
+					err = cerr
+				}
+			}()
+			return png.Encode(f, resizeIcon(v, img))
+		})
+	}
+	return resizes.Wait()
+}
+
+func resizeIcon(v iconVariant, img image.Image) *image.NRGBA {
+	scaled := image.NewNRGBA(image.Rectangle{Max: image.Point{X: v.size, Y: v.size}})
+	op := draw.Src
+	if v.fill {
+		op = draw.Over
+		draw.Draw(scaled, scaled.Bounds(), &image.Uniform{color.White}, image.Point{}, draw.Src)
+	}
+	draw.CatmullRom.Scale(scaled, scaled.Bounds(), img, img.Bounds(), op, nil)
+
+	return scaled
+}

third_party/gioui-cmd/gogio/main_test.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"os"
+	"testing"
+)
+
+func TestMain(m *testing.M) {
+	if os.Getenv("RUN_GOGIO") != "" {
+		// Allow the end-to-end tests to call the gogio tool without
+		// having to build it from scratch, nor having to refactor the
+		// main function to avoid using global variables.
+		main()
+		os.Exit(0) // main already exits, but just in case.
+	}
+	os.Exit(m.Run())
+}

third_party/gioui-cmd/gogio/permission.go

@@ -0,0 +1,36 @@
+package main
+
+var AndroidPermissions = map[string][]string{
+	"network": {
+		"android.permission.INTERNET",
+	},
+	"networkstate": {
+		"android.permission.ACCESS_NETWORK_STATE",
+	},
+	"bluetooth": {
+		"android.permission.BLUETOOTH",
+		"android.permission.BLUETOOTH_ADMIN",
+		"android.permission.ACCESS_FINE_LOCATION",
+	},
+	"camera": {
+		"android.permission.CAMERA",
+	},
+	"storage": {
+		"android.permission.READ_EXTERNAL_STORAGE",
+		"android.permission.WRITE_EXTERNAL_STORAGE",
+	},
+	"wakelock": {
+		"android.permission.WAKE_LOCK",
+	},
+}
+
+var AndroidFeatures = map[string][]string{
+	"default": {`glEsVersion="0x00020000"`, `name="android.hardware.type.pc"`},
+	"bluetooth": {
+		`name="android.hardware.bluetooth"`,
+		`name="android.hardware.bluetooth_le"`,
+	},
+	"camera": {
+		`name="android.hardware.camera"`,
+	},
+}

third_party/gioui-cmd/gogio/race_test.go

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+//go:build race
+// +build race
+
+package main_test
+
+func init() { raceEnabled = true }

third_party/gioui-cmd/gogio/wayland_test.go

@@ -0,0 +1,196 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main_test
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"fmt"
+	"image"
+	"image/png"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"sync"
+	"text/template"
+	"time"
+)
+
+type WaylandTestDriver struct {
+	driverBase
+
+	runtimeDir string
+	socket     string
+	display    string
+}
+
+// No bars or anything fancy. Just a white background with our dimensions.
+var tmplSwayConfig = template.Must(template.New("").Parse(`
+output * bg #FFFFFF solid_color
+output * mode {{.Width}}x{{.Height}}
+default_border none
+`))
+
+var rxSwayReady = regexp.MustCompile(`Running compositor on wayland display '(.*)'`)
+
+func (d *WaylandTestDriver) Start(path string) {
+	// We want os.Environ, so that it can e.g. find $DISPLAY to run within
+	// X11. wlroots env vars are documented at:
+	// https://github.com/swaywm/wlroots/blob/master/docs/env_vars.md
+	env := os.Environ()
+	if *headless {
+		env = append(env, "WLR_BACKENDS=headless")
+	}
+
+	d.needPrograms(
+		"sway",    // to run a wayland compositor
+		"grim",    // to take screenshots
+		"swaymsg", // to send input
+	)
+
+	// First, build the app.
+	dir := d.tempDir("gio-endtoend-wayland")
+	bin := filepath.Join(dir, "red")
+	flags := []string{"build", "-tags", "nox11", "-o=" + bin}
+	if raceEnabled {
+		flags = append(flags, "-race")
+	}
+	flags = append(flags, path)
+	cmd := exec.Command("go", flags...)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		d.Fatalf("could not build app: %s:\n%s", err, out)
+	}
+
+	conf := filepath.Join(dir, "config")
+	f, err := os.Create(conf)
+	if err != nil {
+		d.Fatal(err)
+	}
+	defer f.Close()
+	if err := tmplSwayConfig.Execute(f, struct{ Width, Height int }{
+		d.width, d.height,
+	}); err != nil {
+		d.Fatal(err)
+	}
+
+	d.socket = filepath.Join(dir, "socket")
+	env = append(env, "SWAYSOCK="+d.socket)
+	d.runtimeDir = dir
+	env = append(env, "XDG_RUNTIME_DIR="+d.runtimeDir)
+
+	var wg sync.WaitGroup
+	d.Cleanup(wg.Wait)
+
+	// First, start sway.
+	{
+		ctx, cancel := context.WithCancel(context.Background())
+		cmd := exec.CommandContext(ctx, "sway", "--config", conf, "--verbose")
+		cmd.Env = env
+		stderr, err := cmd.StderrPipe()
+		if err != nil {
+			d.Fatal(err)
+		}
+		if err := cmd.Start(); err != nil {
+			d.Fatal(err)
+		}
+		d.Cleanup(cancel)
+		d.Cleanup(func() {
+			// Give it a chance to exit gracefully, cleaning up
+			// after itself. After 10ms, the deferred cancel above
+			// will signal an os.Kill.
+			cmd.Process.Signal(os.Interrupt)
+			time.Sleep(10 * time.Millisecond)
+		})
+
+		// Wait for sway to be ready. We probably don't need a deadline
+		// here.
+		br := bufio.NewReader(stderr)
+		for {
+			line, err := br.ReadString('\n')
+			if err != nil {
+				d.Fatal(err)
+			}
+			if m := rxSwayReady.FindStringSubmatch(line); m != nil {
+				d.display = m[1]
+				break
+			}
+		}
+
+		wg.Add(1)
+		go func() {
+			if err := cmd.Wait(); err != nil && ctx.Err() == nil && !strings.Contains(err.Error(), "interrupt") {
+				// Don't print all stderr, since we use --verbose.
+				// TODO(mvdan): if it's useful, probably filter
+				// errors and show them.
+				d.Error(err)
+			}
+			wg.Done()
+		}()
+	}
+
+	// Then, start our program on the sway compositor above.
+	{
+		ctx, cancel := context.WithCancel(context.Background())
+		cmd := exec.CommandContext(ctx, bin)
+		cmd.Env = []string{"XDG_RUNTIME_DIR=" + d.runtimeDir, "WAYLAND_DISPLAY=" + d.display}
+		output, err := cmd.StdoutPipe()
+		if err != nil {
+			d.Fatal(err)
+		}
+		cmd.Stderr = cmd.Stdout
+		d.output = output
+		if err := cmd.Start(); err != nil {
+			d.Fatal(err)
+		}
+		d.Cleanup(cancel)
+		wg.Add(1)
+		go func() {
+			if err := cmd.Wait(); err != nil && ctx.Err() == nil {
+				d.Error(err)
+			}
+			wg.Done()
+		}()
+	}
+
+	// Wait for the gio app to render.
+	d.waitForFrame()
+}
+
+func (d *WaylandTestDriver) Screenshot() image.Image {
+	cmd := exec.Command("grim", "/dev/stdout")
+	cmd.Env = []string{"XDG_RUNTIME_DIR=" + d.runtimeDir, "WAYLAND_DISPLAY=" + d.display}
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		d.Errorf("%s", out)
+		d.Fatal(err)
+	}
+	img, err := png.Decode(bytes.NewReader(out))
+	if err != nil {
+		d.Fatal(err)
+	}
+	return img
+}
+
+func (d *WaylandTestDriver) swaymsg(args ...interface{}) {
+	strs := []string{"--socket", d.socket}
+	for _, arg := range args {
+		strs = append(strs, fmt.Sprint(arg))
+	}
+	cmd := exec.Command("swaymsg", strs...)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		d.Errorf("%s", out)
+		d.Fatal(err)
+	}
+}
+
+func (d *WaylandTestDriver) Click(x, y int) {
+	d.swaymsg("seat", "-", "cursor", "set", x, y)
+	d.swaymsg("seat", "-", "cursor", "press", "button1")
+	d.swaymsg("seat", "-", "cursor", "release", "button1")
+
+	// Wait for the gio app to render after this click.
+	d.waitForFrame()
+}

third_party/gioui-cmd/gogio/windows_test.go

@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main_test
+
+import (
+	"context"
+	"image"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"sync"
+	"time"
+
+	"golang.org/x/image/draw"
+)
+
+// Wine is tightly coupled with X11 at the moment, and we can reuse the same
+// methods to automate screenshots and clicks. The main difference is how we
+// build and run the app.
+
+// The only quirk is that it seems impossible for the Wine window to take the
+// entirety of the X server's dimensions, even if we try to resize it to take
+// the entire display. It seems to want to leave some vertical space empty,
+// presumably for window decorations or the "start" bar on Windows. To work
+// around that, make the X server 50x50px bigger, and crop the screenshots back
+// to the original size.
+
+type WineTestDriver struct {
+	X11TestDriver
+}
+
+func (d *WineTestDriver) Start(path string) {
+	d.needPrograms("wine")
+
+	// First, build the app.
+	bin := filepath.Join(d.tempDir("gio-endtoend-windows"), "red.exe")
+	flags := []string{"build", "-o=" + bin}
+	if raceEnabled {
+		if runtime.GOOS != "windows" {
+			// cross-compilation disables CGo, which breaks -race.
+			d.Skipf("can't cross-compile -race for Windows; skipping")
+		}
+		flags = append(flags, "-race")
+	}
+	flags = append(flags, path)
+	cmd := exec.Command("go", flags...)
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, "GOOS=windows")
+	if out, err := cmd.CombinedOutput(); err != nil {
+		d.Fatalf("could not build app: %s:\n%s", err, out)
+	}
+
+	var wg sync.WaitGroup
+	d.Cleanup(wg.Wait)
+
+	// Add 50x50px to the display dimensions, as discussed earlier.
+	d.startServer(&wg, d.width+50, d.height+50)
+
+	// Then, start our program via Wine on the X server above.
+	{
+		cacheDir, err := os.UserCacheDir()
+		if err != nil {
+			d.Fatal(err)
+		}
+		// Use a wine directory separate from the default ~/.wine, so
+		// that the user's winecfg doesn't affect our test. This will
+		// default to ~/.cache/gio-e2e-wine. We use the user's cache,
+		// to reuse a previously set up wineprefix.
+		wineprefix := filepath.Join(cacheDir, "gio-e2e-wine")
+
+		// First, ensure that wineprefix is up to date with wineboot.
+		// Wait for this separately from the first frame, as setting up
+		// a new prefix might take 5s on its own.
+		env := []string{
+			"DISPLAY=" + d.display,
+			"WINEDEBUG=fixme-all", // hide "fixme" noise
+			"WINEPREFIX=" + wineprefix,
+
+			// Disable wine-gecko (Explorer) and wine-mono (.NET).
+			// Otherwise, if not installed, wineboot will get stuck
+			// with a prompt to install them on the virtual X
+			// display. Moreover, Gio doesn't need either, and wine
+			// is faster without them.
+			"WINEDLLOVERRIDES=mscoree,mshtml=",
+		}
+		{
+			start := time.Now()
+			cmd := exec.Command("wine", "wineboot", "-i")
+			cmd.Env = env
+			// Use a combined output pipe instead of CombinedOutput,
+			// so that we only wait for the child process to exit,
+			// and we don't need to wait for all of wine's
+			// grandchildren to exit and stop writing. This is
+			// relevant as wine leaves "wineserver" lingering for
+			// three seconds by default, to be reused later.
+			stdout, err := cmd.StdoutPipe()
+			if err != nil {
+				d.Fatal(err)
+			}
+			cmd.Stderr = cmd.Stdout
+			if err := cmd.Run(); err != nil {
+				io.Copy(os.Stderr, stdout)
+				d.Fatal(err)
+			}
+			d.Logf("set up WINEPREFIX in %s", time.Since(start))
+		}
+
+		ctx, cancel := context.WithCancel(context.Background())
+		cmd := exec.CommandContext(ctx, "wine", bin)
+		cmd.Env = env
+		output, err := cmd.StdoutPipe()
+		if err != nil {
+			d.Fatal(err)
+		}
+		cmd.Stderr = cmd.Stdout
+		d.output = output
+		if err := cmd.Start(); err != nil {
+			d.Fatal(err)
+		}
+		d.Cleanup(cancel)
+		wg.Add(1)
+		go func() {
+			if err := cmd.Wait(); err != nil && ctx.Err() == nil {
+				d.Error(err)
+			}
+			wg.Done()
+		}()
+	}
+	// Wait for the gio app to render.
+	d.waitForFrame()
+
+	// xdotool seems to fail at actually moving the window if we use it
+	// immediately after Gio is ready. Why?
+	// We can't tell if the windowmove operation worked until we take a
+	// screenshot, because the getwindowgeometry op reports the 0x0
+	// coordinates even if the window wasn't moved properly.
+	// A sleep of ~20ms seems to be enough on an idle laptop. Use 20x that.
+	// TODO(mvdan): revisit this, when you have a spare three hours.
+	time.Sleep(400 * time.Millisecond)
+	id := d.xdotool("search", "--sync", "--onlyvisible", "--name", "Gio")
+	d.xdotool("windowmove", "--sync", id, 0, 0)
+}
+
+func (d *WineTestDriver) Screenshot() image.Image {
+	img := d.X11TestDriver.Screenshot()
+	// Crop the screenshot back to the original dimensions.
+	cropped := image.NewRGBA(image.Rect(0, 0, d.width, d.height))
+	draw.Draw(cropped, cropped.Bounds(), img, image.Point{}, draw.Src)
+	return cropped
+}

third_party/gioui-cmd/gogio/windowsbuild.go

@@ -0,0 +1,410 @@
+package main
+
+import (
+	"bytes"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"image/png"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"reflect"
+	"strings"
+	"text/template"
+
+	"github.com/akavel/rsrc/binutil"
+	"github.com/akavel/rsrc/coff"
+	"golang.org/x/text/encoding/unicode"
+)
+
+func buildWindows(tmpDir string, bi *buildInfo) error {
+	builder := &windowsBuilder{TempDir: tmpDir}
+	builder.DestDir = *destPath
+	if builder.DestDir == "" {
+		builder.DestDir = bi.pkgPath
+	}
+
+	name := bi.name
+	if *destPath != "" {
+		if filepath.Ext(*destPath) != ".exe" {
+			return fmt.Errorf("invalid output name %q, it must end with `.exe`", *destPath)
+		}
+		name = filepath.Base(*destPath)
+	}
+	name = strings.TrimSuffix(name, ".exe")
+	sdk := bi.minsdk
+	if sdk > 10 {
+		return fmt.Errorf("invalid minsdk (%d) it's higher than Windows 10", sdk)
+	}
+
+	for _, arch := range bi.archs {
+		builder.Coff = coff.NewRSRC()
+		builder.Coff.Arch(arch)
+
+		if err := builder.embedIcon(bi.iconPath); err != nil {
+			return err
+		}
+
+		if err := builder.embedManifest(windowsManifest{
+			Version:        bi.version.String(),
+			WindowsVersion: sdk,
+			Name:           name,
+		}); err != nil {
+			return fmt.Errorf("can't create manifest: %v", err)
+		}
+
+		if err := builder.embedInfo(windowsResources{
+			Version:      [2]uint32{uint32(bi.version.Major), uint32(bi.version.Minor)<<16 | uint32(bi.version.Patch)},
+			VersionHuman: bi.version.String(),
+			Name:         name,
+			Language:     0x0400, // Process Default Language: https://docs.microsoft.com/en-us/previous-versions/ms957130(v=msdn.10)
+		}); err != nil {
+			return fmt.Errorf("can't create info: %v", err)
+		}
+
+		if err := builder.buildResource(bi, name, arch); err != nil {
+			return fmt.Errorf("can't build the resources: %v", err)
+		}
+
+		if err := builder.buildProgram(bi, name, arch); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+type (
+	windowsResources struct {
+		Version      [2]uint32
+		VersionHuman string
+		Language     uint16
+		Name         string
+	}
+	windowsManifest struct {
+		Version        string
+		WindowsVersion int
+		Name           string
+	}
+	windowsBuilder struct {
+		TempDir string
+		DestDir string
+		Coff    *coff.Coff
+	}
+)
+
+const (
+	// https://docs.microsoft.com/en-us/windows/win32/menurc/resource-types
+	windowsResourceIcon      = 3
+	windowsResourceIconGroup = windowsResourceIcon + 11
+	windowsResourceManifest  = 24
+	windowsResourceVersion   = 16
+)
+
+type bufferCoff struct {
+	bytes.Buffer
+}
+
+func (b *bufferCoff) Size() int64 {
+	return int64(b.Len())
+}
+
+func (b *windowsBuilder) embedIcon(path string) (err error) {
+	iconFile, err := os.Open(path)
+	if err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			return nil
+		}
+		return fmt.Errorf("can't read the icon located at %s: %v", path, err)
+	}
+	defer iconFile.Close()
+
+	iconImage, err := png.Decode(iconFile)
+	if err != nil {
+		return fmt.Errorf("can't decode the PNG file (%s): %v", path, err)
+	}
+
+	sizes := []int{16, 32, 48, 64, 128, 256}
+	var iconHeader bufferCoff
+
+	// GRPICONDIR structure.
+	if err := binary.Write(&iconHeader, binary.LittleEndian, [3]uint16{0, 1, uint16(len(sizes))}); err != nil {
+		return err
+	}
+
+	for _, size := range sizes {
+		var iconBuffer bufferCoff
+
+		if err := png.Encode(&iconBuffer, resizeIcon(iconVariant{size: size, fill: false}, iconImage)); err != nil {
+			return fmt.Errorf("can't encode image: %v", err)
+		}
+
+		b.Coff.AddResource(windowsResourceIcon, uint16(size), &iconBuffer)
+
+		if err := binary.Write(&iconHeader, binary.LittleEndian, struct {
+			Size     [2]uint8
+			Color    [2]uint8
+			Planes   uint16
+			BitCount uint16
+			Length   uint32
+			Id       uint16
+		}{
+			Size:     [2]uint8{uint8(size % 256), uint8(size % 256)}, // "0" means 256px.
+			Planes:   1,
+			BitCount: 32,
+			Length:   uint32(iconBuffer.Len()),
+			Id:       uint16(size),
+		}); err != nil {
+			return err
+		}
+	}
+
+	b.Coff.AddResource(windowsResourceIconGroup, 1, &iconHeader)
+
+	return nil
+}
+
+func (b *windowsBuilder) buildResource(buildInfo *buildInfo, name string, arch string) error {
+	out, err := os.Create(filepath.Join(buildInfo.pkgPath, name+"_windows_"+arch+".syso"))
+	if err != nil {
+		return err
+	}
+	defer out.Close()
+	b.Coff.Freeze()
+
+	// See https://github.com/akavel/rsrc/internal/write.go#L13.
+	w := binutil.Writer{W: out}
+	binutil.Walk(b.Coff, func(v reflect.Value, path string) error {
+		if binutil.Plain(v.Kind()) {
+			w.WriteLE(v.Interface())
+			return nil
+		}
+		vv, ok := v.Interface().(binutil.SizedReader)
+		if ok {
+			w.WriteFromSized(vv)
+			return binutil.WALK_SKIP
+		}
+		return nil
+	})
+
+	if w.Err != nil {
+		return fmt.Errorf("error writing output file: %s", w.Err)
+	}
+
+	return nil
+}
+
+func (b *windowsBuilder) buildProgram(buildInfo *buildInfo, name string, arch string) error {
+	dest := b.DestDir
+	if len(buildInfo.archs) > 1 {
+		dest = filepath.Join(filepath.Dir(b.DestDir), name+"_"+arch+".exe")
+	}
+
+	cmd := exec.Command(
+		"go",
+		"build",
+		"-ldflags=-H=windowsgui "+buildInfo.ldflags,
+		"-tags="+buildInfo.tags,
+		"-o", dest,
+		buildInfo.pkgPath,
+	)
+	cmd.Env = append(
+		os.Environ(),
+		"GOOS=windows",
+		"GOARCH="+arch,
+	)
+	_, err := runCmd(cmd)
+	return err
+}
+
+func (b *windowsBuilder) embedManifest(v windowsManifest) error {
+	t, err := template.New("manifest").Parse(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity type="win32" name="{{.Name}}" version="{{.Version}}" />
+    <description>{{.Name}}</description>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            {{if (le .WindowsVersion 10)}}<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+{{end}}
+            {{if (le .WindowsVersion 9)}}<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+{{end}}
+            {{if (le .WindowsVersion 8)}}<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+{{end}}
+            {{if (le .WindowsVersion 7)}}<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+{{end}}
+            {{if (le .WindowsVersion 6)}}<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+{{end}}
+        </application>
+    </compatibility>
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+	<asmv3:application>
+		<asmv3:windowsSettings>
+			<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+		</asmv3:windowsSettings>
+	</asmv3:application>
+</assembly>`)
+	if err != nil {
+		return err
+	}
+
+	var manifest bufferCoff
+	if err := t.Execute(&manifest, v); err != nil {
+		return err
+	}
+
+	b.Coff.AddResource(windowsResourceManifest, 1, &manifest)
+
+	return nil
+}
+
+func (b *windowsBuilder) embedInfo(v windowsResources) error {
+	page := uint16(1)
+
+	// https://docs.microsoft.com/pt-br/windows/win32/menurc/vs-versioninfo
+	t := newValue(valueBinary, "VS_VERSION_INFO", []io.WriterTo{
+		// https://docs.microsoft.com/pt-br/windows/win32/api/VerRsrc/ns-verrsrc-vs_fixedfileinfo
+		windowsInfoValueFixed{
+			Signature:      0xFEEF04BD,
+			StructVersion:  0x00010000,
+			FileVersion:    v.Version,
+			ProductVersion: v.Version,
+			FileFlagMask:   0x3F,
+			FileFlags:      0,
+			FileOS:         0x40004,
+			FileType:       0x1,
+			FileSubType:    0,
+		},
+		// https://docs.microsoft.com/pt-br/windows/win32/menurc/stringfileinfo
+		newValue(valueText, "StringFileInfo", []io.WriterTo{
+			// https://docs.microsoft.com/pt-br/windows/win32/menurc/stringtable
+			newValue(valueText, fmt.Sprintf("%04X%04X", v.Language, page), []io.WriterTo{
+				// https://docs.microsoft.com/pt-br/windows/win32/menurc/string-str
+				newValue(valueText, "ProductVersion", v.VersionHuman),
+				newValue(valueText, "FileVersion", v.VersionHuman),
+				newValue(valueText, "FileDescription", v.Name),
+				newValue(valueText, "ProductName", v.Name),
+				// TODO include more data: gogio must have some way to provide such information (like Company Name, Copyright...)
+			}),
+		}),
+		// https://docs.microsoft.com/pt-br/windows/win32/menurc/varfileinfo
+		newValue(valueBinary, "VarFileInfo", []io.WriterTo{
+			// https://docs.microsoft.com/pt-br/windows/win32/menurc/var-str
+			newValue(valueBinary, "Translation", uint32(page)<<16|uint32(v.Language)),
+		}),
+	})
+
+	// For some reason the ValueLength of the VS_VERSIONINFO must be the byte-length of `windowsInfoValueFixed`:
+	t.ValueLength = 52
+
+	var verrsrc bufferCoff
+	if _, err := t.WriteTo(&verrsrc); err != nil {
+		return err
+	}
+
+	b.Coff.AddResource(windowsResourceVersion, 1, &verrsrc)
+
+	return nil
+}
+
+type windowsInfoValueFixed struct {
+	Signature      uint32
+	StructVersion  uint32
+	FileVersion    [2]uint32
+	ProductVersion [2]uint32
+	FileFlagMask   uint32
+	FileFlags      uint32
+	FileOS         uint32
+	FileType       uint32
+	FileSubType    uint32
+	FileDate       [2]uint32
+}
+
+func (v windowsInfoValueFixed) WriteTo(w io.Writer) (_ int64, err error) {
+	return 0, binary.Write(w, binary.LittleEndian, v)
+}
+
+type windowsInfoValue struct {
+	Length      uint16
+	ValueLength uint16
+	Type        uint16
+	Key         []byte
+	Value       []byte
+}
+
+func (v windowsInfoValue) WriteTo(w io.Writer) (_ int64, err error) {
+	// binary.Write doesn't support []byte inside struct.
+	if err = binary.Write(w, binary.LittleEndian, [3]uint16{v.Length, v.ValueLength, v.Type}); err != nil {
+		return 0, err
+	}
+	if _, err = w.Write(v.Key); err != nil {
+		return 0, err
+	}
+	if _, err = w.Write(v.Value); err != nil {
+		return 0, err
+	}
+	return 0, nil
+}
+
+const (
+	valueBinary uint16 = 0
+	valueText   uint16 = 1
+)
+
+func newValue(valueType uint16, key string, input interface{}) windowsInfoValue {
+	v := windowsInfoValue{
+		Type:   valueType,
+		Length: 6,
+	}
+
+	padding := func(in []byte) []byte {
+		if l := uint16(len(in)) + v.Length; l%4 != 0 {
+			return append(in, make([]byte, 4-l%4)...)
+		}
+		return in
+	}
+
+	v.Key = padding(utf16Encode(key))
+	v.Length += uint16(len(v.Key))
+
+	switch in := input.(type) {
+	case string:
+		v.Value = padding(utf16Encode(in))
+		v.ValueLength = uint16(len(v.Value) / 2)
+	case []io.WriterTo:
+		var buff bytes.Buffer
+		for k := range in {
+			if _, err := in[k].WriteTo(&buff); err != nil {
+				panic(err)
+			}
+		}
+		v.Value = buff.Bytes()
+	default:
+		var buff bytes.Buffer
+		if err := binary.Write(&buff, binary.LittleEndian, in); err != nil {
+			panic(err)
+		}
+		v.ValueLength = uint16(buff.Len())
+		v.Value = buff.Bytes()
+	}
+
+	v.Length += uint16(len(v.Value))
+
+	return v
+}
+
+// utf16Encode encodes the string to UTF16 with null-termination.
+func utf16Encode(s string) []byte {
+	b, err := unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM).NewEncoder().Bytes([]byte(s))
+	if err != nil {
+		panic(err)
+	}
+	return append(b, 0x00, 0x00) // null-termination.
+}

third_party/gioui-cmd/gogio/x11_test.go

@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+package main_test
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"image"
+	"image/png"
+	"io"
+	"math/rand"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"sync"
+	"time"
+)
+
+type X11TestDriver struct {
+	driverBase
+
+	display string
+}
+
+func (d *X11TestDriver) Start(path string) {
+	// First, build the app.
+	bin := filepath.Join(d.tempDir("gio-endtoend-x11"), "red")
+	flags := []string{"build", "-tags", "nowayland", "-o=" + bin}
+	if raceEnabled {
+		flags = append(flags, "-race")
+	}
+	flags = append(flags, path)
+	cmd := exec.Command("go", flags...)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		d.Fatalf("could not build app: %s:\n%s", err, out)
+	}
+
+	var wg sync.WaitGroup
+	d.Cleanup(wg.Wait)
+
+	d.startServer(&wg, d.width, d.height)
+
+	// Then, start our program on the X server above.
+	{
+		ctx, cancel := context.WithCancel(context.Background())
+		cmd := exec.CommandContext(ctx, bin)
+		cmd.Env = []string{"DISPLAY=" + d.display}
+		output, err := cmd.StdoutPipe()
+		if err != nil {
+			d.Fatal(err)
+		}
+		cmd.Stderr = cmd.Stdout
+		d.output = output
+		if err := cmd.Start(); err != nil {
+			d.Fatal(err)
+		}
+		d.Cleanup(cancel)
+		wg.Add(1)
+		go func() {
+			if err := cmd.Wait(); err != nil && ctx.Err() == nil {
+				d.Error(err)
+			}
+			wg.Done()
+		}()
+	}
+
+	// Wait for the gio app to render.
+	d.waitForFrame()
+}
+
+func (d *X11TestDriver) startServer(wg *sync.WaitGroup, width, height int) {
+	// Pick a random display number between 1 and 100,000. Most machines
+	// will only be using :0, so there's only a 0.001% chance of two
+	// concurrent test runs to run into a conflict.
+	rnd := rand.New(rand.NewSource(time.Now().UnixNano()))
+	d.display = fmt.Sprintf(":%d", rnd.Intn(100000)+1)
+
+	var xprog string
+	xflags := []string{
+		"-wr", // we want a white background; the default is black
+	}
+	if *headless {
+		xprog = "Xvfb" // virtual X server
+		xflags = append(xflags, "-screen", "0", fmt.Sprintf("%dx%dx24", width, height))
+	} else {
+		xprog = "Xephyr" // nested X server as a window
+		xflags = append(xflags, "-screen", fmt.Sprintf("%dx%d", width, height))
+	}
+	xflags = append(xflags, d.display)
+
+	d.needPrograms(
+		xprog,     // to run the X server
+		"scrot",   // to take screenshots
+		"xdotool", // to send input
+	)
+	ctx, cancel := context.WithCancel(context.Background())
+	cmd := exec.CommandContext(ctx, xprog, xflags...)
+	combined := &bytes.Buffer{}
+	cmd.Stdout = combined
+	cmd.Stderr = combined
+	if err := cmd.Start(); err != nil {
+		d.Fatal(err)
+	}
+	d.Cleanup(cancel)
+	d.Cleanup(func() {
+		// Give it a chance to exit gracefully, cleaning up
+		// after itself. After 10ms, the deferred cancel above
+		// will signal an os.Kill.
+		cmd.Process.Signal(os.Interrupt)
+		time.Sleep(10 * time.Millisecond)
+	})
+
+	// Wait for the X server to be ready. The socket path isn't
+	// terribly portable, but that's okay for now.
+	withRetries(d.T, time.Second, func() error {
+		socket := fmt.Sprintf("/tmp/.X11-unix/X%s", d.display[1:])
+		_, err := os.Stat(socket)
+		return err
+	})
+
+	wg.Add(1)
+	go func() {
+		if err := cmd.Wait(); err != nil && ctx.Err() == nil {
+			// Print all output and error.
+			io.Copy(os.Stdout, combined)
+			d.Error(err)
+		}
+		wg.Done()
+	}()
+}
+
+func (d *X11TestDriver) Screenshot() image.Image {
+	cmd := exec.Command("scrot", "--silent", "--overwrite", "/dev/stdout")
+	cmd.Env = []string{"DISPLAY=" + d.display}
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		d.Errorf("%s", out)
+		d.Fatal(err)
+	}
+	img, err := png.Decode(bytes.NewReader(out))
+	if err != nil {
+		d.Fatal(err)
+	}
+	return img
+}
+
+func (d *X11TestDriver) xdotool(args ...interface{}) string {
+	d.Helper()
+	strs := make([]string, len(args))
+	for i, arg := range args {
+		strs[i] = fmt.Sprint(arg)
+	}
+	cmd := exec.Command("xdotool", strs...)
+	cmd.Env = []string{"DISPLAY=" + d.display}
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		d.Errorf("%s", out)
+		d.Fatal(err)
+	}
+	return string(bytes.TrimSpace(out))
+}
+
+func (d *X11TestDriver) Click(x, y int) {
+	d.xdotool("mousemove", "--sync", x, y)
+	d.xdotool("click", "1")
+
+	// Wait for the gio app to render after this click.
+	d.waitForFrame()
+}

third_party/gioui-cmd/svg2gio/main.go

@@ -0,0 +1,582 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+// Command svg2gio converts SVG files to Gio functions. Only a limited subset of
+// SVG files are supported.
+package main
+
+import (
+	"bytes"
+	"encoding/xml"
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"unicode"
+
+	"go/format"
+
+	"gioui.org/f32"
+)
+
+var (
+	pkg    = flag.String("pkg", "", "Go package")
+	output = flag.String("o", "svg.go", "Output Go file")
+)
+
+func main() {
+	flag.Parse()
+	if *pkg == "" {
+		fmt.Fprintf(os.Stderr, "specify a package name (-pkg)\n")
+		os.Exit(1)
+	}
+	args := flag.Args()
+	if err := convertAll(args); err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		os.Exit(2)
+	}
+}
+
+type Points []float32
+
+func (p *Points) UnmarshalText(text []byte) error {
+	for {
+		text = bytes.TrimLeft(text, "\t\n")
+		if len(text) == 0 {
+			break
+		}
+		var num []byte
+		end := bytes.IndexAny(text, " ,")
+		if end != -1 {
+			num = text[:end]
+			text = text[end+1:]
+		} else {
+			num = text
+			text = nil
+		}
+		f, err := strconv.ParseFloat(string(num), 32)
+		if err != nil {
+			return err
+		}
+		*p = append(*p, float32(f))
+	}
+	return nil
+}
+
+type Transform f32.Affine2D
+
+func (t *Transform) UnmarshalText(text []byte) error {
+	switch {
+	case bytes.HasPrefix(text, []byte("matrix(")) && bytes.HasSuffix(text, []byte(")")):
+		trans := text[7 : len(text)-1]
+		var p Points
+		if err := p.UnmarshalText(trans); err != nil {
+			return err
+		}
+		if len(p) != 6 {
+			return fmt.Errorf("malformed transform matrix: %q", text)
+		}
+		*t = Transform(f32.NewAffine2D(p[0], p[2], p[4], p[1], p[3], p[5]))
+		return nil
+	default:
+		return fmt.Errorf("unsupported transform: %q", text)
+	}
+}
+
+type Fill struct {
+	Transform      Transform `xml:"transform,attr"`
+	Fill           Color     `xml:"fill,attr"`
+	Stroke         Color     `xml:"stroke,attr"`
+	StrokeLinejoin string    `xml:"stroke-linejoin,attr"`
+	StrokeLinecap  string    `xml:"stroke-linecap,attr"`
+	StrokeWidth    float32   `xml:"stroke-width,attr"`
+}
+
+type Color struct {
+	Set   bool
+	Value int
+}
+
+func (c *Color) UnmarshalText(text []byte) error {
+	if string(text) == "none" {
+		*c = Color{}
+		return nil
+	}
+	if !bytes.HasPrefix(text, []byte("#")) {
+		return fmt.Errorf("invalid color: %q", text)
+	}
+	text = text[1:]
+	i, err := strconv.ParseInt(string(text), 16, 32)
+	// Implied alpha.
+	if len(text) == 6 {
+		i |= 0xff000000
+	}
+	*c = Color{
+		Set:   true,
+		Value: int(i),
+	}
+	return err
+}
+
+func convertAll(files []string) error {
+	w := new(bytes.Buffer)
+	fmt.Fprintf(w, "// Code generated by gioui.org/cmd/svg2gio; DO NOT EDIT.\n\n")
+	fmt.Fprintf(w, "package %s\n\n", *pkg)
+	fmt.Fprintf(w, "import \"image/color\"\n")
+	fmt.Fprintf(w, "import \"math\"\n")
+	fmt.Fprintf(w, "import \"gioui.org/op\"\n")
+	fmt.Fprintf(w, "import \"gioui.org/op/clip\"\n")
+	fmt.Fprintf(w, "import \"gioui.org/op/paint\"\n")
+	fmt.Fprintf(w, "import \"gioui.org/f32\"\n\n")
+	fmt.Fprintf(w, "var ops op.Ops\n\n")
+	fmt.Fprintf(w, funcs)
+	for _, filename := range files {
+		if err := convert(w, filename); err != nil {
+			return err
+		}
+	}
+	src, err := format.Source(w.Bytes())
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(*output, src, 0o660)
+}
+
+func convert(w io.Writer, filename string) error {
+	base := filepath.Base(filename)
+	ext := filepath.Ext(base)
+	name := "Image_" + base[:len(base)-len(ext)]
+
+	fmt.Fprintf(w, "var %s struct {\n", name)
+	fmt.Fprintf(w, "ViewBox struct { Min, Max f32.Point }\n")
+	fmt.Fprintf(w, "Call op.CallOp\n\n")
+	fmt.Fprintf(w, "}\n")
+	fmt.Fprintf(w, "func init() {\n")
+	defer fmt.Fprintf(w, "}\n")
+	f, err := os.Open(filename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	d := xml.NewDecoder(f)
+	if err := parse(w, d, name); err != nil {
+		line, col := d.InputPos()
+		return fmt.Errorf("%s:%d:%d: %w", filename, line, col, err)
+	}
+	return nil
+}
+
+func parse(w io.Writer, d *xml.Decoder, name string) error {
+	for {
+		tok, err := d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return errors.New("unexpected end of file")
+			}
+			return err
+		}
+		switch tok := tok.(type) {
+		case xml.StartElement:
+			if n := tok.Name.Local; n != "svg" {
+				return fmt.Errorf("invalid SVG root: <%s>", n)
+			}
+			if n := tok.Name.Space; n != "http://www.w3.org/2000/svg" {
+				return fmt.Errorf("unsupported SVG namespace: %s", n)
+			}
+			fmt.Fprintf(w, "m := op.Record(&ops)\n")
+			defer fmt.Fprintf(w, "%s.Call = m.Stop()\n", name)
+			for _, a := range tok.Attr {
+				if a.Name.Local == "viewBox" {
+					var p Points
+					if err := p.UnmarshalText([]byte(a.Value)); err != nil {
+						return fmt.Errorf("invalid viewBox attribute: %s", a.Value)
+					}
+					if len(p) != 4 {
+						return fmt.Errorf("invalid viewBox attribute: %s", a.Value)
+					}
+					fmt.Fprintf(w, "%s.ViewBox.Min = %s\n", name, point(f32.Pt(p[0], p[1])))
+					fmt.Fprintf(w, "%s.ViewBox.Max = %s\n", name, point(f32.Pt(p[2], p[3])))
+				}
+			}
+			return parseSVG(w, d)
+		}
+	}
+}
+
+func point(p f32.Point) string {
+	return fmt.Sprintf("f32.Pt(%g, %g)", p.X, p.Y)
+}
+
+type Poly struct {
+	XMLName xml.Name
+	Points  Points `xml:"points,attr"`
+	Fill
+}
+
+func (p *Poly) Path(w io.Writer) error {
+	if len(p.Points) <= 1 {
+		return nil
+	}
+	pen := f32.Pt(p.Points[0], p.Points[1])
+	fmt.Fprintf(w, "p.MoveTo(%s)\n", point(pen))
+	last := pen
+	for i := 2; i < len(p.Points); i += 2 {
+		last = f32.Pt(p.Points[i], p.Points[i+1])
+		fmt.Fprintf(w, "p.LineTo(%s)\n", point(last))
+	}
+	if p.XMLName.Local == "polygon" && last != pen {
+		fmt.Fprintf(w, "p.LineTo(%s)\n", point(pen))
+	}
+	return nil
+}
+
+type Path struct {
+	D string `xml:"d,attr"`
+	Fill
+}
+
+func (p *Path) Path(w io.Writer) error {
+	return printPathCommands(w, p.D)
+}
+
+type Line struct {
+	X1 float32 `xml:"x1,attr"`
+	Y1 float32 `xml:"y1,attr"`
+	X2 float32 `xml:"x2,attr"`
+	Y2 float32 `xml:"y2,attr"`
+	Fill
+}
+
+func (l *Line) Path(w io.Writer) error {
+	fmt.Fprintf(w, "p.MoveTo(%s)\n", point(f32.Pt(l.X1, l.Y1)))
+	fmt.Fprintf(w, "p.LineTo(%s)\n", point(f32.Pt(l.X2, l.Y2)))
+	return nil
+}
+
+type Ellipse struct {
+	Cx float32 `xml:"cx,attr"`
+	Cy float32 `xml:"cy,attr"`
+	Rx float32 `xml:"rx,attr"`
+	Ry float32 `xml:"ry,attr"`
+	Fill
+}
+
+func (e *Ellipse) Path(w io.Writer) error {
+	c := f32.Pt(e.Cx, e.Cy)
+	r := f32.Pt(e.Rx, e.Ry)
+	fmt.Fprintf(w, "ellipse(&p, %s, %s)\n", point(c), point(r))
+	return nil
+}
+
+type Rect struct {
+	X      float32 `xml:"x,attr"`
+	Y      float32 `xml:"y,attr"`
+	Width  float32 `xml:"width,attr"`
+	Height float32 `xml:"height,attr"`
+	Fill
+}
+
+func (r *Rect) Path(w io.Writer) error {
+	o := f32.Pt(r.X, r.Y)
+	sz := f32.Pt(r.Width, r.Height)
+	fmt.Fprintf(w, "rect(&p, %s, %s)\n", point(o), point(sz))
+	return nil
+}
+
+type Circle struct {
+	Cx float32 `xml:"cx,attr"`
+	Cy float32 `xml:"cy,attr"`
+	R  float32 `xml:"r,attr"`
+	Fill
+}
+
+func (c *Circle) Path(w io.Writer) error {
+	center := f32.Pt(c.Cx, c.Cy)
+	r := f32.Pt(c.R, c.R)
+	fmt.Fprintf(w, "ellipse(&p, %s, %s)\n", point(center), point(r))
+	return nil
+}
+
+func parseSVG(w io.Writer, d *xml.Decoder) error {
+	for {
+		tok, err := d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return errors.New("unexpected end of <svg> element")
+			}
+			return err
+		}
+		var start xml.StartElement
+		switch tok := tok.(type) {
+		case xml.EndElement:
+			return nil
+		case xml.StartElement:
+			start = tok
+		default:
+			continue
+		}
+		var elem interface {
+			Path(w io.Writer) error
+		}
+		var fill *Fill
+		switch n := start.Name.Local; n {
+		case "g":
+			// Flatten groups.
+			if err := parseSVG(w, d); err != nil {
+				return err
+			}
+			continue
+		case "title":
+			d.Skip()
+			continue
+		case "polygon", "polyline":
+			p := new(Poly)
+			elem = p
+			fill = &p.Fill
+		case "path":
+			p := new(Path)
+			elem = p
+			fill = &p.Fill
+		case "line":
+			l := new(Line)
+			elem = l
+			fill = &l.Fill
+		case "ellipse":
+			e := new(Ellipse)
+			elem = e
+			fill = &e.Fill
+		case "rect":
+			r := new(Rect)
+			elem = r
+			fill = &r.Fill
+		case "circle":
+			c := new(Circle)
+			elem = c
+			fill = &c.Fill
+		default:
+			return fmt.Errorf("unsupported tag: <%s>", n)
+		}
+		if err := d.DecodeElement(elem, &start); err != nil {
+			return err
+		}
+		if !fill.Fill.Set && !fill.Stroke.Set {
+			continue
+		}
+		fmt.Fprintf(w, "{\n")
+		trans := f32.Affine2D(fill.Transform)
+		if trans != (f32.Affine2D{}) {
+			sx, hx, ox, sy, hy, oy := trans.Elems()
+			fmt.Fprintf(w, "t := op.Affine(f32.NewAffine2D(%g, %g, %g, %g, %g, %g)).Push(&ops)\n", sx, hx, ox, sy, hy, oy)
+		}
+		fmt.Fprintf(w, "var p clip.Path\n")
+		fmt.Fprintf(w, "p.Begin(&ops)\n")
+		if err := elem.Path(w); err != nil {
+			return err
+		}
+		fmt.Fprintf(w, "spec := p.End()\n")
+		if fill.Fill.Set {
+			fmt.Fprintf(w, "paint.FillShape(&ops, argb(%#.8x), clip.Outline{Path: spec}.Op())\n", fill.Fill.Value)
+		}
+		if fill.Stroke.Set {
+			fmt.Fprintf(w, "paint.FillShape(&ops, argb(%#.8x), clip.Stroke{Width: %g, Path: spec}.Op())\n", fill.Stroke.Value, fill.StrokeWidth)
+		}
+		if trans != (f32.Affine2D{}) {
+			fmt.Fprintf(w, "t.Pop()\n")
+		}
+		fmt.Fprintf(w, "}\n")
+	}
+}
+
+func printPathCommands(w io.Writer, cmds string) error {
+	moveTo := func(p f32.Point) {
+		fmt.Fprintf(w, "p.MoveTo(%s)\n", point(p))
+	}
+	lineTo := func(p f32.Point) {
+		fmt.Fprintf(w, "p.LineTo(%s)\n", point(p))
+	}
+	cubeTo := func(p0, p1, p2 f32.Point) {
+		fmt.Fprintf(w, "p.CubeTo(%s, %s, %s)\n", point(p0), point(p1), point(p2))
+	}
+	cmds = strings.TrimSpace(cmds)
+	var pen f32.Point
+	initPoint := pen
+	ctrl2 := pen
+	for {
+		cmds = strings.TrimLeft(cmds, " ,\t\n")
+		if len(cmds) == 0 {
+			break
+		}
+		orig := cmds
+		op := rune(cmds[0])
+		cmds = cmds[1:]
+		switch op {
+		case 'M', 'm', 'V', 'v', 'L', 'l', 'H', 'h', 'C', 'c', 'S', 's':
+		case 'Z', 'z':
+			if pen != initPoint {
+				lineTo(initPoint)
+				pen = initPoint
+			}
+			ctrl2 = initPoint
+			continue
+		default:
+			return fmt.Errorf("unknown <path> command %s in %q", string(op), orig)
+		}
+		var coords []float64
+		for {
+			cmds = strings.TrimLeft(cmds, " ,\t\n")
+			if len(cmds) == 0 {
+				break
+			}
+			n, x, ok := parseFloat(cmds)
+			if !ok {
+				break
+			}
+			cmds = cmds[n:]
+			coords = append(coords, x)
+		}
+		rel := unicode.IsLower(op)
+		newPen := pen
+		switch unicode.ToLower(op) {
+		case 'h':
+			for _, x := range coords {
+				p := f32.Pt(float32(x), pen.Y)
+				if rel {
+					p.X += pen.X
+				}
+				lineTo(p)
+				newPen = p
+			}
+			pen = newPen
+			ctrl2 = newPen
+			continue
+		case 'v':
+			for _, y := range coords {
+				p := f32.Pt(pen.X, float32(y))
+				if rel {
+					p.Y += pen.Y
+				}
+				lineTo(p)
+				newPen = p
+			}
+			pen = newPen
+			ctrl2 = newPen
+			continue
+		}
+		if len(coords)%2 != 0 {
+			return fmt.Errorf("odd number of coordinates in <path> data: %q", orig)
+		}
+		var off f32.Point
+		if rel {
+			// Relative command.
+			off = pen
+		} else {
+			off = f32.Pt(0, 0)
+		}
+		var points []f32.Point
+		for i := 0; i < len(coords); i += 2 {
+			p := f32.Pt(float32(coords[i]), float32(coords[i+1]))
+			p = p.Add(off)
+			points = append(points, p)
+		}
+		newCtrl2 := ctrl2
+		switch op := unicode.ToLower(op); op {
+		case 'm', 'l':
+			sop := moveTo
+			if op == 'l' {
+				sop = lineTo
+			}
+			for _, p := range points {
+				sop(p)
+				newPen = p
+			}
+			if op == 'm' {
+				initPoint = newPen
+			}
+		case 'c':
+			for i := 0; i < len(points); i += 3 {
+				p1, p2, p3 := points[i], points[i+1], points[i+2]
+				cubeTo(p1, p2, p3)
+				newPen = p3
+				newCtrl2 = p2
+			}
+		case 's':
+			for i := 0; i < len(points); i += 2 {
+				p2, p3 := points[i], points[i+1]
+				// Compute p1 by reflecting p2 on to the line that contains pen and p2.
+				p1 := pen.Mul(2).Sub(ctrl2)
+				cubeTo(p1, p2, p3)
+				newPen = p3
+				newCtrl2 = p2
+			}
+		}
+		pen = newPen
+		ctrl2 = newCtrl2
+	}
+	return nil
+}
+
+func parseFloat(s string) (int, float64, bool) {
+	n := 0
+	if len(s) > 0 && s[0] == '-' {
+		n++
+	}
+	for ; n < len(s); n++ {
+		if !(unicode.IsDigit(rune(s[n])) || s[n] == '.') {
+			break
+		}
+	}
+	f, err := strconv.ParseFloat(s[:n], 64)
+	return n, f, err == nil
+}
+
+const funcs = `
+func argb(c uint32) color.NRGBA {
+	return color.NRGBA{A: uint8(c >> 24), R: uint8(c >> 16), G: uint8(c >> 8), B: uint8(c)}
+}
+
+func rect(p *clip.Path, origin, size f32.Point) {
+	p.MoveTo(origin)
+	p.LineTo(origin.Add(f32.Pt(size.X, 0)))
+	p.LineTo(origin.Add(size))
+	p.LineTo(origin.Add(f32.Pt(0, size.Y)))
+	p.Close()
+}
+
+func ellipse(p *clip.Path, center, radius f32.Point) {
+	r := radius.X
+	// We'll model the ellipse as a circle scaled in the Y
+	// direction.
+	scale := radius.Y / r
+
+	// https://pomax.github.io/bezierinfo/#circles_cubic.
+	const q = 4 * (math.Sqrt2 - 1) / 3
+
+	curve := r * q
+	top := f32.Point{X: center.X, Y: center.Y - r*scale}
+
+	p.MoveTo(top)
+	p.CubeTo(
+		f32.Point{X: center.X + curve, Y: center.Y - r*scale},
+		f32.Point{X: center.X + r, Y: center.Y - curve*scale},
+		f32.Point{X: center.X + r, Y: center.Y},
+	)
+	p.CubeTo(
+		f32.Point{X: center.X + r, Y: center.Y + curve*scale},
+		f32.Point{X: center.X + curve, Y: center.Y + r*scale},
+		f32.Point{X: center.X, Y: center.Y + r*scale},
+	)
+	p.CubeTo(
+		f32.Point{X: center.X - curve, Y: center.Y + r*scale},
+		f32.Point{X: center.X - r, Y: center.Y + curve*scale},
+		f32.Point{X: center.X - r, Y: center.Y},
+	)
+	p.CubeTo(
+		f32.Point{X: center.X - r, Y: center.Y - curve*scale},
+		f32.Point{X: center.X - curve, Y: center.Y - r*scale},
+		top,
+	)
+}
+`

ui_accessibility.go

@@ -19,26 +19,49 @@ type focusAppearance struct {
 	MinHeight    int
 }
 
-func fieldFocusAppearance(metric unit.Metric, focused bool) focusAppearance {
+func fieldFocusAppearance(metric unit.Metric, prefs accessibilityPreferences, focused bool) focusAppearance {
+	prefs = normalizeAccessibilityPreferences(prefs)
 	appearance := focusAppearance{
 		BorderColor:  color.NRGBA{R: 202, G: 194, B: 180, A: 255},
 		OutlineColor: color.NRGBA{A: 0},
 		OutlineWidth: max(1, metric.Dp(unit.Dp(1))),
 		MinHeight:    metric.Dp(unit.Dp(44)),
 	}
+	if prefs.DisplayDensity == displayDensityComfortable {
+		appearance.MinHeight = metric.Dp(unit.Dp(52))
+	}
+	if prefs.Contrast == contrastHigh {
+		appearance.BorderColor = color.NRGBA{R: 108, G: 101, B: 90, A: 255}
+	}
 	if focused {
 		appearance.BorderColor = accentColor
 		appearance.OutlineColor = color.NRGBA{R: 28, G: 83, B: 63, A: 72}
 		appearance.OutlineWidth = max(2, metric.Dp(unit.Dp(2)))
+		if prefs.Contrast == contrastHigh {
+			appearance.BorderColor = color.NRGBA{R: 16, G: 60, B: 44, A: 255}
+			appearance.OutlineColor = color.NRGBA{R: 20, G: 74, B: 55, A: 124}
+		}
+		if prefs.KeyboardFocus == keyboardFocusProminent {
+			appearance.OutlineWidth = max(3, metric.Dp(unit.Dp(3)))
+			appearance.OutlineColor = color.NRGBA{R: 20, G: 74, B: 55, A: 148}
+		}
 	}
 	return appearance
 }
 
-func buttonFocusColors(focused bool) (background color.NRGBA, text color.NRGBA) {
+func buttonFocusColors(prefs accessibilityPreferences, focused bool) (background color.NRGBA, text color.NRGBA) {
+	prefs = normalizeAccessibilityPreferences(prefs)
 	background = color.NRGBA{R: 231, G: 239, B: 235, A: 255}
 	text = accentColor
+	if prefs.Contrast == contrastHigh {
+		background = color.NRGBA{R: 225, G: 235, B: 230, A: 255}
+		text = color.NRGBA{R: 19, G: 57, B: 43, A: 255}
+	}
 	if focused {
 		background = color.NRGBA{R: 214, G: 229, B: 221, A: 255}
+		if prefs.Contrast == contrastHigh || prefs.KeyboardFocus == keyboardFocusProminent {
+			background = color.NRGBA{R: 202, G: 222, B: 212, A: 255}
+		}
 	}
 	return background, text
 }

ui_api.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"image/color"
 	"strings"
 	"time"
 
@@ -27,6 +28,130 @@ func apiOperations() []apitokens.Operation {
 	}
 }
 
+type apiAuditQuickFilter struct {
+	Label string
+	Query string
+}
+
+func apiAuditDecisionLabel(eventType apiaudit.EventType) string {
+	switch eventType {
+	case apiaudit.EventApprovalRequested:
+		return "Requested"
+	case apiaudit.EventApprovalAllowed:
+		return "Allowed"
+	case apiaudit.EventApprovalDenied:
+		return "Denied"
+	case apiaudit.EventApprovalCanceled:
+		return "Canceled"
+	case apiaudit.EventApprovalTimedOut:
+		return "Timed Out"
+	case apiaudit.EventAuthRejected:
+		return "Auth Rejected"
+	default:
+		return strings.ReplaceAll(string(eventType), "_", " ")
+	}
+}
+
+func apiAuditOperationLabel(operation apitokens.Operation) string {
+	if strings.TrimSpace(string(operation)) == "" {
+		return "Other"
+	}
+	return strings.ReplaceAll(string(operation), "_", " ")
+}
+
+func compactAuditFilterLabel(label string) string {
+	label = strings.TrimSpace(label)
+	if len(label) <= 22 {
+		return label
+	}
+	return label[:19] + "..."
+}
+
+func apiAuditEventSearchTerms(event apiaudit.Event) string {
+	parts := []string{
+		string(event.Type),
+		apiAuditDecisionLabel(event.Type),
+		event.TokenName,
+		event.ClientName,
+		string(event.Operation),
+		apiAuditOperationLabel(event.Operation),
+		strings.Join(event.Resource.Path, " / "),
+		event.Resource.EntryID,
+		event.Message,
+	}
+	switch event.Type {
+	case apiaudit.EventApprovalAllowed:
+		parts = append(parts, "allow approved")
+	case apiaudit.EventApprovalDenied:
+		parts = append(parts, "deny denied")
+	case apiaudit.EventApprovalRequested:
+		parts = append(parts, "prompt requested")
+	case apiaudit.EventApprovalCanceled:
+		parts = append(parts, "cancel canceled")
+	case apiaudit.EventApprovalTimedOut:
+		parts = append(parts, "timeout timed out")
+	case apiaudit.EventAuthRejected:
+		parts = append(parts, "rejected unauthorized")
+	}
+	return strings.ToLower(strings.Join(parts, " "))
+}
+
+func apiAuditFilterButtons(clicks *[]widget.Clickable, filters []apiAuditQuickFilter) []widget.Clickable {
+	if len(filters) == 0 {
+		*clicks = nil
+		return nil
+	}
+	if len(*clicks) < len(filters) {
+		next := make([]widget.Clickable, len(filters))
+		copy(next, *clicks)
+		*clicks = next
+	}
+	return (*clicks)[:len(filters)]
+}
+
+func (u *ui) apiAuditQuickFilters(events []apiaudit.Event) ([]apiAuditQuickFilter, []apiAuditQuickFilter, []apiAuditQuickFilter) {
+	tokenSeen := map[string]struct{}{}
+	decisionSeen := map[apiaudit.EventType]struct{}{}
+	operationSeen := map[apitokens.Operation]struct{}{}
+	var tokens []apiAuditQuickFilter
+	var decisions []apiAuditQuickFilter
+	var operations []apiAuditQuickFilter
+
+	for _, event := range events {
+		if name := strings.TrimSpace(event.TokenName); name != "" {
+			if _, ok := tokenSeen[name]; !ok {
+				tokenSeen[name] = struct{}{}
+				tokens = append(tokens, apiAuditQuickFilter{Label: name, Query: name})
+			}
+		}
+		if _, ok := decisionSeen[event.Type]; !ok {
+			decisionSeen[event.Type] = struct{}{}
+			label := apiAuditDecisionLabel(event.Type)
+			decisions = append(decisions, apiAuditQuickFilter{Label: label, Query: label})
+		}
+		if strings.TrimSpace(string(event.Operation)) == "" {
+			continue
+		}
+		if _, ok := operationSeen[event.Operation]; ok {
+			continue
+		}
+		operationSeen[event.Operation] = struct{}{}
+		label := apiAuditOperationLabel(event.Operation)
+		operations = append(operations, apiAuditQuickFilter{Label: label, Query: label})
+	}
+
+	if len(tokens) > 4 {
+		tokens = tokens[:4]
+	}
+	if len(decisions) > 5 {
+		decisions = decisions[:5]
+	}
+	if len(operations) > 4 {
+		operations = operations[:4]
+	}
+	return tokens, decisions, operations
+}
+
 func (u *ui) apiTokens() []apitokens.Token {
 	tokens, err := u.state.APITokens()
 	if err != nil {
@@ -244,6 +369,57 @@ func (u *ui) addAPIPolicyRuleAction() error {
 	return nil
 }
 
+func (u *ui) apiPolicyGroupPathSummary() string {
+	path := parsePath(u.apiPolicyPath.Text())
+	if len(path) == 0 {
+		return "No group selected"
+	}
+	return strings.Join(path, " / ")
+}
+
+func (u *ui) apiPolicyEntrySummary() string {
+	id := strings.TrimSpace(u.apiPolicyEntryID.Text())
+	if id == "" {
+		return "No entry selected"
+	}
+	if item, ok := u.selectedEntry(); ok && item.ID == id {
+		if strings.TrimSpace(item.Title) != "" {
+			return item.Title + " (" + id + ")"
+		}
+	}
+	return id
+}
+
+func (u *ui) useCurrentGroupForPolicyAction() error {
+	u.syncCurrentPath()
+	path := u.displayPath()
+	if len(path) == 0 {
+		return fmt.Errorf("navigate to a group first")
+	}
+	u.apiPolicyGroupScope = true
+	u.apiPolicyGroupScopeW.Value = true
+	u.apiPolicyPath.SetText(strings.Join(path, " / "))
+	u.apiPolicyEntryID.SetText("")
+	return nil
+}
+
+func (u *ui) useSelectedEntryForPolicyAction() error {
+	item, ok := u.selectedEntry()
+	if !ok || strings.TrimSpace(item.ID) == "" {
+		return fmt.Errorf("select an entry first")
+	}
+	u.apiPolicyGroupScope = false
+	u.apiPolicyGroupScopeW.Value = false
+	u.apiPolicyEntryID.SetText(item.ID)
+	return nil
+}
+
+func (u *ui) clearAPIPolicyTargetAction() error {
+	u.apiPolicyPath.SetText("")
+	u.apiPolicyEntryID.SetText("")
+	return nil
+}
+
 func (u *ui) removeAPIPolicyRuleAction(index int) error {
 	token, ok := u.selectedAPIToken()
 	if !ok {
@@ -274,15 +450,7 @@ func (u *ui) apiAuditEvents() []apiaudit.Event {
 	}
 	filtered := make([]apiaudit.Event, 0, len(events))
 	for _, event := range events {
-		haystack := strings.ToLower(strings.Join([]string{
-			string(event.Type),
-			event.TokenName,
-			event.ClientName,
-			string(event.Operation),
-			strings.Join(event.Resource.Path, " / "),
-			event.Resource.EntryID,
-			event.Message,
-		}, " "))
+		haystack := apiAuditEventSearchTerms(event)
 		if strings.Contains(haystack, query) {
 			filtered = append(filtered, event)
 		}
@@ -293,16 +461,58 @@ func (u *ui) apiAuditEvents() []apiaudit.Event {
 	return filtered
 }
 
-func formatAPIPolicyRule(rule apitokens.PolicyRule) string {
-	scope := strings.Join(rule.Resource.Path, " / ")
+func policyRuleParts(rule apitokens.PolicyRule) (string, string, string) {
+	effect := strings.ToUpper(string(rule.Effect))
+	operation := string(rule.Operation)
+	resource := "Vault root"
 	if rule.Resource.Kind == apitokens.ResourceEntry {
-		scope = "entry " + rule.Resource.EntryID
+		resource = "Entry: " + rule.Resource.EntryID
+	} else if len(rule.Resource.Path) > 0 {
+		resource = strings.Join(rule.Resource.Path, " / ")
 	}
-	return strings.TrimSpace(strings.Join([]string{
-		strings.ToUpper(string(rule.Effect)),
-		string(rule.Operation),
-		scope,
-	}, " "))
+	return effect, operation, resource
+}
+
+func apiTokenStatusSummary(token apitokens.Token) string {
+	parts := []string{"Active"}
+	if token.Disabled {
+		parts[0] = "Disabled"
+	}
+	if token.RevokedAt != nil {
+		parts[0] = "Revoked"
+	}
+	if token.ExpiresAt != nil {
+		parts = append(parts, "Expires "+token.ExpiresAt.Local().Format(time.RFC3339))
+	} else {
+		parts = append(parts, "No expiration")
+	}
+	if len(token.Policies) == 1 {
+		parts = append(parts, "1 policy rule")
+	} else {
+		parts = append(parts, fmt.Sprintf("%d policy rules", len(token.Policies)))
+	}
+	return strings.Join(parts, " · ")
+}
+
+func apiTokenManagementTitle(token apitokens.Token, ok bool) string {
+	if !ok {
+		return "Issue API Token"
+	}
+	if strings.TrimSpace(token.Name) != "" {
+		return token.Name
+	}
+	return "Unnamed API Token"
+}
+
+func apiTokenManagementSubtitle(token apitokens.Token, ok bool) string {
+	if !ok {
+		return "Create a scoped gRPC credential, then select it here to inspect identity, lifecycle, and policy rules."
+	}
+	client := strings.TrimSpace(token.ClientName)
+	if client == "" {
+		client = "No client name"
+	}
+	return client + " · " + apiTokenStatusSummary(token)
 }
 
 func uiHasPolicyRule(rules []apitokens.PolicyRule, target apitokens.PolicyRule) bool {
@@ -336,17 +546,21 @@ func (u *ui) apiTokenRow(gtx layout.Context, click *widget.Clickable, idx int, t
 						lbl.Color = accentColor
 						return lbl.Layout(gtx)
 					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 						lbl := material.Label(u.theme, unit.Sp(13), token.ClientName)
 						lbl.Color = mutedColor
 						return lbl.Layout(gtx)
 					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						text := "Non-expiring"
-						if token.ExpiresAt != nil {
-							text = "Expires " + token.ExpiresAt.Local().Format(time.RFC3339)
-						}
-						lbl := material.Label(u.theme, unit.Sp(12), text)
+						lbl := material.Label(u.theme, unit.Sp(12), apiTokenStatusSummary(token))
+						lbl.Color = mutedColor
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(11), "ID "+token.ID)
 						lbl.Color = mutedColor
 						return lbl.Layout(gtx)
 					}),
@@ -392,6 +606,11 @@ func (u *ui) apiAuditRow(gtx layout.Context, click *widget.Clickable, idx int, e
 						lbl.Color = accentColor
 						return lbl.Layout(gtx)
 					}),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(12), string(event.Operation))
+						lbl.Color = mutedColor
+						return lbl.Layout(gtx)
+					}),
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 						lbl := material.Label(u.theme, unit.Sp(12), event.At.Local().Format(time.RFC3339))
 						lbl.Color = mutedColor
@@ -415,11 +634,46 @@ func (u *ui) apiAuditRow(gtx layout.Context, click *widget.Clickable, idx int, e
 func (u *ui) apiTokenListPanel(gtx layout.Context) layout.Dimensions {
 	tokens := u.apiTokens()
 	return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+				selected, ok := u.selectedAPIToken()
+				return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(16), "Token Directory")
+						lbl.Color = accentColor
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(12), "Grant scoped gRPC access to external tools. Search matches token name, client, token id, and policy details.")
+						lbl.Color = mutedColor
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						title := fmt.Sprintf("%d tokens managed", len(tokens))
+						if ok {
+							title = "Selected: " + apiTokenManagementTitle(selected, true)
+						}
+						lbl := material.Label(u.theme, unit.Sp(12), title)
+						lbl.Color = mutedColor
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						if !ok {
+							return layout.Dimensions{}
+						}
+						lbl := material.Label(u.theme, unit.Sp(11), apiTokenManagementSubtitle(selected, true))
+						lbl.Color = mutedColor
+						return lbl.Layout(gtx)
+					}),
+				)
+			})
+		}),
+		layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
 		layout.Flexed(1, func(gtx layout.Context) layout.Dimensions {
 			if len(tokens) == 0 {
-				lbl := material.Label(u.theme, unit.Sp(14), "No API tokens match the current filter.")
-				lbl.Color = mutedColor
-				return lbl.Layout(gtx)
+				return emptyStatePanel(gtx, u.theme, u.listEmptyState())
 			}
 			return material.List(u.theme, &u.list).Layout(gtx, len(tokens), func(gtx layout.Context, i int) layout.Dimensions {
 				return u.apiTokenRow(gtx, &u.apiTokenClicks[i], i, tokens[i])
@@ -430,6 +684,11 @@ func (u *ui) apiTokenListPanel(gtx layout.Context) layout.Dimensions {
 
 func (u *ui) apiAuditListPanel(gtx layout.Context) layout.Dimensions {
 	events := u.apiAuditEvents()
+	allEvents := []apiaudit.Event(nil)
+	if u.auditLog != nil {
+		allEvents = u.auditLog.Events()
+	}
+	tokenFilters, decisionFilters, operationFilters := u.apiAuditQuickFilters(allEvents)
 	return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 			text := "Local gRPC audit history"
@@ -441,9 +700,19 @@ func (u *ui) apiAuditListPanel(gtx layout.Context) layout.Dimensions {
 			return lbl.Layout(gtx)
 		}),
 		layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
+		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			lbl := material.Label(u.theme, unit.Sp(12), "Filter by token, decision, or operation. Use the quick filters below or type a resource path in Search vault.")
+			lbl.Color = mutedColor
+			return lbl.Layout(gtx)
+		}),
+		layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
+		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			return u.apiAuditQuickFilterPanel(gtx, tokenFilters, decisionFilters, operationFilters)
+		}),
+		layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
 		layout.Flexed(1, func(gtx layout.Context) layout.Dimensions {
 			if len(events) == 0 {
-				lbl := material.Label(u.theme, unit.Sp(14), "No audit events yet.")
+				lbl := material.Label(u.theme, unit.Sp(14), u.listEmptyMessage())
 				lbl.Color = mutedColor
 				return lbl.Layout(gtx)
 			}
@@ -454,6 +723,109 @@ func (u *ui) apiAuditListPanel(gtx layout.Context) layout.Dimensions {
 	)
 }
 
+func (u *ui) apiAuditQuickFilterPanel(gtx layout.Context, tokenFilters, decisionFilters, operationFilters []apiAuditQuickFilter) layout.Dimensions {
+	hasTokens := len(tokenFilters) > 0
+	hasDecisions := len(decisionFilters) > 0
+	hasOperations := len(operationFilters) > 0
+	query := strings.TrimSpace(u.search.Text())
+	if !hasTokens && !hasDecisions && !hasOperations && query == "" {
+		return layout.Dimensions{}
+	}
+
+	children := make([]layout.FlexChild, 0, 8)
+	if query != "" {
+		children = append(children,
+			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+				return u.auditQuickFilterButton(gtx, &u.clearAPIAuditFilters, "Clear filters", false, "")
+			}),
+			layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+		)
+	}
+	if hasTokens {
+		children = append(children, layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			return u.apiAuditQuickFilterRow(gtx, "Tokens", tokenFilters, &u.apiAuditTokenFilters)
+		}))
+	}
+	if hasDecisions {
+		if len(children) > 0 {
+			children = append(children, layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout))
+		}
+		children = append(children, layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			return u.apiAuditQuickFilterRow(gtx, "Decisions", decisionFilters, &u.apiAuditDecisionFilters)
+		}))
+	}
+	if hasOperations {
+		if len(children) > 0 {
+			children = append(children, layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout))
+		}
+		children = append(children, layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			return u.apiAuditQuickFilterRow(gtx, "Operations", operationFilters, &u.apiAuditOperationFilters)
+		}))
+	}
+	return layout.Flex{Axis: layout.Vertical}.Layout(gtx, children...)
+}
+
+func (u *ui) apiAuditQuickFilterRow(gtx layout.Context, title string, filters []apiAuditQuickFilter, clicks *[]widget.Clickable) layout.Dimensions {
+	buttons := apiAuditFilterButtons(clicks, filters)
+	return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			lbl := material.Label(u.theme, unit.Sp(11), title)
+			lbl.Color = mutedColor
+			return lbl.Layout(gtx)
+		}),
+		layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			if gtx.Constraints.Max.X <= gtx.Dp(unit.Dp(460)) {
+				column := make([]layout.FlexChild, 0, len(filters)*2)
+				for i := range filters {
+					if i > 0 {
+						column = append(column, layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout))
+					}
+					filter := filters[i]
+					click := &buttons[i]
+					selected := strings.EqualFold(strings.TrimSpace(u.search.Text()), strings.TrimSpace(filter.Query))
+					column = append(column, layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						return u.auditQuickFilterButton(gtx, click, compactAuditFilterLabel(filter.Label), selected, filter.Query)
+					}))
+				}
+				return layout.Flex{Axis: layout.Vertical}.Layout(gtx, column...)
+			}
+			flexChildren := make([]layout.FlexChild, 0, len(filters)*2)
+			for i := range filters {
+				if i > 0 {
+					flexChildren = append(flexChildren, layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout))
+				}
+				filter := filters[i]
+				click := &buttons[i]
+				selected := strings.EqualFold(strings.TrimSpace(u.search.Text()), strings.TrimSpace(filter.Query))
+				flexChildren = append(flexChildren, layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+					return u.auditQuickFilterButton(gtx, click, compactAuditFilterLabel(filter.Label), selected, filter.Query)
+				}))
+			}
+			return layout.Flex{Spacing: layout.SpaceStart}.Layout(gtx, flexChildren...)
+		}),
+	)
+}
+
+func (u *ui) auditQuickFilterButton(gtx layout.Context, click *widget.Clickable, label string, selected bool, query string) layout.Dimensions {
+	for click.Clicked(gtx) {
+		u.search.SetText(strings.TrimSpace(query))
+		u.filter()
+	}
+	btn := material.Button(u.theme, click, label)
+	btn.CornerRadius = unit.Dp(10)
+	btn.TextSize = unit.Sp(11)
+	btn.Inset = layout.Inset{Top: 5, Bottom: 5, Left: 9, Right: 9}
+	if selected {
+		btn.Background = accentColor
+		btn.Color = color.NRGBA{R: 255, G: 248, B: 238, A: 255}
+	} else {
+		btn.Background = color.NRGBA{R: 231, G: 224, B: 214, A: 255}
+		btn.Color = accentColor
+	}
+	return btn.Layout(gtx)
+}
+
 func (u *ui) apiTokenDetailPanel(gtx layout.Context) layout.Dimensions {
 	token, ok := u.selectedAPIToken()
 	removeClicks := u.ensureAPIPolicyRemoveClickables(0)
@@ -462,140 +834,269 @@ func (u *ui) apiTokenDetailPanel(gtx layout.Context) layout.Dimensions {
 	}
 	rows := []layout.Widget{
 		func(gtx layout.Context) layout.Dimensions {
-			lbl := material.Label(u.theme, unit.Sp(20), "API Token")
-			lbl.Color = accentColor
-			return lbl.Layout(gtx)
+			return card(gtx, func(gtx layout.Context) layout.Dimensions {
+				return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(20), "API Token Management")
+						lbl.Color = accentColor
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(16), apiTokenManagementTitle(token, ok))
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(12), apiTokenManagementSubtitle(token, ok))
+						lbl.Color = mutedColor
+						return lbl.Layout(gtx)
+					}),
+				)
+			})
 		},
-		layout.Spacer{Height: unit.Dp(8)}.Layout,
-		labeledEditor(u.theme, "Name", &u.apiTokenName, false),
-		layout.Spacer{Height: unit.Dp(6)}.Layout,
-		labeledEditor(u.theme, "Client Name", &u.apiTokenClientName, false),
-		layout.Spacer{Height: unit.Dp(6)}.Layout,
-		labeledEditorHelp(u.theme, "Expires At", "Optional RFC3339 timestamp, for example 2026-04-01T15:04:05Z.", &u.apiTokenExpiresAt, false),
-		layout.Spacer{Height: unit.Dp(6)}.Layout,
+	}
+	rows = append(rows,
+		layout.Spacer{Height: unit.Dp(10)}.Layout,
 		func(gtx layout.Context) layout.Dimensions {
-			return material.CheckBox(u.theme, &u.apiTokenDisabled, "Disabled").Layout(gtx)
+			return card(gtx, func(gtx layout.Context) layout.Dimensions {
+				content := []layout.FlexChild{
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(14), "Identity")
+						lbl.Color = accentColor
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
+					layout.Rigid(labeledEditor(u.theme, "Name", &u.apiTokenName, false)),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+					layout.Rigid(labeledEditor(u.theme, "Client Name", &u.apiTokenClientName, false)),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+					layout.Rigid(labeledEditorHelp(u.theme, "Expires At", "Optional RFC3339 timestamp, for example 2026-04-01T15:04:05Z.", &u.apiTokenExpiresAt, false)),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						return material.CheckBox(u.theme, &u.apiTokenDisabled, "Disabled").Layout(gtx)
+					}),
+				}
+				if ok {
+					content = append(content,
+						layout.Rigid(layout.Spacer{Height: unit.Dp(10)}.Layout),
+						layout.Rigid(detailLine(u.theme, "Token ID", token.ID)),
+						layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+						layout.Rigid(detailLine(u.theme, "Created", token.CreatedAt.Local().Format(time.RFC3339))),
+					)
+					if token.RevokedAt != nil {
+						content = append(content,
+							layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+							layout.Rigid(detailLine(u.theme, "Revoked", token.RevokedAt.Local().Format(time.RFC3339))),
+						)
+					}
+				}
+				return layout.Flex{Axis: layout.Vertical}.Layout(gtx, content...)
+			})
 		},
-	}
+	)
 	if ok {
-		rows = append(rows,
-			layout.Spacer{Height: unit.Dp(6)}.Layout,
-			detailLine(u.theme, "Token ID", token.ID),
-			layout.Spacer{Height: unit.Dp(6)}.Layout,
-			detailLine(u.theme, "Created", token.CreatedAt.Local().Format(time.RFC3339)),
-		)
-		if token.RevokedAt != nil {
-			rows = append(rows,
-				layout.Spacer{Height: unit.Dp(6)}.Layout,
-				detailLine(u.theme, "Revoked", token.RevokedAt.Local().Format(time.RFC3339)),
-			)
-		}
-	}
-	if strings.TrimSpace(u.apiTokenSecret) != "" {
 		rows = append(rows,
 			layout.Spacer{Height: unit.Dp(10)}.Layout,
 			func(gtx layout.Context) layout.Dimensions {
-				return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+				return card(gtx, func(gtx layout.Context) layout.Dimensions {
 					return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 						layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-							lbl := material.Label(u.theme, unit.Sp(13), "ONE-TIME SECRET")
-							lbl.Color = mutedColor
-							return lbl.Layout(gtx)
-						}),
-						layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
-						layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-							lbl := material.Label(u.theme, unit.Sp(15), u.apiTokenSecret)
+							lbl := material.Label(u.theme, unit.Sp(14), "Lifecycle")
 							lbl.Color = accentColor
 							return lbl.Layout(gtx)
 						}),
+						layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+							lbl := material.Label(u.theme, unit.Sp(12), "Save updates, rotate secret material, or shut a token down without leaving this surface.")
+							lbl.Color = mutedColor
+							return lbl.Layout(gtx)
+						}),
+						layout.Rigid(layout.Spacer{Height: unit.Dp(10)}.Layout),
+						layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+							return layout.Flex{Spacing: layout.SpaceStart}.Layout(gtx,
+								layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+									return tonedButton(gtx, u.theme, &u.saveAPIToken, "Save Token")
+								}),
+								layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
+								layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+									return tonedButton(gtx, u.theme, &u.rotateAPIToken, "Rotate")
+								}),
+								layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
+								layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+									return tonedButton(gtx, u.theme, &u.disableAPIToken, "Disable")
+								}),
+							)
+						}),
 						layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 						layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-							return tonedButton(gtx, u.theme, &u.copyAPITokenSecret, "Copy Secret")
+							return layout.Flex{Spacing: layout.SpaceStart}.Layout(gtx,
+								layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+									return tonedButton(gtx, u.theme, &u.revokeAPIToken, "Revoke")
+								}),
+								layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
+								layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+									return tonedButton(gtx, u.theme, &u.deleteAPIToken, "Delete")
+								}),
+							)
+						}),
+						layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+							if strings.TrimSpace(u.apiTokenSecret) == "" {
+								return layout.Dimensions{}
+							}
+							return layout.Inset{Top: unit.Dp(10)}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
+								return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+									return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+										layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+											lbl := material.Label(u.theme, unit.Sp(12), "ONE-TIME SECRET")
+											lbl.Color = mutedColor
+											return lbl.Layout(gtx)
+										}),
+										layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+										layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+											lbl := material.Label(u.theme, unit.Sp(15), u.apiTokenSecret)
+											lbl.Color = accentColor
+											return lbl.Layout(gtx)
+										}),
+										layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+										layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+											return tonedButton(gtx, u.theme, &u.copyAPITokenSecret, "Copy Secret")
+										}),
+									)
+								})
+							})
 						}),
 					)
 				})
 			},
+			layout.Spacer{Height: unit.Dp(10)}.Layout,
+			func(gtx layout.Context) layout.Dimensions {
+				return card(gtx, func(gtx layout.Context) layout.Dimensions {
+					sectionRows := []layout.Widget{
+						func(gtx layout.Context) layout.Dimensions {
+							lbl := material.Label(u.theme, unit.Sp(14), "Policy Rules")
+							lbl.Color = accentColor
+							return lbl.Layout(gtx)
+						},
+						layout.Spacer{Height: unit.Dp(4)}.Layout,
+						func(gtx layout.Context) layout.Dimensions {
+							lbl := material.Label(u.theme, unit.Sp(12), "Effect, operation, and resource are separated so rules scan quickly while you review token scope.")
+							lbl.Color = mutedColor
+							return lbl.Layout(gtx)
+						},
+						layout.Spacer{Height: unit.Dp(10)}.Layout,
+					}
+					if len(token.Policies) > 0 {
+						for i, rule := range token.Policies {
+							index := i
+							effect, operation, resource := policyRuleParts(rule)
+							sectionRows = append(sectionRows,
+								func(gtx layout.Context) layout.Dimensions {
+									return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+										return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+											layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+												return layout.Flex{Alignment: layout.Middle}.Layout(gtx,
+													layout.Flexed(1, detailLine(u.theme, "Effect", effect)),
+													layout.Rigid(layout.Spacer{Width: unit.Dp(12)}.Layout),
+													layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+														return tonedButton(gtx, u.theme, &removeClicks[index], "Remove")
+													}),
+												)
+											}),
+											layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+											layout.Rigid(detailLine(u.theme, "Operation", operation)),
+											layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+											layout.Rigid(detailLine(u.theme, "Resource", resource)),
+										)
+									})
+								},
+								layout.Spacer{Height: unit.Dp(6)}.Layout,
+							)
+						}
+					} else {
+						sectionRows = append(sectionRows, func(gtx layout.Context) layout.Dimensions {
+							lbl := material.Label(u.theme, unit.Sp(13), "No explicit rules yet. Approval prompts can create permanent rules.")
+							lbl.Color = mutedColor
+							return lbl.Layout(gtx)
+						})
+					}
+					return material.List(u.theme, &u.apiPolicyList).Layout(gtx, len(sectionRows), func(gtx layout.Context, i int) layout.Dimensions {
+						return sectionRows[i](gtx)
+					})
+				})
+			},
+			layout.Spacer{Height: unit.Dp(10)}.Layout,
 		)
 	}
 	rows = append(rows,
-		layout.Spacer{Height: unit.Dp(10)}.Layout,
 		func(gtx layout.Context) layout.Dimensions {
-			return layout.Flex{Spacing: layout.SpaceStart}.Layout(gtx,
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.saveAPIToken, "Save Token")
-				}),
-				layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.rotateAPIToken, "Rotate")
-				}),
-				layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.disableAPIToken, "Disable")
-				}),
-				layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.revokeAPIToken, "Revoke")
-				}),
-				layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
-				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.deleteAPIToken, "Delete")
-				}),
-			)
-		},
-		layout.Spacer{Height: unit.Dp(14)}.Layout,
-		func(gtx layout.Context) layout.Dimensions {
-			lbl := material.Label(u.theme, unit.Sp(16), "Policy Rules")
-			lbl.Color = accentColor
-			return lbl.Layout(gtx)
-		},
-		layout.Spacer{Height: unit.Dp(8)}.Layout,
-	)
-	if ok && len(token.Policies) > 0 {
-		for i, rule := range token.Policies {
-			index := i
-			ruleText := formatAPIPolicyRule(rule)
-			rows = append(rows,
-				func(gtx layout.Context) layout.Dimensions {
-					return layout.Flex{Alignment: layout.Middle}.Layout(gtx,
-						layout.Flexed(1, func(gtx layout.Context) layout.Dimensions {
-							lbl := material.Label(u.theme, unit.Sp(13), ruleText)
-							lbl.Color = mutedColor
-							return lbl.Layout(gtx)
-							}),
-							layout.Rigid(layout.Spacer{Width: unit.Dp(8)}.Layout),
-							layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-								return tonedButton(gtx, u.theme, &removeClicks[index], "Remove")
-							}),
-						)
-					},
-				layout.Spacer{Height: unit.Dp(6)}.Layout,
-			)
-		}
-	} else {
-		rows = append(rows, func(gtx layout.Context) layout.Dimensions {
-			lbl := material.Label(u.theme, unit.Sp(13), "No explicit rules yet. Approval prompts can create permanent rules.")
-			lbl.Color = mutedColor
-			return lbl.Layout(gtx)
-		})
-	}
-	rows = append(rows,
-		layout.Spacer{Height: unit.Dp(10)}.Layout,
-		func(gtx layout.Context) layout.Dimensions {
-			return material.CheckBox(u.theme, &u.apiPolicyAllow, "Allow rule (unchecked means deny rule)").Layout(gtx)
-		},
-		layout.Spacer{Height: unit.Dp(6)}.Layout,
-		func(gtx layout.Context) layout.Dimensions {
-			return material.CheckBox(u.theme, &u.apiPolicyGroupScopeW, "Group scope (unchecked means exact entry scope)").Layout(gtx)
-		},
-		layout.Spacer{Height: unit.Dp(6)}.Layout,
-		labeledEditorHelp(u.theme, "Operation", "Valid operations: "+strings.Join(stringOps(apiOperations()), ", "), &u.apiPolicyOperation, false),
-		layout.Spacer{Height: unit.Dp(6)}.Layout,
-		labeledEditorHelp(u.theme, "Group Path", "Used when group scope is enabled.", &u.apiPolicyPath, false),
-		layout.Spacer{Height: unit.Dp(6)}.Layout,
-		labeledEditorHelp(u.theme, "Entry ID", "Used when group scope is disabled.", &u.apiPolicyEntryID, false),
-		layout.Spacer{Height: unit.Dp(6)}.Layout,
-		func(gtx layout.Context) layout.Dimensions {
-			return tonedButton(gtx, u.theme, &u.addAPIPolicyRule, "Add Rule")
+			return card(gtx, func(gtx layout.Context) layout.Dimensions {
+				return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(14), "Policy Composer")
+						lbl.Color = accentColor
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						lbl := material.Label(u.theme, unit.Sp(12), "Rules are evaluated per operation. Explicit deny rules override allow rules.")
+						lbl.Color = mutedColor
+						return lbl.Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(10)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						return material.CheckBox(u.theme, &u.apiPolicyAllow, "Allow rule (unchecked means deny rule)").Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						return material.CheckBox(u.theme, &u.apiPolicyGroupScopeW, "Group scope (unchecked means exact entry scope)").Layout(gtx)
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+					layout.Rigid(labeledEditorHelp(u.theme, "Operation", "Valid operations: "+strings.Join(stringOps(apiOperations()), ", "), &u.apiPolicyOperation, false)),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						if u.apiPolicyGroupScopeW.Value {
+							return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+								return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+									layout.Rigid(detailLine(u.theme, "Group Path", u.apiPolicyGroupPathSummary())),
+									layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
+									layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+										return layout.Flex{Spacing: layout.SpaceStart}.Layout(gtx,
+											layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+												return tonedButton(gtx, u.theme, &u.useCurrentGroupForPolicy, "Use Current Group")
+											}),
+											layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
+											layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+												return tonedButton(gtx, u.theme, &u.clearAPIPolicyTarget, "Clear")
+											}),
+										)
+									}),
+								)
+							})
+						}
+						return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+							return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+								layout.Rigid(detailLine(u.theme, "Entry", u.apiPolicyEntrySummary())),
+								layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
+								layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+									return layout.Flex{Spacing: layout.SpaceStart}.Layout(gtx,
+										layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+											return tonedButton(gtx, u.theme, &u.useSelectedEntryForPolicy, "Use Selected Entry")
+										}),
+										layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout),
+										layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+											return tonedButton(gtx, u.theme, &u.clearAPIPolicyTarget, "Clear")
+										}),
+									)
+								}),
+							)
+						})
+					}),
+					layout.Rigid(layout.Spacer{Height: unit.Dp(8)}.Layout),
+					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+						return tonedButton(gtx, u.theme, &u.addAPIPolicyRule, "Add Rule")
+					}),
+				)
+			})
 		},
 	)
 	return material.List(u.theme, &u.detailList).Layout(gtx, len(rows), func(gtx layout.Context, i int) layout.Dimensions {
@@ -626,16 +1127,28 @@ func (u *ui) apiAuditDetailPanel(gtx layout.Context) layout.Dimensions {
 		event := events[u.selectedAuditIndex]
 		rows = append(rows,
 			layout.Spacer{Height: unit.Dp(12)}.Layout,
-			detailLine(u.theme, "Type", string(event.Type)),
+			func(gtx layout.Context) layout.Dimensions {
+				lbl := material.Label(u.theme, unit.Sp(12), "Selected event")
+				lbl.Color = mutedColor
+				return lbl.Layout(gtx)
+			},
 			layout.Spacer{Height: unit.Dp(6)}.Layout,
+			func(gtx layout.Context) layout.Dimensions {
+				return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+					return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+						layout.Rigid(detailLine(u.theme, "Type", string(event.Type))),
+						layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
+						layout.Rigid(detailLine(u.theme, "Operation", string(event.Operation))),
+					)
+				})
+			},
+			layout.Spacer{Height: unit.Dp(8)}.Layout,
 			detailLine(u.theme, "When", event.At.Local().Format(time.RFC3339)),
 			layout.Spacer{Height: unit.Dp(6)}.Layout,
 			detailLine(u.theme, "Token", event.TokenName),
 			layout.Spacer{Height: unit.Dp(6)}.Layout,
 			detailLine(u.theme, "Client", event.ClientName),
 			layout.Spacer{Height: unit.Dp(6)}.Layout,
-			detailLine(u.theme, "Operation", string(event.Operation)),
-			layout.Spacer{Height: unit.Dp(6)}.Layout,
 			detailLine(u.theme, "Resource", formatAuditResource(event.Resource)),
 			layout.Spacer{Height: unit.Dp(6)}.Layout,
 			detailLine(u.theme, "Message", event.Message),

ui_editor.go

@@ -41,6 +41,7 @@ func (u *ui) attachmentInput() (string, []byte, error) {
 
 func (u *ui) loadSelectedEntryIntoEditor() {
 	u.resetPasswordPeek()
+	u.clearGeneratedPasswordDraft()
 	u.selectedHistoryIndex = -1
 	u.historyIndex.SetText("")
 
@@ -175,6 +176,7 @@ func (u *ui) saveEntryAction() error {
 		return err
 	}
 	u.editingEntry = false
+	u.clearGeneratedPasswordDraft()
 	u.filter()
 	return nil
 }
@@ -229,6 +231,7 @@ func (u *ui) saveTemplateAction() error {
 		return err
 	}
 	u.editingEntry = false
+	u.clearGeneratedPasswordDraft()
 	u.filter()
 	return nil
 }
@@ -251,6 +254,14 @@ func (u *ui) createGroupAction() error {
 	return u.state.CreateGroup(strings.TrimSpace(u.groupName.Text()))
 }
 
+func (u *ui) moveCurrentGroupAction() error {
+	u.clearDeleteGroupConfirmation()
+	if len(u.displayPath()) == 0 {
+		return fmt.Errorf("no current group selected")
+	}
+	return u.state.MoveCurrentGroup(parsePath(u.groupParentPath.Text()))
+}
+
 func (u *ui) renameGroupAction() error {
 	u.clearDeleteGroupConfirmation()
 	return u.state.RenameCurrentGroup(strings.TrimSpace(u.groupName.Text()))
@@ -400,6 +411,7 @@ func (u *ui) generatePasswordAction() error {
 		return err
 	}
 	u.entryPassword.SetText(password)
+	u.generatedPasswordDraft = true
 	return nil
 }
 
@@ -481,3 +493,27 @@ func marshalFields(fields map[string]string) string {
 	}
 	return strings.Join(lines, "\n")
 }
+
+func (u *ui) clearGeneratedPasswordDraft() {
+	u.generatedPasswordDraft = false
+}
+
+func (u *ui) attachmentActionSummary() string {
+	items := u.selectedAttachmentItems()
+	if len(items) == 0 {
+		return "No attachments yet. Add one below to store a file with this entry."
+	}
+
+	name := strings.TrimSpace(u.attachmentName.Text())
+	if name == "" {
+		return "Select an attachment above, then replace it, export it, or remove it below."
+	}
+
+	for _, item := range items {
+		if item.Name == name {
+			return fmt.Sprintf("Selected attachment %q. Replace it, export it, or remove it below.", name)
+		}
+	}
+
+	return fmt.Sprintf("Attachment %q is not on this entry yet. Add it as new, or select an existing attachment above.", name)
+}

ui_keyboard.go

@@ -46,14 +46,14 @@ func (u *ui) handleKeyPress(name key.Name, modifiers key.Modifiers) bool {
 		return true
 	}
 	if u.isVaultLocked() && name == key.NameReturn {
-		u.runAction("unlock vault", u.unlockAction)
+		u.startUnlockAction()
 		return true
 	}
 	if u.shouldShowLifecycleSetup() && name == key.NameReturn {
 		if u.lifecycleMode == "remote" {
-			u.runAction("open remote vault", u.openRemoteAction)
+			u.startOpenRemoteAction()
 		} else {
-			u.runAction("open vault", u.openVaultAction)
+			u.startOpenVaultAction()
 		}
 		return true
 	}

ui_preferences.go

@@ -0,0 +1,300 @@
+package main
+
+import (
+	"encoding/json"
+	"image/color"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"gioui.org/layout"
+	"gioui.org/unit"
+	"gioui.org/widget"
+	"gioui.org/widget/material"
+	"git.julianfamily.org/keepassgo/vault"
+)
+
+const (
+	displayDensityDense       = "dense"
+	displayDensityComfortable = "comfortable"
+
+	contrastStandard = "standard"
+	contrastHigh     = "high"
+
+	keyboardFocusStandard  = "standard"
+	keyboardFocusProminent = "prominent"
+)
+
+type accessibilityPreferences struct {
+	DisplayDensity string
+	Contrast       string
+	ReducedMotion  bool
+	KeyboardFocus  string
+}
+
+type settingsFile struct {
+	Sync syncSettings `json:"sync,omitempty"`
+}
+
+type syncSettings struct {
+	SourceDefault    string `json:"sourceDefault,omitempty"`
+	DirectionDefault string `json:"directionDefault,omitempty"`
+}
+
+type syncSettingsDraft struct {
+	SourceDefault    syncSourceMode
+	DirectionDefault syncDirection
+}
+
+type settingsDraft struct {
+	Accessibility accessibilityPreferences
+	Sync          syncSettingsDraft
+}
+
+type legacySyncPreferences struct {
+	SyncSourceDefault    string `json:"syncSourceDefault,omitempty"`
+	SyncDirectionDefault string `json:"syncDirectionDefault,omitempty"`
+}
+
+type choiceSpec struct {
+	Click  *widget.Clickable
+	Label  string
+	Active bool
+}
+
+func defaultAccessibilityPreferences() accessibilityPreferences {
+	return accessibilityPreferences{
+		DisplayDensity: displayDensityForDenseLayout(true),
+		Contrast:       contrastStandard,
+		KeyboardFocus:  keyboardFocusStandard,
+	}
+}
+
+func displayDensityForDenseLayout(dense bool) string {
+	if dense {
+		return displayDensityDense
+	}
+	return displayDensityComfortable
+}
+
+func normalizeAccessibilityPreferences(prefs accessibilityPreferences) accessibilityPreferences {
+	normalized := defaultAccessibilityPreferences()
+	switch prefs.DisplayDensity {
+	case displayDensityDense, displayDensityComfortable:
+		normalized.DisplayDensity = prefs.DisplayDensity
+	}
+	switch prefs.Contrast {
+	case contrastStandard, contrastHigh:
+		normalized.Contrast = prefs.Contrast
+	}
+	switch prefs.KeyboardFocus {
+	case keyboardFocusStandard, keyboardFocusProminent:
+		normalized.KeyboardFocus = prefs.KeyboardFocus
+	}
+	normalized.ReducedMotion = prefs.ReducedMotion
+	return normalized
+}
+
+func (u *ui) applyAccessibilityPreferences(prefs accessibilityPreferences) {
+	normalized := normalizeAccessibilityPreferences(prefs)
+	u.denseLayout = normalized.DisplayDensity == displayDensityDense
+	u.accessibilityPrefs = normalized
+}
+
+func (u *ui) loadSettingsDraft() {
+	u.settingsDraft = settingsDraft{
+		Accessibility: accessibilityPreferences{
+			DisplayDensity: displayDensityForDenseLayout(u.denseLayout),
+			Contrast:       u.accessibilityPrefs.Contrast,
+			ReducedMotion:  u.accessibilityPrefs.ReducedMotion,
+			KeyboardFocus:  u.accessibilityPrefs.KeyboardFocus,
+		},
+		Sync: syncSettingsDraft{
+			SourceDefault:    u.syncDefaultSourceMode,
+			DirectionDefault: u.syncDefaultDirection,
+		},
+	}
+}
+
+func (u *ui) saveSecuritySettingsAction() error {
+	if err := u.applySecuritySettingsLive(); err != nil {
+		return err
+	}
+	u.securityDialogOpen = false
+	return nil
+}
+
+func (u *ui) applySecuritySettingsLive() error {
+	settings := vault.SecuritySettings{
+		Cipher: strings.TrimSpace(u.securityCipher.Text()),
+		KDF:    strings.TrimSpace(u.securityKDF.Text()),
+	}
+	if err := u.state.ConfigureSecurity(settings); err != nil {
+		return err
+	}
+	if u.settingsDraft.Accessibility.DisplayDensity == displayDensityForDenseLayout(u.denseLayout) {
+		u.settingsDraft.Accessibility.DisplayDensity = displayDensityForDenseLayout(u.settingsDenseLayout.Value)
+	}
+	u.settingsDenseLayout.Value = u.settingsDraft.Accessibility.DisplayDensity == displayDensityDense
+	u.syncDefaultSourceMode = sanitizeSyncSourceMode(u.settingsDraft.Sync.SourceDefault)
+	u.syncDefaultDirection = sanitizeSyncDirection(u.settingsDraft.Sync.DirectionDefault)
+	u.applySettingsFormToPreferences()
+	u.applyAccessibilityPreferences(u.settingsDraft.Accessibility)
+	u.saveSettings()
+	u.saveUIPreferences()
+	return nil
+}
+
+func (u *ui) loadSettings() {
+	u.syncDefaultSourceMode = syncSourceLocal
+	u.syncDefaultDirection = syncDirectionPull
+
+	if strings.TrimSpace(u.settingsPath) != "" {
+		content, err := os.ReadFile(u.settingsPath)
+		if err == nil {
+			var settings settingsFile
+			if json.Unmarshal(content, &settings) == nil {
+				u.syncDefaultSourceMode = sanitizeSyncSourceMode(syncSourceMode(settings.Sync.SourceDefault))
+				u.syncDefaultDirection = sanitizeSyncDirection(syncDirection(settings.Sync.DirectionDefault))
+				return
+			}
+		}
+	}
+
+	u.loadLegacySyncDefaultsFromUIPreferences()
+}
+
+func (u *ui) loadLegacySyncDefaultsFromUIPreferences() {
+	if strings.TrimSpace(u.uiPreferencesPath) == "" {
+		return
+	}
+	content, err := os.ReadFile(u.uiPreferencesPath)
+	if err != nil {
+		return
+	}
+	var prefs legacySyncPreferences
+	if err := json.Unmarshal(content, &prefs); err != nil {
+		return
+	}
+	u.syncDefaultSourceMode = sanitizeSyncSourceMode(syncSourceMode(prefs.SyncSourceDefault))
+	u.syncDefaultDirection = sanitizeSyncDirection(syncDirection(prefs.SyncDirectionDefault))
+}
+
+func (u *ui) saveSettings() {
+	if strings.TrimSpace(u.settingsPath) == "" {
+		return
+	}
+	if err := os.MkdirAll(filepath.Dir(u.settingsPath), 0o700); err != nil {
+		return
+	}
+	content, err := json.MarshalIndent(settingsFile{
+		Sync: syncSettings{
+			SourceDefault:    string(u.syncDefaultSourceMode),
+			DirectionDefault: string(u.syncDefaultDirection),
+		},
+	}, "", "  ")
+	if err != nil {
+		return
+	}
+	_ = os.WriteFile(u.settingsPath, content, 0o600)
+}
+
+func (u *ui) showStatusMessage(message string) {
+	u.state.StatusMessage = message
+	if u.accessibilityPrefs.ReducedMotion {
+		u.statusExpiresAt = time.Time{}
+		return
+	}
+	u.statusExpiresAt = u.now().Add(u.statusBannerTTL)
+}
+
+func (u *ui) settingsPreferenceCard(gtx layout.Context, title, detail string, body layout.Widget) layout.Dimensions {
+	return sectionCard(gtx, u.theme, title, detail, body)
+}
+
+func settingsSummaryCard(gtx layout.Context, th *material.Theme, title, body string) layout.Dimensions {
+	return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
+		return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
+			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+				lbl := material.Label(th, unit.Sp(12), title)
+				lbl.Color = mutedColor
+				return lbl.Layout(gtx)
+			}),
+			layout.Rigid(layout.Spacer{Height: unit.Dp(2)}.Layout),
+			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+				lbl := material.Label(th, unit.Sp(13), body)
+				lbl.Color = th.Palette.Fg
+				return lbl.Layout(gtx)
+			}),
+		)
+	})
+}
+
+func (u *ui) settingsChoiceRow(gtx layout.Context, choices ...choiceSpec) layout.Dimensions {
+	children := make([]layout.FlexChild, 0, len(choices)*2)
+	for i, choice := range choices {
+		if i > 0 {
+			children = append(children, layout.Rigid(layout.Spacer{Width: unit.Dp(6)}.Layout))
+		}
+		current := choice
+		children = append(children, layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			return syncChoiceButton(gtx, u.theme, current.Click, current.Label, current.Active)
+		}))
+	}
+	return layout.Flex{Spacing: layout.SpaceStart}.Layout(gtx, children...)
+}
+
+type listRowColors struct {
+	Title     color.NRGBA
+	Meta      color.NRGBA
+	Secondary color.NRGBA
+	Divider   color.NRGBA
+	Fill      color.NRGBA
+	Edge      color.NRGBA
+}
+
+func (u *ui) listRowColors(selected, focused, recycleBin bool) listRowColors {
+	colors := listRowColors{
+		Title:     accentColor,
+		Meta:      color.NRGBA{R: 61, G: 60, B: 56, A: 255},
+		Secondary: mutedColor,
+		Divider:   color.NRGBA{R: 225, G: 219, B: 210, A: 255},
+		Fill:      color.NRGBA{R: 231, G: 239, B: 235, A: 255},
+		Edge:      color.NRGBA{R: 69, G: 118, B: 97, A: 255},
+	}
+	if selected {
+		colors.Title = color.NRGBA{R: 19, G: 57, B: 43, A: 255}
+		colors.Meta = color.NRGBA{R: 31, G: 53, B: 44, A: 255}
+		colors.Secondary = color.NRGBA{R: 72, G: 88, B: 80, A: 255}
+		colors.Divider = color.NRGBA{R: 173, G: 196, B: 184, A: 255}
+		colors.Fill = color.NRGBA{R: 212, G: 228, B: 220, A: 255}
+		colors.Edge = color.NRGBA{R: 46, G: 106, B: 82, A: 255}
+	}
+	if recycleBin {
+		colors.Fill = color.NRGBA{R: 244, G: 229, B: 219, A: 255}
+		colors.Edge = color.NRGBA{R: 133, G: 65, B: 41, A: 255}
+	}
+	if focused && !selected {
+		colors.Meta = color.NRGBA{R: 49, G: 74, B: 63, A: 255}
+		colors.Secondary = color.NRGBA{R: 86, G: 102, B: 95, A: 255}
+		colors.Divider = color.NRGBA{R: 190, G: 208, B: 199, A: 255}
+	}
+	if u.accessibilityPrefs.Contrast == contrastHigh {
+		colors.Meta = color.NRGBA{R: 39, G: 39, B: 36, A: 255}
+		colors.Secondary = color.NRGBA{R: 58, G: 57, B: 52, A: 255}
+		if focused || selected {
+			colors.Fill = color.NRGBA{R: 211, G: 228, B: 219, A: 255}
+			colors.Edge = color.NRGBA{R: 16, G: 60, B: 44, A: 255}
+		}
+	}
+	if u.accessibilityPrefs.KeyboardFocus == keyboardFocusProminent && focused && !selected {
+		colors.Fill = color.NRGBA{R: 220, G: 234, B: 226, A: 255}
+		colors.Edge = color.NRGBA{R: 20, G: 74, B: 55, A: 255}
+	}
+	if recycleBin && (focused || selected) && u.accessibilityPrefs.Contrast == contrastHigh {
+		colors.Fill = color.NRGBA{R: 242, G: 223, B: 209, A: 255}
+		colors.Edge = color.NRGBA{R: 116, G: 43, B: 19, A: 255}
+	}
+	return colors
+}

ui_shortcuts.go

@@ -37,6 +37,8 @@ func (u *ui) processShortcuts(gtx layout.Context) {
 			key.Filter{Name: key.NameUpArrow},
 			key.Filter{Name: key.NameDownArrow},
 			key.Filter{Name: key.NameReturn},
+			key.Filter{Name: key.NameBack},
+			key.Filter{Name: key.NameEscape},
 		)
 		if !ok {
 			break
@@ -48,6 +50,9 @@ func (u *ui) processShortcuts(gtx layout.Context) {
 		}
 
 		u.handleKeyPress(ke.Name, ke.Modifiers)
+		if ke.Name == key.NameBack || ke.Name == key.NameEscape {
+			_ = u.handlePhoneBack()
+		}
 	}
 }
 

vault/model.go

@@ -96,6 +96,27 @@ func (m Model) EntriesInPath(path []string) []Entry {
 	return entries
 }
 
+func (m Model) EntriesUnderPath(path []string) []Entry {
+	var entries []Entry
+	for _, entry := range m.Entries {
+		if !hasPathPrefix(entry.Path, path) {
+			continue
+		}
+		entries = append(entries, entry)
+	}
+	slices.SortFunc(entries, func(a, b Entry) int {
+		switch {
+		case a.Title < b.Title:
+			return -1
+		case a.Title > b.Title:
+			return 1
+		default:
+			return 0
+		}
+	})
+	return entries
+}
+
 func (m Model) Search(query string) []SearchResult {
 	query = strings.TrimSpace(strings.ToLower(query))
 	if query == "" {
@@ -256,13 +277,14 @@ func (m *Model) RestoreEntryVersion(id string, historyIndex int) error {
 }
 
 func (m *Model) CreateGroup(parent []string, name string) {
-	groupPath := append(append([]string(nil), parent...), name)
-	for _, existing := range m.Groups {
-		if slices.Equal(existing, groupPath) {
-			return
+	groupPath := append([]string(nil), parent...)
+	for _, part := range splitGroupPath(name) {
+		groupPath = append(groupPath, part)
+		if groupPathExists(m.Groups, groupPath) {
+			continue
 		}
+		m.Groups = append(m.Groups, append([]string(nil), groupPath...))
 	}
-	m.Groups = append(m.Groups, groupPath)
 }
 
 func (m *Model) RenameGroup(path []string, newName string) error {
@@ -310,6 +332,47 @@ func (m *Model) MoveEntry(id string, path []string) error {
 	return ErrEntryNotFound
 }
 
+func (m *Model) MoveGroup(path, parent []string) error {
+	if len(path) == 0 {
+		return ErrEntryNotFound
+	}
+	if hasPathPrefix(parent, path) {
+		return ErrEntryNotFound
+	}
+
+	groupName := path[len(path)-1]
+	newPath := append(append([]string(nil), parent...), groupName)
+	moved := false
+	for i := range m.Entries {
+		if !hasPathPrefix(m.Entries[i].Path, path) {
+			continue
+		}
+		m.Entries[i].Path = append(append([]string(nil), newPath...), m.Entries[i].Path[len(path):]...)
+		moved = true
+	}
+	for i := range m.Templates {
+		if !hasPathPrefix(m.Templates[i].Path, path) {
+			continue
+		}
+		m.Templates[i].Path = append(append([]string(nil), newPath...), m.Templates[i].Path[len(path):]...)
+		moved = true
+	}
+	for i := range m.Groups {
+		if !hasPathPrefix(m.Groups[i], path) {
+			continue
+		}
+		m.Groups[i] = append(append([]string(nil), newPath...), m.Groups[i][len(path):]...)
+		moved = true
+	}
+	if !moved {
+		return ErrEntryNotFound
+	}
+	if !groupPathExists(m.Groups, newPath) {
+		m.Groups = append(m.Groups, append([]string(nil), newPath...))
+	}
+	return nil
+}
+
 func (m *Model) MoveTemplate(id string, path []string) error {
 	for i := range m.Templates {
 		if m.Templates[i].ID != id {
@@ -349,6 +412,27 @@ func hasPathPrefix(path, prefix []string) bool {
 	return slices.Equal(path[:len(prefix)], prefix)
 }
 
+func splitGroupPath(name string) []string {
+	var parts []string
+	for _, part := range strings.Split(name, "/") {
+		part = strings.TrimSpace(part)
+		if part == "" {
+			continue
+		}
+		parts = append(parts, part)
+	}
+	return parts
+}
+
+func groupPathExists(groups [][]string, path []string) bool {
+	for _, existing := range groups {
+		if slices.Equal(existing, path) {
+			return true
+		}
+	}
+	return false
+}
+
 func mergeEntryTemplate(template, overrides Entry) Entry {
 	entry := cloneEntry(template)
 

vault/model_test.go

@@ -41,6 +41,19 @@ func TestEntriesInPathReturnsOnlyDirectEntries(t *testing.T) {
 	}
 }
 
+func TestEntriesUnderPathReturnsDescendantEntries(t *testing.T) {
+	t.Parallel()
+
+	model := testModel()
+	got := model.EntriesUnderPath([]string{"Crew"})
+	if len(got) != 3 {
+		t.Fatalf("len(EntriesUnderPath(Crew)) = %d, want 3", len(got))
+	}
+	if got[0].Title != "Bellagio" || got[1].Title != "Surveillance Console" || got[2].Title != "Vault Console" {
+		t.Fatalf("EntriesUnderPath(Crew) titles = %q, %q, %q", got[0].Title, got[1].Title, got[2].Title)
+	}
+}
+
 func TestSearchReturnsMatchesWithFullPathContext(t *testing.T) {
 	model := testModel()
 
@@ -246,6 +259,22 @@ func TestCreateGroupMakesItVisibleAsChildGroup(t *testing.T) {
 	}
 }
 
+func TestCreateGroupSupportsNestedRelativePath(t *testing.T) {
+	t.Parallel()
+
+	model := testModel()
+	model.CreateGroup([]string{"Crew"}, "Infrastructure / Prod")
+
+	got := model.ChildGroups([]string{"Crew"})
+	if !slices.Equal(got, []string{"Home Assistant", "Infrastructure", "Internet"}) {
+		t.Fatalf("ChildGroups(Crew) = %v, want [Home Assistant Infrastructure Internet]", got)
+	}
+	got = model.ChildGroups([]string{"Crew", "Infrastructure"})
+	if !slices.Equal(got, []string{"Prod"}) {
+		t.Fatalf("ChildGroups(Crew/Infrastructure) = %v, want [Prod]", got)
+	}
+}
+
 func TestRenameGroupMovesEntriesAndKeepsHierarchy(t *testing.T) {
 	model := testModel()
 
@@ -276,6 +305,28 @@ func TestMoveEntryChangesItsPath(t *testing.T) {
 	}
 }
 
+func TestMoveGroupMovesEntriesAndNestedGroups(t *testing.T) {
+	t.Parallel()
+
+	model := testModel()
+	model.CreateGroup([]string{"Crew", "Internet"}, "Infrastructure")
+	if err := model.MoveGroup([]string{"Crew", "Internet"}, []string{"Tricia"}); err != nil {
+		t.Fatalf("MoveGroup() error = %v", err)
+	}
+
+	got := model.EntriesInPath([]string{"Tricia", "Internet"})
+	if len(got) != 2 {
+		t.Fatalf("len(EntriesInPath(Tricia/Internet)) = %d, want 2", len(got))
+	}
+	if len(model.EntriesInPath([]string{"Crew", "Internet"})) != 0 {
+		t.Fatal("EntriesInPath(Crew/Internet) should be empty after move")
+	}
+	gotGroups := model.ChildGroups([]string{"Tricia", "Internet"})
+	if !slices.Equal(gotGroups, []string{"Infrastructure"}) {
+		t.Fatalf("ChildGroups(Tricia/Internet) = %v, want [Infrastructure]", gotGroups)
+	}
+}
+
 func TestDeleteEmptyGroupRemovesItFromNavigation(t *testing.T) {
 	model := testModel()